Skip to content

Commit

Permalink
Remove process_return class which only contained process_result. Rena…
Browse files Browse the repository at this point in the history 
…me process_result to ledger_code to better indicate its purpose. (nanocurrency#4442)
  • Loading branch information
@clemahieu
clemahieu authored Feb 20, 2024
1 parent cd770d7 commit 4030663
Show file tree
Hide file tree
Showing 48 changed files with 920 additions and 925 deletions.
46 changes: 23 additions & 23 deletions nano/core_test/active_transactions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ TEST (active_transactions, confirm_frontier)
node2.rep_crawler.probable_reps.emplace (nano::dev::genesis_key.pub, *peers.begin ());
}

ASSERT_EQ (nano::process_result::progress, node2.process (*send).code);
ASSERT_EQ (nano::block_status::progress, node2.process (*send));
ASSERT_TIMELY (5s, !node2.active.empty ());

// Save election to check request count afterwards
Expand Down Expand Up @@ -490,10 +490,10 @@ TEST (active_transactions, inactive_votes_cache_election_start)
.sign (key2.prv, key2.pub)
.work (*system.work.generate (key2.pub))
.build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*send1).code);
ASSERT_EQ (nano::process_result::progress, node.process (*send2).code);
ASSERT_EQ (nano::process_result::progress, node.process (*open1).code);
ASSERT_EQ (nano::process_result::progress, node.process (*open2).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send1));
ASSERT_EQ (nano::block_status::progress, node.process (*send2));
ASSERT_EQ (nano::block_status::progress, node.process (*open1));
ASSERT_EQ (nano::block_status::progress, node.process (*open2));
ASSERT_TIMELY_EQ (5s, 5, node.ledger.cache.block_count);
ASSERT_TRUE (node.active.empty ());
ASSERT_EQ (1, node.ledger.cache.cemented_count);
Expand Down Expand Up @@ -1093,14 +1093,14 @@ TEST (active_transactions, conflicting_block_vote_existing_election)
.build_shared ();
auto vote_fork = nano::test::make_final_vote (nano::dev::genesis_key, { fork });

ASSERT_EQ (nano::process_result::progress, node.process_local (send).value ().code);
ASSERT_EQ (nano::block_status::progress, node.process_local (send).value ());
ASSERT_TIMELY_EQ (5s, 1, node.active.size ());

// Vote for conflicting block, but the block does not yet exist in the ledger
node.active.vote (vote_fork);

// Block now gets processed
ASSERT_EQ (nano::process_result::fork, node.process_local (fork).value ().code);
ASSERT_EQ (nano::block_status::fork, node.process_local (fork).value ());

// Election must be confirmed
auto election (node.active.election (fork->qualified_root ()));
Expand Down Expand Up @@ -1163,11 +1163,11 @@ TEST (active_transactions, activate_account_chain)
.sign (key.prv, key.pub)
.work (*system.work.generate (open->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, node.process (*send).code);
ASSERT_EQ (nano::process_result::progress, node.process (*send2).code);
ASSERT_EQ (nano::process_result::progress, node.process (*send3).code);
ASSERT_EQ (nano::process_result::progress, node.process (*open).code);
ASSERT_EQ (nano::process_result::progress, node.process (*receive).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send));
ASSERT_EQ (nano::block_status::progress, node.process (*send2));
ASSERT_EQ (nano::block_status::progress, node.process (*send3));
ASSERT_EQ (nano::block_status::progress, node.process (*open));
ASSERT_EQ (nano::block_status::progress, node.process (*receive));

node.scheduler.priority.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ());
ASSERT_TIMELY (5s, node.active.election (send->qualified_root ()));
Expand Down Expand Up @@ -1246,9 +1246,9 @@ TEST (active_transactions, activate_inactive)
.work (*system.work.generate (key.pub))
.build_shared ();

ASSERT_EQ (nano::process_result::progress, node.process (*send).code);
ASSERT_EQ (nano::process_result::progress, node.process (*send2).code);
ASSERT_EQ (nano::process_result::progress, node.process (*open).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send));
ASSERT_EQ (nano::block_status::progress, node.process (*send2));
ASSERT_EQ (nano::block_status::progress, node.process (*open));

auto election = nano::test::start_election (system, node, send2->hash ());
ASSERT_NE (nullptr, election);
Expand Down Expand Up @@ -1283,7 +1283,7 @@ TEST (active_transactions, list_active)
.work (*system.work.generate (nano::dev::genesis->hash ()))
.build_shared ();

ASSERT_EQ (nano::process_result::progress, node.process (*send).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send));

auto send2 = builder.make_block ()
.account (nano::dev::genesis_key.pub)
Expand All @@ -1295,7 +1295,7 @@ TEST (active_transactions, list_active)
.work (*system.work.generate (send->hash ()))
.build_shared ();

ASSERT_EQ (nano::process_result::progress, node.process (*send2).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send2));

auto open = builder.make_block ()
.account (key.pub)
Expand All @@ -1307,7 +1307,7 @@ TEST (active_transactions, list_active)
.work (*system.work.generate (key.pub))
.build_shared ();

ASSERT_EQ (nano::process_result::progress, node.process (*open).code);
ASSERT_EQ (nano::block_status::progress, node.process (*open));

ASSERT_TRUE (nano::test::start_elections (system, node, { send, send2, open }));
ASSERT_EQ (3, node.active.size ());
Expand Down Expand Up @@ -1340,7 +1340,7 @@ TEST (active_transactions, vacancy)
.work (*system.work.generate (nano::dev::genesis->hash ()))
.build_shared ();
node.active.vacancy_update = [&updated] () { updated = true; };
ASSERT_EQ (nano::process_result::progress, node.process (*send).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send));
ASSERT_EQ (1, node.active.vacancy ());
ASSERT_EQ (0, node.active.size ());
node.scheduler.priority.activate (nano::dev::genesis_key.pub, node.store.tx_begin_read ());
Expand Down Expand Up @@ -1381,7 +1381,7 @@ TEST (active_transactions, fifo)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (latest_hash))
.build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*send1).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send1));
node.process_confirmed (nano::election_status{ send1 });
ASSERT_TIMELY (5s, node.block_confirmed (send1->hash ()));

Expand All @@ -1396,7 +1396,7 @@ TEST (active_transactions, fifo)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*system.work.generate (latest_hash))
.build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*send2).code);
ASSERT_EQ (nano::block_status::progress, node.process (*send2));
node.process_confirmed (nano::election_status{ send2 });
ASSERT_TIMELY (5s, node.block_confirmed (send2->hash ()));

Expand All @@ -1409,7 +1409,7 @@ TEST (active_transactions, fifo)
.sign (key0.prv, key0.pub)
.work (*system.work.generate (key0.pub))
.build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*receive1).code);
ASSERT_EQ (nano::block_status::progress, node.process (*receive1));

auto receive2 = builder.make_block ()
.previous (0)
Expand All @@ -1420,7 +1420,7 @@ TEST (active_transactions, fifo)
.sign (key1.prv, key1.pub)
.work (*system.work.generate (key1.pub))
.build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*receive2).code);
ASSERT_EQ (nano::block_status::progress, node.process (*receive2));

// Ensure first transaction becomes active
node.scheduler.manual.push (receive1);
Expand Down
22 changes: 11 additions & 11 deletions nano/core_test/block_store.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1021,23 +1021,23 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (nano::dev::genesis->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *send).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *send));
auto receive = builder
.receive ()
.previous (send->hash ())
.source (send->hash ())
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (send->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *receive).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *receive));
auto change = builder
.change ()
.previous (receive->hash ())
.representative (0)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (receive->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *change).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *change));
auto state_send1 = builder
.state ()
.account (nano::dev::genesis_key.pub)
Expand All @@ -1048,7 +1048,7 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (change->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *state_send1).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *state_send1));
auto state_send2 = builder
.state ()
.account (nano::dev::genesis_key.pub)
Expand All @@ -1059,7 +1059,7 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (state_send1->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *state_send2).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *state_send2));
auto state_send3 = builder
.state ()
.account (nano::dev::genesis_key.pub)
Expand All @@ -1070,7 +1070,7 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (state_send2->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *state_send3).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *state_send3));
auto state_open = builder
.state ()
.account (key1.pub)
Expand All @@ -1081,7 +1081,7 @@ TEST (mdb_block_store, sideband_height)
.sign (key1.prv, key1.pub)
.work (*pool.generate (key1.pub))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *state_open).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *state_open));
auto epoch = builder
.state ()
.account (key1.pub)
Expand All @@ -1092,7 +1092,7 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (state_open->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *epoch).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *epoch));
ASSERT_EQ (nano::epoch::epoch_1, ledger.version (*epoch));
auto epoch_open = builder
.state ()
Expand All @@ -1104,7 +1104,7 @@ TEST (mdb_block_store, sideband_height)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (*pool.generate (key2.pub))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *epoch_open).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *epoch_open));
ASSERT_EQ (nano::epoch::epoch_1, ledger.version (*epoch_open));
auto state_receive = builder
.state ()
Expand All @@ -1116,7 +1116,7 @@ TEST (mdb_block_store, sideband_height)
.sign (key2.prv, key2.pub)
.work (*pool.generate (epoch_open->hash ()))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *state_receive).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *state_receive));
auto open = builder
.open ()
.source (state_send3->hash ())
Expand All @@ -1125,7 +1125,7 @@ TEST (mdb_block_store, sideband_height)
.sign (key3.prv, key3.pub)
.work (*pool.generate (key3.pub))
.build ();
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *open).code);
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, *open));
auto block1 (store.block.get (transaction, nano::dev::genesis->hash ()));
ASSERT_EQ (block1->sideband ().height, 1);
auto block2 (store.block.get (transaction, send->hash ()));
Expand Down
Loading

0 comments on commit 4030663

Please sign in to comment.