mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Clean up state tests
This commit is contained in:
		
							parent
							
								
									f88f5a7702
								
							
						
					
					
						commit
						dbcce8b7b9
					
				| @ -57,7 +57,6 @@ public: | |||||||
| 	eth::State m_statePost; | 	eth::State m_statePost; | ||||||
| 	eth::ExtVMFace m_environment; | 	eth::ExtVMFace m_environment; | ||||||
| 	eth::Transaction m_transaction; | 	eth::Transaction m_transaction; | ||||||
| 	bytes code; |  | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
| 	json_spirit::mObject& m_TestObject; | 	json_spirit::mObject& m_TestObject; | ||||||
|  | |||||||
							
								
								
									
										14
									
								
								state.cpp
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								state.cpp
									
									
									
									
									
								
							| @ -55,12 +55,6 @@ void doStateTests(json_spirit::mValue& v, bool _fillin) | |||||||
| 
 | 
 | ||||||
| 		ImportTest importer(o, _fillin); | 		ImportTest importer(o, _fillin); | ||||||
| 
 | 
 | ||||||
| 		if (_fillin) |  | ||||||
| 		{ |  | ||||||
| 			importer.code = importer.m_statePre.code(importer.m_environment.myAddress); |  | ||||||
| 			importer.m_environment.code = importer.code; |  | ||||||
| 		} |  | ||||||
| 
 |  | ||||||
| 		State theState = importer.m_statePre; | 		State theState = importer.m_statePre; | ||||||
| 		bytes tx = importer.m_transaction.rlp(); | 		bytes tx = importer.m_transaction.rlp(); | ||||||
| 		bytes output; | 		bytes output; | ||||||
| @ -124,12 +118,4 @@ BOOST_AUTO_TEST_CASE(stSystemOperationsTest) | |||||||
| 	dev::test::executeTests("stSystemOperationsTest", "/StateTests", dev::test::doStateTests); | 	dev::test::executeTests("stSystemOperationsTest", "/StateTests", dev::test::doStateTests); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| BOOST_AUTO_TEST_CASE(tmp) |  | ||||||
| { |  | ||||||
| 	int currentVerbosity = g_logVerbosity; |  | ||||||
| 	g_logVerbosity = 12; |  | ||||||
| 	dev::test::executeTests("tmp", "/StateTests", dev::test::doStateTests); |  | ||||||
| 	g_logVerbosity = currentVerbosity; |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| BOOST_AUTO_TEST_SUITE_END() | BOOST_AUTO_TEST_SUITE_END() | ||||||
|  | |||||||
| @ -1,44 +0,0 @@ | |||||||
| { |  | ||||||
|  "ABAcalls0": { |  | ||||||
|         "env" : { |  | ||||||
|             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", |  | ||||||
|             "currentNumber" : "0", |  | ||||||
|             "currentGasLimit" : "10000000", |  | ||||||
|             "currentDifficulty" : "256", |  | ||||||
|             "currentTimestamp" : 1, |  | ||||||
|             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" |  | ||||||
|         }, |  | ||||||
|         "pre" : { |  | ||||||
|             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { |  | ||||||
|                 "balance" : "1000000000000000000", |  | ||||||
|                 "nonce" : 0, |  | ||||||
|                 "code" : "{  [[ (PC) ]] (CALL 1000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 24 0 0 0 0) }", |  | ||||||
|                 "storage": {} |  | ||||||
|             }, |  | ||||||
|             "945304eb96065b2a98b57a48a06ae28d285a71b5" : { |  | ||||||
|                 "balance" : "23", |  | ||||||
|                 "code" : " { [[ (PC) ]] (ADD 1 (CALL 500 0x095e7baea6a6c7c4c2dfeb977efac326af552d87 23 0 0 0 0)) } ", |  | ||||||
|                 "nonce" : "0", |  | ||||||
|                 "storage" : { |  | ||||||
|                 } |  | ||||||
|             }, |  | ||||||
|             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { |  | ||||||
|                 "balance" : "1000000000000000000", |  | ||||||
|                 "nonce" : 0, |  | ||||||
|                 "code" : "", |  | ||||||
|                 "storage": {} |  | ||||||
|             } |  | ||||||
| 
 |  | ||||||
|         }, |  | ||||||
| 	"transaction" : { |  | ||||||
| 		"nonce" : "0", |  | ||||||
| 		"gasPrice" : "1", |  | ||||||
| 		"gasLimit" : "10000", |  | ||||||
| 		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", |  | ||||||
| 		"value" : "100000", |  | ||||||
| 		"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", |  | ||||||
| 		"data" : ""		 |  | ||||||
| 	} |  | ||||||
|     } |  | ||||||
| 
 |  | ||||||
| } |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user