Skip to content

Commit dc7ace4

Browse files
pwojcikdevpwojcikdev
committed
Rename ledger dependencies_confirmed to dependencies_cemented 
1 parent 17a6483 commit dc7ace4

14 files changed

Lines changed: 30 additions & 40 deletions

‎nano/core_test/ledger.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5014,14 +5014,14 @@ TEST (ledger, block_dependencies)
50145014
}
50155015
}
50165016

5017-
TEST (ledger, dependencies_confirmed)
5017+
TEST (ledger, dependencies_cemented)
50185018
{
50195019
auto ctx = nano::test::ledger_empty ();
50205020
auto & ledger = ctx.ledger ();
50215021
auto & store = ctx.store ();
50225022
auto transaction = ledger.tx_begin_write ();
50235023
nano::block_builder builder;
5024-
ASSERT_TRUE (ledger.dependencies_confirmed (transaction, *nano::dev::genesis));
5024+
ASSERT_TRUE (ledger.dependencies_cemented (transaction, *nano::dev::genesis));
50255025
auto & pool = ctx.pool ();
50265026
nano::keypair key1;
50275027
auto send1 = builder.state ()
@@ -5034,7 +5034,7 @@ TEST (ledger, dependencies_confirmed)
50345034
.work (*pool.generate (nano::dev::genesis->hash ()))
50355035
.build ();
50365036
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, send1));
5037-
ASSERT_TRUE (ledger.dependencies_confirmed (transaction, *send1));
5037+
ASSERT_TRUE (ledger.dependencies_cemented (transaction, *send1));
50385038
auto send2 = builder.state ()
50395039
.account (nano::dev::genesis_key.pub)
50405040
.previous (send1->hash ())
@@ -5045,7 +5045,7 @@ TEST (ledger, dependencies_confirmed)
50455045
.work (*pool.generate (send1->hash ()))
50465046
.build ();
50475047
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, send2));
5048-
ASSERT_FALSE (ledger.dependencies_confirmed (transaction, *send2));
5048+
ASSERT_FALSE (ledger.dependencies_cemented (transaction, *send2));
50495049
auto receive1 = builder.state ()
50505050
.account (key1.pub)
50515051
.previous (0)
@@ -5056,9 +5056,9 @@ TEST (ledger, dependencies_confirmed)
50565056
.work (*pool.generate (key1.pub))
50575057
.build ();
50585058
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive1));
5059-
ASSERT_FALSE (ledger.dependencies_confirmed (transaction, *receive1));
5059+
ASSERT_FALSE (ledger.dependencies_cemented (transaction, *receive1));
50605060
ledger.cement (transaction, send1->hash ());
5061-
ASSERT_TRUE (ledger.dependencies_confirmed (transaction, *receive1));
5061+
ASSERT_TRUE (ledger.dependencies_cemented (transaction, *receive1));
50625062
auto receive2 = builder.state ()
50635063
.account (key1.pub)
50645064
.previous (receive1->hash ())
@@ -5069,14 +5069,14 @@ TEST (ledger, dependencies_confirmed)
50695069
.work (*pool.generate (receive1->hash ()))
50705070
.build ();
50715071
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive2));
5072-
ASSERT_FALSE (ledger.dependencies_confirmed (transaction, *receive2));
5072+
ASSERT_FALSE (ledger.dependencies_cemented (transaction, *receive2));
50735073
ledger.cement (transaction, receive1->hash ());
5074-
ASSERT_FALSE (ledger.dependencies_confirmed (transaction, *receive2));
5074+
ASSERT_FALSE (ledger.dependencies_cemented (transaction, *receive2));
50755075
ledger.cement (transaction, send2->hash ());
5076-
ASSERT_TRUE (ledger.dependencies_confirmed (transaction, *receive2));
5076+
ASSERT_TRUE (ledger.dependencies_cemented (transaction, *receive2));
50775077
}
50785078

5079-
TEST (ledger, dependencies_confirmed_pruning)
5079+
TEST (ledger, dependencies_cemented_pruning)
50805080
{
50815081
nano::logger logger;
50825082
nano::stats stats{ logger };
@@ -5120,7 +5120,7 @@ TEST (ledger, dependencies_confirmed_pruning)
51205120
.work (*pool.generate (key1.pub))
51215121
.build ();
51225122
ASSERT_EQ (nano::block_status::progress, ledger.process (transaction, receive1));
5123-
ASSERT_TRUE (ledger.dependencies_confirmed (transaction, *receive1));
5123+
ASSERT_TRUE (ledger.dependencies_cemented (transaction, *receive1));
51245124
}
51255125

51265126
TEST (ledger, block_confirmed)
@@ -5969,7 +5969,7 @@ TEST (ledger, cement_bounded)
59695969
ASSERT_EQ (confirmed1.size (), 3);
59705970
// Only topmost dependencies should get cemented during this call
59715971
ASSERT_TRUE (std::all_of (confirmed1.begin (), confirmed1.end (), [&] (auto const & block) {
5972-
return ledger.dependencies_confirmed (ledger.tx_begin_read (), *block);
5972+
return ledger.dependencies_cemented (ledger.tx_begin_read (), *block);
59735973
}));
59745974

59755975
{
@@ -5981,7 +5981,7 @@ TEST (ledger, cement_bounded)
59815981
ASSERT_EQ (confirmed2.size (), 16);
59825982
// Only topmost dependencies should get cemented during this call
59835983
ASSERT_TRUE (std::all_of (confirmed2.begin (), confirmed2.end (), [&] (auto const & block) {
5984-
return ledger.dependencies_confirmed (ledger.tx_begin_read (), *block);
5984+
return ledger.dependencies_cemented (ledger.tx_begin_read (), *block);
59855985
}));
59865986

59875987
{
@@ -6015,7 +6015,7 @@ TEST (ledger, cement_bounded_diamond)
60156015
ASSERT_EQ (confirmed1.size (), 3);
60166016
// Only topmost dependencies should get cemented during this call
60176017
ASSERT_TRUE (std::all_of (confirmed1.begin (), confirmed1.end (), [&] (auto const & block) {
6018-
return ledger.dependencies_confirmed (ledger.tx_begin_read (), *block);
6018+
return ledger.dependencies_cemented (ledger.tx_begin_read (), *block);
60196019
}));
60206020

60216021
{
@@ -6027,7 +6027,7 @@ TEST (ledger, cement_bounded_diamond)
60276027
ASSERT_EQ (confirmed2.size (), 16);
60286028
// Only topmost dependencies should get cemented during this call
60296029
ASSERT_TRUE (std::all_of (confirmed2.begin (), confirmed2.end (), [&] (auto const & block) {
6030-
return ledger.dependencies_confirmed (ledger.tx_begin_read (), *block);
6030+
return ledger.dependencies_cemented (ledger.tx_begin_read (), *block);
60316031
}));
60326032

60336033
{
@@ -6039,7 +6039,7 @@ TEST (ledger, cement_bounded_diamond)
60396039
ASSERT_EQ (confirmed3.size (), 64);
60406040
// Only topmost dependencies should get cemented during this call
60416041
ASSERT_TRUE (std::all_of (confirmed2.begin (), confirmed2.end (), [&] (auto const & block) {
6042-
return ledger.dependencies_confirmed (ledger.tx_begin_read (), *block);
6042+
return ledger.dependencies_cemented (ledger.tx_begin_read (), *block);
60436043
}));
60446044

60456045
{

‎nano/core_test/logging.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ TEST (log_parse, parse_type)
8181
TEST (log_parse, parse_detail)
8282
{
8383
ASSERT_EQ (nano::log::parse_detail ("all"), nano::log::detail::all);
84-
ASSERT_EQ (nano::log::parse_detail ("process_confirmed"), nano::log::detail::process_confirmed);
84+
ASSERT_EQ (nano::log::parse_detail ("test"), nano::log::detail::test);
8585
ASSERT_THROW (nano::log::parse_detail ("enumnotpresent"), std::invalid_argument);
8686
ASSERT_THROW (nano::log::parse_detail (""), std::invalid_argument);
8787
ASSERT_THROW (nano::log::parse_detail ("_last"), std::invalid_argument);
@@ -92,7 +92,7 @@ TEST (log_parse, parse_logger_id)
9292
{
9393
ASSERT_EQ (nano::log::parse_logger_id ("node"), std::make_pair (nano::log::type::node, nano::log::detail::all));
9494
ASSERT_EQ (nano::log::parse_logger_id ("node::all"), std::make_pair (nano::log::type::node, nano::log::detail::all));
95-
ASSERT_EQ (nano::log::parse_logger_id ("node::process_confirmed"), std::make_pair (nano::log::type::node, nano::log::detail::process_confirmed));
95+
ASSERT_EQ (nano::log::parse_logger_id ("node::test"), std::make_pair (nano::log::type::node, nano::log::detail::test));
9696
ASSERT_THROW (nano::log::parse_logger_id ("_last"), std::invalid_argument);
9797
ASSERT_THROW (nano::log::parse_logger_id ("node::enumnotpresent"), std::invalid_argument);
9898
ASSERT_THROW (nano::log::parse_logger_id ("node::"), std::invalid_argument);

‎nano/core_test/node.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3452,7 +3452,7 @@ TEST (node, deferred_dependent_elections)
34523452
ASSERT_FALSE (node.active.active (receive->qualified_root ()));
34533453
election_open->force_confirm ();
34543454
ASSERT_TIMELY (5s, node.block_confirmed (open->hash ()));
3455-
ASSERT_FALSE (node.ledger.dependencies_confirmed (node.ledger.tx_begin_read (), *receive));
3455+
ASSERT_FALSE (node.ledger.dependencies_cemented (node.ledger.tx_begin_read (), *receive));
34563456
ASSERT_NEVER (0.5s, node.active.active (receive->qualified_root ()));
34573457
ASSERT_FALSE (node.ledger.rollback (node.ledger.tx_begin_write (), receive->hash ()));
34583458
ASSERT_FALSE (node.block (receive->hash ()));

‎nano/core_test/request_aggregator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ TEST (request_aggregator, cannot_vote)
422422
ASSERT_EQ (nano::block_status::progress, node.process (send1));
423423
ASSERT_EQ (nano::block_status::progress, node.process (send2));
424424
system.wallet (0)->insert_adhoc (nano::dev::genesis_key.prv);
425-
ASSERT_FALSE (node.ledger.dependencies_confirmed (node.ledger.tx_begin_read (), *send2));
425+
ASSERT_FALSE (node.ledger.dependencies_cemented (node.ledger.tx_begin_read (), *send2));
426426

427427
std::vector<std::pair<nano::block_hash, nano::root>> request;
428428
// Correct hash, correct root

‎nano/lib/logging_enums.hpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ enum class detail
119119

120120
test,
121121

122-
// node
123-
process_confirmed,
124-
125122
// active_elections
126123
active_started,
127124
active_stopped,

‎nano/lib/stats_enums.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ enum class type
132132
message_processor,
133133
message_processor_overfill,
134134
message_processor_type,
135-
process_confirmed,
136135
online_reps,
137136
pruning,
138137
fork_cache,

‎nano/node/nodeconfig.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -702,10 +702,6 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
702702
{
703703
toml.get_error ().set ("max_work_generate_multiplier must be greater than or equal to 1");
704704
}
705-
if (block_processor_batch_max_time < network_params.node.process_confirmed_interval)
706-
{
707-
toml.get_error ().set ((boost::format ("block_processor_batch_max_time value must be equal or larger than %1%ms") % network_params.node.process_confirmed_interval.count ()).str ());
708-
}
709705
if (max_pruning_age < std::chrono::seconds (5 * 60) && !network_params.network.is_dev_network ())
710706
{
711707
toml.get_error ().set ("max_pruning_age must be greater than or equal to 5 minutes");

‎nano/node/scheduler/hinted.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void nano::scheduler::hinted::activate (secure::read_transaction & transaction,
9797
if (check_dependencies)
9898
{
9999
// Perform a depth-first search of the dependency graph
100-
if (!node.ledger.dependencies_confirmed (transaction, *block))
100+
if (!node.ledger.dependencies_cemented (transaction, *block))
101101
{
102102
stats.inc (nano::stat::type::hinting, nano::stat::detail::dependency_unconfirmed);
103103
auto dependencies = block->dependencies ();

‎nano/node/scheduler/priority.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ bool nano::scheduler::priority::activate (secure::transaction const & transactio
132132
return false; // Not activated
133133
}
134134

135-
if (ledger.dependencies_confirmed (transaction, *block))
135+
if (ledger.dependencies_cemented (transaction, *block))
136136
{
137137
auto const [priority_balance, priority_timestamp] = ledger.block_priority (transaction, *block);
138138
auto const bucket_index = bucketing.bucket_index (priority_balance);

‎nano/node/vote_generator.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bool nano::vote_generator::should_vote (transaction_variant_t const & transactio
5454
auto const & transaction = std::get<nano::secure::write_transaction> (transaction_variant);
5555

5656
block = ledger.any.block_get (transaction, hash_a);
57-
should_vote = block != nullptr && ledger.dependencies_confirmed (transaction, *block) && ledger.store.final_vote.put (transaction, block->qualified_root (), hash_a);
57+
should_vote = block != nullptr && ledger.dependencies_cemented (transaction, *block) && ledger.store.final_vote.put (transaction, block->qualified_root (), hash_a);
5858
debug_assert (block == nullptr || root_a == block->root ());
5959
}
6060
else
@@ -63,7 +63,7 @@ bool nano::vote_generator::should_vote (transaction_variant_t const & transactio
6363
auto const & transaction = std::get<nano::secure::read_transaction> (transaction_variant);
6464

6565
block = ledger.any.block_get (transaction, hash_a);
66-
should_vote = block != nullptr && ledger.dependencies_confirmed (transaction, *block);
66+
should_vote = block != nullptr && ledger.dependencies_cemented (transaction, *block);
6767
}
6868

6969
logger.trace (log_type (), nano::log::detail::should_vote,
@@ -154,13 +154,13 @@ std::size_t nano::vote_generator::generate (std::vector<std::shared_ptr<nano::bl
154154
request_t::first_type req_candidates;
155155
{
156156
auto transaction = ledger.tx_begin_read ();
157-
auto dependencies_confirmed = [&transaction, this] (auto const & block_a) {
158-
return this->ledger.dependencies_confirmed (transaction, *block_a);
157+
auto dependencies_cemented = [&transaction, this] (auto const & block_a) {
158+
return this->ledger.dependencies_cemented (transaction, *block_a);
159159
};
160160
auto as_candidate = [] (auto const & block_a) {
161161
return candidate_t{ block_a->root (), block_a->hash () };
162162
};
163-
nano::transform_if (blocks_a.begin (), blocks_a.end (), std::back_inserter (req_candidates), dependencies_confirmed, as_candidate);
163+
nano::transform_if (blocks_a.begin (), blocks_a.end (), std::back_inserter (req_candidates), dependencies_cemented, as_candidate);
164164
}
165165
auto const result = req_candidates.size ();
166166
nano::lock_guard<nano::mutex> guard{ mutex };

0 commit comments

Comments
 (0)