mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Merge pull request #937 from LefterisJP/sol_MultiArgSHA3
Solidity multiple arg sha3
This commit is contained in:
		
						commit
						5d7098eba7
					
				| @ -576,7 +576,7 @@ BOOST_AUTO_TEST_CASE(simple_mapping) | ||||
| 							 "  }\n" | ||||
| 							 "}"; | ||||
| 	compileAndRun(sourceCode); | ||||
| 	 | ||||
| 
 | ||||
| 	BOOST_CHECK(callContractFunction("get(uint8)", byte(0)) == encodeArgs(byte(0x00))); | ||||
| 	BOOST_CHECK(callContractFunction("get(uint8)", byte(0x01)) == encodeArgs(byte(0x00))); | ||||
| 	BOOST_CHECK(callContractFunction("get(uint8)", byte(0xa7)) == encodeArgs(byte(0x00))); | ||||
| @ -933,7 +933,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors) | ||||
| 	compileAndRun(sourceCode); | ||||
| 	BOOST_CHECK(callContractFunction("data()") == encodeArgs(8)); | ||||
| 	BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina")); | ||||
| 	BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(toBigEndian(u256(123))))); | ||||
| 	BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(bytes({0x7b})))); | ||||
| 	BOOST_CHECK(callContractFunction("an_address()") == encodeArgs(toBigEndian(u160(0x1337)))); | ||||
| 	BOOST_CHECK(callContractFunction("super_secret_data()") == bytes()); | ||||
| } | ||||
| @ -2113,6 +2113,67 @@ BOOST_AUTO_TEST_CASE(event_lots_of_data) | ||||
| 	BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,hash256,uint256,bool)"))); | ||||
| } | ||||
| 
 | ||||
| BOOST_AUTO_TEST_CASE(sha3_multiple_arguments) | ||||
| { | ||||
| 	char const* sourceCode = R"( | ||||
| 		contract c { | ||||
| 			function foo(uint a, uint b, uint c) returns (hash d) | ||||
| 			{ | ||||
| 				d = sha3(a, b, c); | ||||
| 			} | ||||
| 		})"; | ||||
| 	compileAndRun(sourceCode); | ||||
| 
 | ||||
| 	BOOST_CHECK(callContractFunction("foo(uint256,uint256,uint256)", 10, 12, 13) == encodeArgs( | ||||
| 					dev::sha3( | ||||
| 						toBigEndian(u256(10)) + | ||||
| 						toBigEndian(u256(12)) + | ||||
| 						toBigEndian(u256(13))))); | ||||
| } | ||||
| 
 | ||||
| BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_numeric_literals) | ||||
| { | ||||
| 	char const* sourceCode = R"( | ||||
| 		contract c { | ||||
| 			function foo(uint a, uint16 b) returns (hash d) | ||||
| 			{ | ||||
| 				d = sha3(a, b, 145); | ||||
| 			} | ||||
| 		})"; | ||||
| 	compileAndRun(sourceCode); | ||||
| 
 | ||||
| 	BOOST_CHECK(callContractFunction("foo(uint256,uint16)", 10, 12) == encodeArgs( | ||||
| 					dev::sha3( | ||||
| 						toBigEndian(u256(10)) + | ||||
| 						bytes({0x0, 0xc}) + | ||||
| 						bytes({0x91})))); | ||||
| } | ||||
| 
 | ||||
| BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals) | ||||
| { | ||||
| 	char const* sourceCode = R"( | ||||
| 		contract c { | ||||
| 			function foo() returns (hash d) | ||||
| 			{ | ||||
| 				d = sha3("foo"); | ||||
| 			} | ||||
| 			function bar(uint a, uint16 b) returns (hash d) | ||||
| 			{ | ||||
| 				d = sha3(a, b, 145, "foo"); | ||||
| 			} | ||||
| 		})"; | ||||
| 	compileAndRun(sourceCode); | ||||
| 
 | ||||
| 	BOOST_CHECK(callContractFunction("foo()") == encodeArgs(dev::sha3("foo"))); | ||||
| 
 | ||||
| 	BOOST_CHECK(callContractFunction("bar(uint256,uint16)", 10, 12) == encodeArgs( | ||||
| 					dev::sha3( | ||||
| 						toBigEndian(u256(10)) + | ||||
| 						bytes({0x0, 0xc}) + | ||||
| 						bytes({0x91}) + | ||||
| 						bytes({0x66, 0x6f, 0x6f})))); | ||||
| } | ||||
| 
 | ||||
| BOOST_AUTO_TEST_SUITE_END() | ||||
| 
 | ||||
| } | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user