@@ -66,18 +66,18 @@ contract OraclizeI {
6666 function getPrice (byte _datasource ) public view returns (uint256 _dsprice );
6767 function randomDS_getSessionPubKeyHash () external constant returns (bytes32 );
6868 function getPrice (string memory _datasource ) public view returns (uint256 _dsprice );
69- function getPrice (byte _datasource , address _address ) public view returns (uint256 _dsprice );
69+ function getPrice (byte _datasource , address _contractToQuery ) public view returns (uint256 _dsprice );
7070 function getPrice (byte _datasource , uint256 _gasLimit ) public view returns (uint256 _dsprice );
71- function getPrice (string memory _datasource , address _address ) public view returns (uint256 _dsprice );
71+ function getPrice (string memory _datasource , address _contractToQuery ) public view returns (uint256 _dsprice );
7272 function getPrice (string memory _datasource , uint256 _gasLimit ) public view returns (uint256 _dsprice );
7373 function queryN (uint _timestamp , string _datasource , bytes _argN ) public payable returns (bytes32 _id );
7474 function query (uint _timestamp , string _datasource , string _arg ) external payable returns (bytes32 _id );
7575 function requestCallbackRebroadcast (bytes32 _queryId , uint256 _gasLimit , uint256 _gasPrice ) payable external ;
76- function getPrice (byte _datasource , uint256 _gasLimit , address _address ) public view returns (uint256 _dsprice );
76+ function getPrice (byte _datasource , uint256 _gasLimit , address _contractToQuery ) public view returns (uint256 _dsprice );
7777 function getRebroadcastCost (uint256 _gasLimit , uint256 _gasPrice ) public pure returns (uint256 _rebroadcastCost );
7878 function convertToERC20Price (uint256 _queryPriceInWei , address _tokenAddress ) public view returns (uint256 _price );
7979 function query2 (uint _timestamp , string _datasource , string _arg1 , string _arg2 ) public payable returns (bytes32 _id );
80- function getPrice (string memory _datasource , uint256 _gasLimit , address _address ) public view returns (uint256 _dsprice );
80+ function getPrice (string memory _datasource , uint256 _gasLimit , address _contractToQuery ) public view returns (uint256 _dsprice );
8181 function query_withGasLimit (uint _timestamp , string _datasource , string _arg , uint _gaslimit ) external payable returns (bytes32 _id );
8282 function queryN_withGasLimit (uint _timestamp , string _datasource , bytes _argN , uint _gaslimit ) external payable returns (bytes32 _id );
8383 function query2_withGasLimit (uint _timestamp , string _datasource , string _arg1 , string _arg2 , uint _gaslimit ) external payable returns (bytes32 _id );
@@ -488,48 +488,48 @@ contract usingOraclize {
488488
489489 function oraclize_getPrice (
490490 string memory _datasource ,
491- address _address
491+ address _contractToQuery
492492 )
493493 oraclizeAPI
494494 internal
495495 returns (uint256 _queryPrice )
496496 {
497- return oraclize.getPrice (_datasource, _address );
497+ return oraclize.getPrice (_datasource, _contractToQuery );
498498 }
499499
500500 function oraclize_getPrice (
501501 byte _datasource ,
502- address _address
502+ address _contractToQuery
503503 )
504504 oraclizeAPI
505505 internal
506506 returns (uint256 _queryPrice )
507507 {
508- return oraclize.getPrice (_datasource, _address );
508+ return oraclize.getPrice (_datasource, _contractToQuery );
509509 }
510510
511511 function oraclize_getPrice (
512512 string memory _datasource ,
513- address _address ,
513+ address _contractToQuery ,
514514 uint256 _gasLimit
515515 )
516516 oraclizeAPI
517517 internal
518518 returns (uint256 _queryPrice )
519519 {
520- return oraclize.getPrice (_datasource, _gasLimit, _address );
520+ return oraclize.getPrice (_datasource, _gasLimit, _contractToQuery );
521521 }
522522
523523 function oraclize_getPrice (
524524 byte _datasource ,
525- address _address ,
525+ address _contractToQuery ,
526526 uint256 _gasLimit
527527 )
528528 oraclizeAPI
529529 internal
530530 returns (uint256 _queryPrice )
531531 {
532- return oraclize.getPrice (_datasource, _gasLimit, _address );
532+ return oraclize.getPrice (_datasource, _gasLimit, _contractToQuery );
533533 }
534534
535535 function oraclize_getPrice (
@@ -732,95 +732,95 @@ contract usingOraclize {
732732
733733 function oraclize_getPriceERC20 (
734734 string memory _datasource ,
735- address _address
735+ address _contractToQuery
736736 )
737737 oraclizeAPI
738738 internal
739739 returns (uint256 _queryPrice )
740740 {
741741 return oraclize.convertToERC20Price (
742- oraclize.getPrice (_datasource, _address ),
742+ oraclize.getPrice (_datasource, _contractToQuery ),
743743 oraclize.addressCustomPaymentToken (address (this ))
744744 );
745745 }
746746
747747 function oraclize_getPriceERC20 (
748748 byte _datasource ,
749- address _address
749+ address _contractToQuery
750750 )
751751 oraclizeAPI
752752 internal
753753 returns (uint256 _queryPrice )
754754 {
755755 return oraclize.convertToERC20Price (
756- oraclize.getPrice (_datasource, _address ),
756+ oraclize.getPrice (_datasource, _contractToQuery ),
757757 oraclize.addressCustomPaymentToken (address (this ))
758758 );
759759 }
760760
761761 function oraclize_getPriceERC20 (
762762 string memory _datasource ,
763- address _address ,
763+ address _contractToQuery ,
764764 address _tokenAddress
765765 )
766766 oraclizeAPI
767767 internal
768768 returns (uint256 _queryPrice )
769769 {
770770 return oraclize.convertToERC20Price (
771- oraclize.getPrice (_datasource, _address ),
771+ oraclize.getPrice (_datasource, _contractToQuery ),
772772 _tokenAddress
773773 );
774774 }
775775
776776 function oraclize_getPriceERC20 (
777777 byte _datasource ,
778- address _address ,
778+ address _contractToQuery ,
779779 address _tokenAddress
780780 )
781781 oraclizeAPI
782782 internal
783783 returns (uint256 _queryPrice )
784784 {
785785 return oraclize.convertToERC20Price (
786- oraclize.getPrice (_datasource, _address ),
786+ oraclize.getPrice (_datasource, _contractToQuery ),
787787 _tokenAddress
788788 );
789789 }
790790
791791 function oraclize_getPriceERC20 (
792792 string memory _datasource ,
793- address _address ,
793+ address _contractToQuery ,
794794 uint256 _gasLimit
795795 )
796796 oraclizeAPI
797797 internal
798798 returns (uint256 _queryPrice )
799799 {
800800 return oraclize.convertToERC20Price (
801- oraclize.getPrice (_datasource, _gasLimit, _address ),
801+ oraclize.getPrice (_datasource, _gasLimit, _contractToQuery ),
802802 oraclize.addressCustomPaymentToken (address (this ))
803803 );
804804 }
805805
806806 function oraclize_getPriceERC20 (
807807 byte _datasource ,
808- address _address ,
808+ address _contractToQuery ,
809809 uint256 _gasLimit
810810 )
811811 oraclizeAPI
812812 internal
813813 returns (uint256 _queryPrice )
814814 {
815815 return oraclize.convertToERC20Price (
816- oraclize.getPrice (_datasource, _gasLimit, _address ),
816+ oraclize.getPrice (_datasource, _gasLimit, _contractToQuery ),
817817 oraclize.addressCustomPaymentToken (address (this ))
818818 );
819819 }
820820
821821 function oraclize_getPriceERC20 (
822822 string memory _datasource ,
823- address _address ,
823+ address _contractToQuery ,
824824 uint256 _gasLimit ,
825825 address _tokenAddress
826826 )
@@ -829,14 +829,14 @@ contract usingOraclize {
829829 returns (uint256 _queryPrice )
830830 {
831831 return oraclize.convertToERC20Price (
832- oraclize.getPrice (_datasource, _gasLimit, _address ),
832+ oraclize.getPrice (_datasource, _gasLimit, _contractToQuery ),
833833 _tokenAddress
834834 );
835835 }
836836
837837 function oraclize_getPriceERC20 (
838838 byte _datasource ,
839- address _address ,
839+ address _contractToQuery ,
840840 uint256 _gasLimit ,
841841 address _tokenAddress
842842 )
@@ -845,7 +845,7 @@ contract usingOraclize {
845845 returns (uint256 _queryPrice )
846846 {
847847 return oraclize.convertToERC20Price (
848- oraclize.getPrice (_datasource, _gasLimit, _address ),
848+ oraclize.getPrice (_datasource, _gasLimit, _contractToQuery ),
849849 _tokenAddress
850850 );
851851 }
0 commit comments