Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 48299d7

Browse files
Dimitry Khgumb0
Dimitry Kh
authored and
gumb0
committed
address andrey's comments
1 parent b9422f3 commit 48299d7

File tree

7 files changed

+166
-185
lines changed

7 files changed

+166
-185
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
## [1.7.0] - Unreleased
44

5-
- Added: [#5735](https://github.com/ethereum/aleth/pull/5735) LegacyTests suite to the testeth
65
- Added: [#5537](https://github.com/ethereum/aleth/pull/5537) Creating Ethereum Node Record (ENR) at program start.
76
- Added: [#5571](https://github.com/ethereum/aleth/pull/5571) Support Discovery v4 ENR Extension messages.
87
- Added: [#5557](https://github.com/ethereum/aleth/pull/5557) Improved debug logging of full sync.
@@ -21,6 +20,7 @@
2120
- Added: [#5701](https://github.com/ethereum/aleth/issues/5701) Outputs ENR text representation in admin.nodeInfo RPC.
2221
- Added: [#5705](https://github.com/ethereum/aleth/pull/5705) Istanbul support: EIP 1108 Reduce alt_bn128 precompile gas costs.
2322
- Added: [#5707](https://github.com/ethereum/aleth/pull/5707) Aleth waits for 2 seconds after sending disconnect to peer before closing socket.
23+
- Changed: [#5735](https://github.com/ethereum/aleth/pull/5735) Tests <= ConstantinopleFix moved to `-t LegacyTests suite` in the testeth
2424
- Changed: [#5532](https://github.com/ethereum/aleth/pull/5532) The leveldb is upgraded to 1.22. This is breaking change on Windows and the old databases are not compatible.
2525
- Changed: [#5559](https://github.com/ethereum/aleth/pull/5559) Update peer validation error messages.
2626
- Changed: [#5568](https://github.com/ethereum/aleth/pull/5568) Improve rlpx handshake log messages and create new rlpx log channel.

‎test/tools/jsontests/BlockChainTests.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class BCGeneralStateTestsSuite : public BlockchainValidTestSuite
5757
class bcGeneralTestsFixture : public StateTestFixtureBase<BCGeneralStateTestsSuite>
5858
{
5959
public:
60-
bcGeneralTestsFixture() : StateTestFixtureBase(TestExecution::RequireOptionAll) {}
60+
bcGeneralTestsFixture() : StateTestFixtureBase({TestExecution::RequireOptionAll}) {}
6161
};
6262

6363
class TransitionTestsSuite: public TestSuite

‎test/tools/jsontests/LegacyTests.cpp‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
// Aleth: Ethereum C++ client, tools and libraries.
2+
// Copyright 2019 Aleth Authors.
3+
// Licensed under the GNU General Public License, Version 3.
4+
5+
#include <test/tools/jsontests/LegacyTests.h>
6+
#include <test/tools/libtesteth/TestHelper.h>
7+
#include <boost/test/unit_test.hpp>
8+
using namespace dev::test;
9+
10+
BOOST_AUTO_TEST_SUITE(LegacyTests)
11+
BOOST_AUTO_TEST_SUITE(Constantinople)
12+
BOOST_FIXTURE_TEST_SUITE(GeneralStateTests, LegacyConstantinopleGeneralStateTestFixture)
13+
// Frontier Tests
14+
BOOST_AUTO_TEST_CASE(stCallCodes) {}
15+
BOOST_AUTO_TEST_CASE(stCallCreateCallCodeTest) {}
16+
BOOST_AUTO_TEST_CASE(stExample) {}
17+
BOOST_AUTO_TEST_CASE(stInitCodeTest) {}
18+
BOOST_AUTO_TEST_CASE(stLogTests) {}
19+
BOOST_AUTO_TEST_CASE(stMemoryTest) {}
20+
BOOST_AUTO_TEST_CASE(stPreCompiledContracts) {}
21+
BOOST_AUTO_TEST_CASE(stPreCompiledContracts2) {}
22+
BOOST_AUTO_TEST_CASE(stRandom) {}
23+
BOOST_AUTO_TEST_CASE(stRandom2) {}
24+
BOOST_AUTO_TEST_CASE(stRecursiveCreate) {}
25+
BOOST_AUTO_TEST_CASE(stRefundTest) {}
26+
BOOST_AUTO_TEST_CASE(stSolidityTest) {}
27+
BOOST_AUTO_TEST_CASE(stSpecialTest) {}
28+
BOOST_AUTO_TEST_CASE(stSystemOperationsTest) {}
29+
BOOST_AUTO_TEST_CASE(stTransactionTest) {}
30+
BOOST_AUTO_TEST_CASE(stTransitionTest) {}
31+
BOOST_AUTO_TEST_CASE(stWalletTest) {}
32+
33+
// Homestead Tests
34+
BOOST_AUTO_TEST_CASE(stCallDelegateCodesCallCodeHomestead) {}
35+
BOOST_AUTO_TEST_CASE(stCallDelegateCodesHomestead) {}
36+
BOOST_AUTO_TEST_CASE(stHomesteadSpecific) {}
37+
BOOST_AUTO_TEST_CASE(stDelegatecallTestHomestead) {}
38+
39+
// EIP150 Tests
40+
BOOST_AUTO_TEST_CASE(stChangedEIP150) {}
41+
BOOST_AUTO_TEST_CASE(stEIP150singleCodeGasPrices) {}
42+
BOOST_AUTO_TEST_CASE(stMemExpandingEIP150Calls) {}
43+
BOOST_AUTO_TEST_CASE(stEIP150Specific) {}
44+
45+
// EIP158 Tests
46+
BOOST_AUTO_TEST_CASE(stEIP158Specific) {}
47+
BOOST_AUTO_TEST_CASE(stNonZeroCallsTest) {}
48+
BOOST_AUTO_TEST_CASE(stZeroCallsTest) {}
49+
BOOST_AUTO_TEST_CASE(stZeroCallsRevert) {}
50+
BOOST_AUTO_TEST_CASE(stCodeSizeLimit) {}
51+
BOOST_AUTO_TEST_CASE(stCreateTest) {}
52+
BOOST_AUTO_TEST_CASE(stRevertTest) {}
53+
54+
// Metropolis Tests
55+
BOOST_AUTO_TEST_CASE(stStackTests) {}
56+
BOOST_AUTO_TEST_CASE(stStaticCall) {}
57+
BOOST_AUTO_TEST_CASE(stReturnDataTest) {}
58+
BOOST_AUTO_TEST_CASE(stZeroKnowledge) {}
59+
BOOST_AUTO_TEST_CASE(stZeroKnowledge2) {}
60+
BOOST_AUTO_TEST_CASE(stCodeCopyTest) {}
61+
BOOST_AUTO_TEST_CASE(stBugs) {}
62+
63+
// Constantinople Tests
64+
BOOST_AUTO_TEST_CASE(stShift) {}
65+
BOOST_AUTO_TEST_CASE(stCreate2) {}
66+
BOOST_AUTO_TEST_CASE(stExtCodeHash) {}
67+
BOOST_AUTO_TEST_CASE(stSStoreTest) {}
68+
69+
// Stress Tests
70+
BOOST_AUTO_TEST_CASE(stAttackTest) {}
71+
BOOST_AUTO_TEST_CASE(stMemoryStressTest) {}
72+
BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest) {}
73+
74+
// Invalid Opcode Tests
75+
BOOST_AUTO_TEST_CASE(stBadOpcode) {}
76+
77+
// New Tests
78+
BOOST_AUTO_TEST_CASE(stArgsZeroOneBalance) {}
79+
BOOST_AUTO_TEST_CASE(stEWASMTests) {}
80+
BOOST_AUTO_TEST_CASE(stTimeConsuming) {}
81+
BOOST_AUTO_TEST_SUITE_END() // GeneralStateTests Constantinople Legacy
82+
83+
BOOST_FIXTURE_TEST_SUITE(BCGeneralStateTests, LegacyConstantinopleBCGeneralStateTestFixture)
84+
// Frontier Tests
85+
BOOST_AUTO_TEST_CASE(stCallCodes) {}
86+
BOOST_AUTO_TEST_CASE(stCallCreateCallCodeTest) {}
87+
BOOST_AUTO_TEST_CASE(stExample) {}
88+
BOOST_AUTO_TEST_CASE(stInitCodeTest) {}
89+
BOOST_AUTO_TEST_CASE(stLogTests) {}
90+
BOOST_AUTO_TEST_CASE(stMemoryTest) {}
91+
BOOST_AUTO_TEST_CASE(stPreCompiledContracts) {}
92+
BOOST_AUTO_TEST_CASE(stPreCompiledContracts2) {}
93+
BOOST_AUTO_TEST_CASE(stRandom) {}
94+
BOOST_AUTO_TEST_CASE(stRandom2) {}
95+
BOOST_AUTO_TEST_CASE(stRecursiveCreate) {}
96+
BOOST_AUTO_TEST_CASE(stRefundTest) {}
97+
BOOST_AUTO_TEST_CASE(stSolidityTest) {}
98+
BOOST_AUTO_TEST_CASE(stSpecialTest) {}
99+
BOOST_AUTO_TEST_CASE(stSystemOperationsTest) {}
100+
BOOST_AUTO_TEST_CASE(stTransactionTest) {}
101+
BOOST_AUTO_TEST_CASE(stTransitionTest) {}
102+
BOOST_AUTO_TEST_CASE(stWalletTest) {}
103+
104+
// Homestead Tests
105+
BOOST_AUTO_TEST_CASE(stCallDelegateCodesCallCodeHomestead) {}
106+
BOOST_AUTO_TEST_CASE(stCallDelegateCodesHomestead) {}
107+
BOOST_AUTO_TEST_CASE(stHomesteadSpecific) {}
108+
BOOST_AUTO_TEST_CASE(stDelegatecallTestHomestead) {}
109+
110+
// EIP150 Tests
111+
BOOST_AUTO_TEST_CASE(stChangedEIP150) {}
112+
BOOST_AUTO_TEST_CASE(stEIP150singleCodeGasPrices) {}
113+
BOOST_AUTO_TEST_CASE(stMemExpandingEIP150Calls) {}
114+
BOOST_AUTO_TEST_CASE(stEIP150Specific) {}
115+
116+
// EIP158 Tests
117+
BOOST_AUTO_TEST_CASE(stEIP158Specific) {}
118+
BOOST_AUTO_TEST_CASE(stNonZeroCallsTest) {}
119+
BOOST_AUTO_TEST_CASE(stZeroCallsTest) {}
120+
BOOST_AUTO_TEST_CASE(stZeroCallsRevert) {}
121+
BOOST_AUTO_TEST_CASE(stCodeSizeLimit) {}
122+
BOOST_AUTO_TEST_CASE(stCreateTest) {}
123+
BOOST_AUTO_TEST_CASE(stRevertTest) {}
124+
125+
// Metropolis Tests
126+
BOOST_AUTO_TEST_CASE(stStackTests) {}
127+
BOOST_AUTO_TEST_CASE(stStaticCall) {}
128+
BOOST_AUTO_TEST_CASE(stReturnDataTest) {}
129+
BOOST_AUTO_TEST_CASE(stZeroKnowledge) {}
130+
BOOST_AUTO_TEST_CASE(stZeroKnowledge2) {}
131+
BOOST_AUTO_TEST_CASE(stCodeCopyTest) {}
132+
BOOST_AUTO_TEST_CASE(stBugs) {}
133+
134+
// Constantinople Tests
135+
BOOST_AUTO_TEST_CASE(stShift) {}
136+
BOOST_AUTO_TEST_CASE(stCreate2) {}
137+
BOOST_AUTO_TEST_CASE(stExtCodeHash) {}
138+
BOOST_AUTO_TEST_CASE(stSStoreTest) {}
139+
140+
// Stress Tests
141+
BOOST_AUTO_TEST_CASE(stAttackTest) {}
142+
BOOST_AUTO_TEST_CASE(stMemoryStressTest) {}
143+
BOOST_AUTO_TEST_CASE(stQuadraticComplexityTest) {}
144+
145+
// Bad opcodes test
146+
BOOST_AUTO_TEST_CASE(stBadOpcode) {}
147+
148+
// New Tests
149+
BOOST_AUTO_TEST_CASE(stArgsZeroOneBalance) {}
150+
BOOST_AUTO_TEST_CASE(stTimeConsuming) {}
151+
BOOST_AUTO_TEST_SUITE_END() // BCGeneralStateTests Constantinople Legacy
152+
153+
BOOST_AUTO_TEST_SUITE_END() // Constantinople
154+
BOOST_AUTO_TEST_SUITE_END() // LegacyTests

test/tools/jsontests/LegacyTestsBoost.h renamed to test/tools/jsontests/LegacyTests.h

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
1-
/*
2-
This file is part of cpp-ethereum.
3-
4-
cpp-ethereum is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
8-
9-
cpp-ethereum is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
13-
14-
You should have received a copy of the GNU General Public License
15-
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
16-
*/
17-
/** @file LegacyTestsBoost.h
18-
* @authors:
19-
* Dimitry Khokhlov <dimitry@ethereum.org>
20-
* @date 2019
21-
*/
1+
// Aleth: Ethereum C++ client, tools and libraries.
2+
// Copyright 2019 Aleth Authors.
3+
// Licensed under the GNU General Public License, Version 3.
224

235
#include <test/tools/jsontests/BlockChainTests.h>
246
#include <test/tools/jsontests/StateTestFixtureBase.h>
@@ -61,7 +43,7 @@ class LegacyConstantinopleGeneralStateTestFixture
6143
{
6244
public:
6345
LegacyConstantinopleGeneralStateTestFixture()
64-
: StateTestFixtureBase(TestExecution::NotRefillable)
46+
: StateTestFixtureBase({TestExecution::NotRefillable})
6547
{}
6648
};
6749

@@ -70,7 +52,7 @@ class LegacyConstantinopleBCGeneralStateTestFixture
7052
{
7153
public:
7254
LegacyConstantinopleBCGeneralStateTestFixture()
73-
: StateTestFixtureBase(TestExecution::RequireOptionAllNotRefillable)
55+
: StateTestFixtureBase({TestExecution::NotRefillable, TestExecution::RequireOptionAll})
7456
{}
7557
};
7658

‎test/tools/jsontests/LegacyTestsBoost.cpp‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

0 commit comments

Comments
 (0)