mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Split compileContract off compileAndRunWithoutCheck in SolidityExecutionFramework
This commit is contained in:
		
							parent
							
								
									908b46e9a7
								
							
						
					
					
						commit
						029e19983c
					
				| @ -51,6 +51,17 @@ public: | ||||
| 		bytes const& _arguments = bytes(), | ||||
| 		std::map<std::string, dev::test::Address> const& _libraryAddresses = std::map<std::string, dev::test::Address>() | ||||
| 	) override | ||||
| 	{ | ||||
| 		bytes bytecode = compileContract(_sourceCode, _contractName, _libraryAddresses); | ||||
| 		sendMessage(bytecode + _arguments, true, _value); | ||||
| 		return m_output; | ||||
| 	} | ||||
| 
 | ||||
| 	bytes compileContract( | ||||
| 		std::string const& _sourceCode, | ||||
| 		std::string const& _contractName = "", | ||||
| 		std::map<std::string, dev::test::Address> const& _libraryAddresses = std::map<std::string, dev::test::Address>() | ||||
| 	) | ||||
| 	{ | ||||
| 		// Silence compiler version warning
 | ||||
| 		std::string sourceCode = "pragma solidity >=0.0;\n" + _sourceCode; | ||||
| @ -72,8 +83,7 @@ public: | ||||
| 		} | ||||
| 		eth::LinkerObject obj = m_compiler.object(_contractName.empty() ? m_compiler.lastContractName() : _contractName); | ||||
| 		BOOST_REQUIRE(obj.linkReferences.empty()); | ||||
| 		sendMessage(obj.bytecode + _arguments, true, _value); | ||||
| 		return m_output; | ||||
| 		return obj.bytecode; | ||||
| 	} | ||||
| 
 | ||||
| protected: | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user