Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/skaled 1951 broken all tests #1997

Merged
merged 9 commits into from
Oct 3, 2024
Merged

Bug/skaled 1951 broken all tests #1997

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5ee9c66
SKALED-1951 Fixed some --all unit tests
dimalit Sep 18, 2024
b119c8b
SKALED-1951 Back to 64k contract size limit
dimalit Sep 19, 2024
3c1ba24
SKALED-1951 reset() external gas in ignoreExternalGas() for tests
dimalit Sep 19, 2024
67f6163
Merge remote-tracking branch 'origin/v3.20.0' into bug/SKALED-1951-br…
dimalit Sep 19, 2024
901a1b2
SKALED-1951 Disable --all tests that require maxCodeSize 0x6000
dimalit Sep 19, 2024
b76f2c1
SKALED-1951 Fix CommonJSTests
dimalit Sep 26, 2024
fc39a25
Merge branch 'v3.20.0' into bug/SKALED-1951-broken-all-tests
dimalit Sep 27, 2024
a1d8229
Merge branch 'v3.20.0' into bug/SKALED-1951-broken-all-tests
dimalit Sep 30, 2024
e96df22
SKALED-1951 Remove commented code
dimalit Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libethcore/ChainOperationParams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ EVMSchedule const ChainOperationParams::makeEvmSchedule(
result = EIP158Schedule;
else if ( _workingBlockNumber >= EIP150ForkBlock )
result = EIP150Schedule;
else if ( _workingBlockNumber >= homesteadForkBlock )
return HomesteadSchedule;
else
result = HomesteadSchedule;
return FrontierSchedule;

// 2 based on previous - decide by timestamp
if ( PushZeroPatch::isEnabledWhen( _committedBlockTimestamp ) )
Expand Down
2 changes: 2 additions & 0 deletions libethcore/EVMSchedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ struct EVMSchedule {
};

static const EVMSchedule DefaultSchedule = EVMSchedule();
// Used only in GeneralStateTests --all tests
static const EVMSchedule FrontierSchedule = EVMSchedule( false, false, 21000 );
static const EVMSchedule HomesteadSchedule = EVMSchedule( true, true, 53000 );

static const EVMSchedule EIP150Schedule = [] {
Expand Down
2 changes: 1 addition & 1 deletion libethereum/Transaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class Transaction : public TransactionBase {

void ignoreExternalGas() {
m_externalGasIsChecked = true;
m_externalGas = 0;
m_externalGas.reset();
}

private:
Expand Down
8 changes: 4 additions & 4 deletions test/tools/jsontests/BlockChainTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,10 +1111,10 @@ BOOST_AUTO_TEST_CASE( stZeroCallsTest,
*boost::unit_test::precondition( dev::test::run_not_express ) ) {}
BOOST_AUTO_TEST_CASE( stZeroCallsRevert,
*boost::unit_test::precondition( dev::test::run_not_express ) ) {}
BOOST_AUTO_TEST_CASE( stCodeSizeLimit,
*boost::unit_test::precondition( dev::test::run_not_express ) ) {}
BOOST_AUTO_TEST_CASE( stCreateTest,
*boost::unit_test::precondition( dev::test::run_not_express ) ) {}
// BOOST_AUTO_TEST_CASE( stCodeSizeLimit,
// *boost::unit_test::precondition( dev::test::run_not_express ) ) {}
// BOOST_AUTO_TEST_CASE( stCreateTest,
// *boost::unit_test::precondition( dev::test::run_not_express ) ) {}
BOOST_AUTO_TEST_CASE( stRevertTest,
*boost::unit_test::precondition( dev::test::run_not_express ) ) {}

Expand Down
3 changes: 3 additions & 0 deletions test/tools/libtesteth/ImportTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ void ImportTest::importTransaction( json_spirit::mObject const& _o, eth::Transac
toInt( _o.at( "gasLimit" ) ), Address( _o.at( "to" ).get_str() ),
importData( _o ), toInt( _o.at( "nonce" ) ),
Secret( _o.at( "secretKey" ).get_str() ) );
o_tr.ignoreExternalGas();
} else {
requireJsonFields( _o, "transaction",
{{"data", jsonVType::str_type}, {"gasLimit", jsonVType::str_type},
Expand All @@ -429,6 +430,7 @@ void ImportTest::importTransaction( json_spirit::mObject const& _o, eth::Transac
RLP transactionRLP( transactionRLPStream.out() );
try {
o_tr = Transaction( transactionRLP.data(), CheckTransaction::Everything );
o_tr.ignoreExternalGas();
} catch ( InvalidSignature const& ) {
// create unsigned transaction
o_tr = _o.at( "to" ).get_str().empty() ?
Expand All @@ -438,6 +440,7 @@ void ImportTest::importTransaction( json_spirit::mObject const& _o, eth::Transac
Transaction( toInt( _o.at( "value" ) ), toInt( _o.at( "gasPrice" ) ),
toInt( _o.at( "gasLimit" ) ), Address( _o.at( "to" ).get_str() ),
importData( _o ), toInt( _o.at( "nonce" ) ) );
o_tr.ignoreExternalGas();
} catch ( Exception& _e ) {
cnote << "invalid transaction" << boost::diagnostic_information( _e );
}
Expand Down
2 changes: 1 addition & 1 deletion test/tools/libtestutils/Common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ boost::filesystem::path dev::test::getTestPath() {
return Options::get().testpath;

string testPath;
const char* ptestPath = getenv( "ETHEREUM_TEST_PATH" );
static const char* ptestPath = getenv( "ETHEREUM_TEST_PATH" );

if ( ptestPath == nullptr ) {
clog( VerbosityDebug, "test" )
Expand Down
10 changes: 5 additions & 5 deletions test/unittests/libdevcore/CommonJS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,26 @@ BOOST_AUTO_TEST_CASE( test_jsToFixed, *boost::unit_test::precondition( dev::test
"0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ) );
h256 b( "0x000000000000000000000000000000000000000000000000000000740c54b42f" );
BOOST_CHECK( b == jsToFixed< 32 >( "498423084079" ) );
BOOST_CHECK( h256() == jsToFixed< 32 >( "NotAHexadecimalOrDecimal" ) );
BOOST_CHECK_THROW( jsToFixed< 32 >( "NotAHexadecimalOrDecimal" ), std::invalid_argument );
}

BOOST_AUTO_TEST_CASE( test_jsToInt, *boost::unit_test::precondition( dev::test::run_not_express ) ) {
BOOST_CHECK( 43832124 == jsToInt( "43832124" ) );
BOOST_CHECK( 1342356623 == jsToInt( "0x5002bc8f" ) );
BOOST_CHECK( 3483942 == jsToInt( "015224446" ) );
BOOST_CHECK( 0 == jsToInt( "NotAHexadecimalOrDecimal" ) );
BOOST_CHECK_THROW( jsToInt( "NotAHexadecimalOrDecimal" ), std::invalid_argument );

BOOST_CHECK( u256( "983298932490823474234" ) == jsToInt< 32 >( "983298932490823474234" ) );
BOOST_CHECK( u256( "983298932490823474234" ) == jsToInt< 32 >( "0x354e03915c00571c3a" ) );
BOOST_CHECK( u256() == jsToInt< 32 >( "NotAHexadecimalOrDecimal" ) );
BOOST_CHECK_THROW( jsToInt< 32 >( "NotAHexadecimalOrDecimal" ), std::invalid_argument );
BOOST_CHECK( u128( "228273101986715476958866839113050921216" ) ==
jsToInt< 16 >( "0xabbbccddeeff11223344556677889900" ) );
BOOST_CHECK( u128() == jsToInt< 16 >( "NotAHexadecimalOrDecimal" ) );
BOOST_CHECK_THROW( jsToInt< 16 >( "NotAHexadecimalOrDecimal" ), std::invalid_argument );
}

BOOST_AUTO_TEST_CASE( test_jsToU256, *boost::unit_test::precondition( dev::test::run_not_express ) ) {
BOOST_CHECK( u256( "983298932490823474234" ) == jsToU256( "983298932490823474234" ) );
BOOST_CHECK( u256() == jsToU256( "NotAHexadecimalOrDecimal" ) );
BOOST_CHECK_THROW( jsToU256( "NotAHexadecimalOrDecimal" ), std::invalid_argument );
}

BOOST_AUTO_TEST_SUITE_END()
Loading