Skip to content

Commit

Permalink
blockchaintest: Fix compilation with GCC
Browse files Browse the repository at this point in the history
  • Loading branch information
chfast committed Sep 25, 2023
1 parent d7252a2 commit c13c88f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion test/blockchaintest/blockchaintest_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ BlockHeader from_json<BlockHeader>(const json::json& j)
load_if_exists<hash256>(j, "parentBeaconBlockRoot")};
}

TestBlock load_test_block(const json::json& j, evmc_revision rev)
static TestBlock load_test_block(const json::json& j, evmc_revision rev)
{
using namespace state;
TestBlock tb;
Expand Down
16 changes: 8 additions & 8 deletions test/blockchaintest/blockchaintest_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ struct TransitionResult
int64_t gas_used;
};

TransitionResult apply_block(state::State& state, evmc::VM& vm, const state::BlockInfo& block,
const std::vector<state::Transaction>& txs, evmc_revision rev,
static TransitionResult apply_block(state::State& state, evmc::VM& vm,
const state::BlockInfo& block, const std::vector<state::Transaction>& txs, evmc_revision rev,
std::optional<int64_t> block_reward)
{
state::system_calls(state, block, rev, vm);
Expand Down Expand Up @@ -82,7 +82,7 @@ TransitionResult apply_block(state::State& state, evmc::VM& vm, const state::Blo
return {receipts, rejected_txs, cumulative_gas_used};
}

std::optional<int64_t> mining_reward(evmc_revision rev)
static std::optional<int64_t> mining_reward(evmc_revision rev)
{
if (rev < EVMC_BYZANTIUM)
return 5000000000000000000;
Expand All @@ -94,7 +94,7 @@ std::optional<int64_t> mining_reward(evmc_revision rev)
return {};
}

std::string print_state(const state::State& s)
static std::string print_state(const state::State& s)
{
std::stringstream out;
const std::map<address, state::Account> ordered(
Expand Down Expand Up @@ -122,10 +122,10 @@ std::string print_state(const state::State& s)
return out.str();
}

std::string compare_states(const state::State& l, const state::State& r)
{
return print_state(l) + "\n\n" + print_state(r);
}
// static std::string compare_states(const state::State& l, const state::State& r)
//{
// return print_state(l) + "\n\n" + print_state(r);
// }

void run_blockchain_test(const BlockchainTransitionTest& test, evmc::VM& vm)
{
Expand Down

0 comments on commit c13c88f

Please sign in to comment.