From 127fb8f68f174d9bfddaabbbdd00f178d682c9ee Mon Sep 17 00:00:00 2001 From: Andrei Maiboroda Date: Wed, 24 Jul 2019 12:54:20 +0200 Subject: [PATCH] Fix order of arguments when constructing EnvInfo in tests --- test/unittests/libethereum/ExecutiveTest.cpp | 2 +- test/unittests/libethereum/ExtVMTest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unittests/libethereum/ExecutiveTest.cpp b/test/unittests/libethereum/ExecutiveTest.cpp index 839a0857e7b..6a6af86499b 100644 --- a/test/unittests/libethereum/ExecutiveTest.cpp +++ b/test/unittests/libethereum/ExecutiveTest.cpp @@ -26,7 +26,7 @@ class ExecutiveTest : public testing::Test // called after blockHeader is set up EnvInfo envInfo() const { - return {blockHeader, lastBlockHashes, ethash.chainParams().chainID, 0}; + return {blockHeader, lastBlockHashes, 0, ethash.chainParams().chainID}; } Ethash ethash; diff --git a/test/unittests/libethereum/ExtVMTest.cpp b/test/unittests/libethereum/ExtVMTest.cpp index e13769d3ba7..9ad7848513a 100644 --- a/test/unittests/libethereum/ExtVMTest.cpp +++ b/test/unittests/libethereum/ExtVMTest.cpp @@ -50,7 +50,7 @@ class ExtVMIstanbulTestFixture : public TestOutputHelperFixture EnvInfo createEnvInfo(BlockHeader const& _header) const { - return {_header, lastBlockHashes, blockchain.chainID(), 0}; + return {_header, lastBlockHashes, 0, blockchain.chainID()}; } NetworkSelector networkSelector; @@ -134,7 +134,7 @@ class ExtVMExperimentalTestFixture : public TestOutputHelperFixture EnvInfo createEnvInfo(BlockHeader const& _header) const { - return {_header, lastBlockHashes, blockchain.chainID(), 0}; + return {_header, lastBlockHashes, 0, blockchain.chainID()}; } NetworkSelector networkSelector; @@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE(BlockhashBeforeExperimentalReliesOnLastHashes) h256s lastHashes{h256("0xaaabbbccc"), h256("0xdddeeefff")}; TestLastBlockHashes lastBlockHashes(lastHashes); - EnvInfo envInfo{block.info(), lastBlockHashes, blockchain.chainID(), 0}; + EnvInfo envInfo{block.info(), lastBlockHashes, 0, blockchain.chainID()}; Address addr("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"); ExtVM extVM(block.mutableState(), envInfo, *blockchain.sealEngine(), addr, addr, addr, 0, 0, {}, {}, {}, 0, 0, false, false);