diff options
| author | chriseth <c@ethdev.com> | 2015-09-10 18:01:05 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-09-11 21:21:37 +0800 |
| commit | a9edc7b1a601747f96e47fe60a5fc10df489696f (patch) | |
| tree | 8165a9a44cc6cf23f6a8d8b152facfe3fd65a909 /test/libsolidity | |
| parent | 337fde9d11adac85800b405a3fdb4bcd09039ebf (diff) | |
| download | dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.gz dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.zst dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.zip | |
Transition from bytecode to more general linker objects.
Diffstat (limited to 'test/libsolidity')
| -rw-r--r-- | test/libsolidity/Assembly.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/GasMeter.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExpressionCompiler.cpp | 2 | ||||
| -rw-r--r-- | test/libsolidity/solidityExecutionFramework.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp index eb4999e7..5bd6fed3 100644 --- a/test/libsolidity/Assembly.cpp +++ b/test/libsolidity/Assembly.cpp @@ -66,7 +66,7 @@ eth::AssemblyItems compileContract(const string& _sourceCode) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) { Compiler compiler; - compiler.compileContract(*contract, map<ContractDefinition const*, bytes const*>{}); + compiler.compileContract(*contract, map<ContractDefinition const*, Assembly const*>{}); return compiler.runtimeAssemblyItems(); } diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp index 897d12fd..6d7c06a3 100644 --- a/test/libsolidity/GasMeter.cpp +++ b/test/libsolidity/GasMeter.cpp @@ -63,7 +63,7 @@ public: auto state = make_shared<KnownState>(); PathGasMeter meter(*m_compiler.assemblyItems()); GasMeter::GasConsumption gas = meter.estimateMax(0, state); - u256 bytecodeSize(m_compiler.runtimeBytecode().size()); + u256 bytecodeSize(m_compiler.runtimeObject().bytecode.size()); gas += bytecodeSize * c_createDataGas; BOOST_REQUIRE(!gas.isInfinite); BOOST_CHECK(gas.value == m_gasUsed); diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index 9b1c026f..747668b0 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -138,7 +138,7 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _ for (vector<string> const& function: _functions) context << context.functionEntryLabel(dynamic_cast<FunctionDefinition const&>(resolveDeclaration(function, resolver))); - bytes instructions = context.assembledBytecode(); + bytes instructions = context.assembledObject().bytecode; // debug // cout << eth::disassemble(instructions) << endl; return instructions; diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h index 86e7d351..8823114a 100644 --- a/test/libsolidity/solidityExecutionFramework.h +++ b/test/libsolidity/solidityExecutionFramework.h @@ -59,7 +59,7 @@ public: m_compiler.reset(false, m_addStandardSources); m_compiler.addSource("", _sourceCode); ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed"); - bytes code = m_compiler.bytecode(_contractName); + bytes code = m_compiler.object(_contractName).bytecode; sendMessage(code + _arguments, true, _value); return m_output; } |