diff options
| author | Rhett Aultman <rhett.aultman@meraki.net> | 2017-01-17 07:07:48 +0800 |
|---|---|---|
| committer | Rhett Aultman <rhett.aultman@meraki.net> | 2017-01-17 07:07:48 +0800 |
| commit | 88a2ac25e5e10aa7cea8627b60aa663f7ed6066d (patch) | |
| tree | f9b34d62409fa21fff59a3d134ac1d3be4a49c8b /test/libsolidity | |
| parent | 43dbf01e73b915dbeddfd7eb9d62112fdf2f99f1 (diff) | |
| download | dexon-solidity-88a2ac25e5e10aa7cea8627b60aa663f7ed6066d.tar.gz dexon-solidity-88a2ac25e5e10aa7cea8627b60aa663f7ed6066d.tar.zst dexon-solidity-88a2ac25e5e10aa7cea8627b60aa663f7ed6066d.zip | |
Revert "Fix contract lookup in tests"
This reverts commit f8914c6b281f398d6084f10708233bf79d633ef0.
Diffstat (limited to 'test/libsolidity')
| -rw-r--r-- | test/libsolidity/SolidityABIJSON.cpp | 4 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index a54e9b7e..043d74ed 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -762,8 +762,8 @@ BOOST_AUTO_TEST_CASE(metadata_stamp) } )"; BOOST_REQUIRE(m_compilerStack.compile(std::string(sourceCode))); - bytes const& bytecode = m_compilerStack.runtimeObject(":test").bytecode; - bytes hash = dev::swarmHash(m_compilerStack.onChainMetadata(":test")).asBytes(); + bytes const& bytecode = m_compilerStack.runtimeObject("test").bytecode; + bytes hash = dev::swarmHash(m_compilerStack.onChainMetadata("test")).asBytes(); BOOST_REQUIRE(hash.size() == 32); BOOST_REQUIRE(bytecode.size() >= 2); size_t metadataCBORSize = (size_t(bytecode.end()[-2]) << 8) + size_t(bytecode.end()[-1]); diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 00e8330c..03e3a881 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -67,11 +67,7 @@ public: ); BOOST_ERROR("Compiling contract failed"); } - eth::LinkerObject obj; - if (_contractName.empty()) - obj = m_compiler.object(_contractName); - else - obj = m_compiler.object(":" + _contractName); + eth::LinkerObject obj = m_compiler.object(_contractName); BOOST_REQUIRE(obj.linkReferences.empty()); sendMessage(obj.bytecode + _arguments, true, _value); return m_output; |