dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

nano_test_network => nano_dev_network, new nano_test_network (#2877)

Browse source 
* nano_test_network moved to nano_dev_network
development tests to run on nano_dev_network

* create nano_test_network using live network work values to make multi-node tests easier without conflicting with the live network

* clang formatting

* missed is_test_network check
This commit is contained in:
Russel Waters 2020-08-11 19:42:57 -07:00 • committed by GitHub
commit 05f73185a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2003 additions and 1963 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -96,7 +96,7 @@ option(ENABLE_AES "Enable AES optimizations (enabled by default with NANO_SIMD_O
option(ENABLE_AVX2 "Enable AVX2 optimizations" OFF) option(ENABLE_AVX2 "Enable AVX2 optimizations" OFF)
SET (ACTIVE_NETWORK nano_live_network CACHE STRING "Selects which network parameters are used") SET (ACTIVE_NETWORK nano_live_network CACHE STRING "Selects which network parameters are used")
set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS nano_test_network nano_beta_network nano_live_network) set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS nano_dev_network nano_beta_network nano_live_network nano_test_network)
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)

2
ci/actions/windows/build.ps1
View file

@ -27,7 +27,7 @@ else {
$env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\debug\lib\rocksdbd.lib"' $env:ROCKS_LIB = '-DROCKSDB_LIBRARIES="c:\vcpkg\installed\x64-windows-static\debug\lib\rocksdbd.lib"'
} }
$env:NANO_SHARED_BOOST = "OFF" $env:NANO_SHARED_BOOST = "OFF"
$env:NETWORK_CFG = "test" $env:NETWORK_CFG = "dev"
$env:NANO_TEST = "-DNANO_TEST=ON" $env:NANO_TEST = "-DNANO_TEST=ON"
$env:CI = '-DCI_TEST="1"' $env:CI = '-DCI_TEST="1"'
$env:RUN = "test" $env:RUN = "test"

2
ci/build-travis.sh
View file

@ -63,7 +63,7 @@ fi
cmake \ cmake \
-G'Unix Makefiles' \ -G'Unix Makefiles' \
-DACTIVE_NETWORK=nano_test_network \ -DACTIVE_NETWORK=nano_dev_network \
-DNANO_TEST=ON \ -DNANO_TEST=ON \
-DNANO_GUI=ON \ -DNANO_GUI=ON \
-DNANO_ROCKSDB=ON \ -DNANO_ROCKSDB=ON \

4
docker/node/build.sh
View file

@ -3,7 +3,7 @@
network='live' network='live'
print_usage() { print_usage() {
echo 'build.sh [-h] [-n {live|beta|test}]' echo 'build.sh [-h] [-n {live|beta|dev}]'
} }
while getopts 'hn:' OPT; do while getopts 'hn:' OPT; do
@ -26,7 +26,7 @@ case "${network}" in
live) live)
network_tag='' network_tag=''
;; ;;
test|beta) dev|beta)
network_tag="-${network}" network_tag="-${network}"
;; ;;
*) *)

4
docker/node/entry.sh
View file

@ -81,8 +81,8 @@ case "${network}" in
beta) beta)
dirSuffix='Beta' dirSuffix='Beta'
;; ;;
test) dev)
dirSuffix='Test' dirSuffix='Dev'
;; ;;
esac esac

252
nano/core_test/active_transactions.cpp
View file

@ -22,7 +22,7 @@ TEST (active_transactions, confirm_active)
.previous (genesis.hash ()) .previous (genesis.hash ())
.destination (nano::public_key ()) .destination (nano::public_key ())
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
ASSERT_EQ (nano::process_result::progress, node1.process (*send).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send).code);
@ -43,13 +43,13 @@ TEST (active_transactions, confirm_active)
auto election = node2.active.election (send->qualified_root ()); auto election = node2.active.election (send->qualified_root ());
ASSERT_NE (nullptr, election); ASSERT_NE (nullptr, election);
// Add key to node1 // Add key to node1
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// Add representative to disabled rep crawler // Add representative to disabled rep crawler
auto peers (node2.network.random_set (1)); auto peers (node2.network.random_set (1));
ASSERT_FALSE (peers.empty ()); ASSERT_FALSE (peers.empty ());
{ {
nano::lock_guard<std::mutex> guard (node2.rep_crawler.probable_reps_mutex); nano::lock_guard<std::mutex> guard (node2.rep_crawler.probable_reps_mutex);
node2.rep_crawler.probable_reps.emplace (nano::test_genesis_key.pub, nano::genesis_amount, *peers.begin ()); node2.rep_crawler.probable_reps.emplace (nano::dev_genesis_key.pub, nano::genesis_amount, *peers.begin ());
} }
ASSERT_TIMELY (10s, node2.ledger.cache.cemented_count == 2 && node2.active.empty ()); ASSERT_TIMELY (10s, node2.ledger.cache.cemented_count == 2 && node2.active.empty ());
// At least one confirmation request // At least one confirmation request
@ -72,7 +72,7 @@ TEST (active_transactions, confirm_frontier)
.previous (genesis.hash ()) .previous (genesis.hash ())
.destination (nano::public_key ()) .destination (nano::public_key ())
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
ASSERT_EQ (nano::process_result::progress, node1.process (*send).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send).code);
@ -86,13 +86,13 @@ TEST (active_transactions, confirm_frontier)
auto election = node2.active.election (send->qualified_root ()); auto election = node2.active.election (send->qualified_root ());
ASSERT_NE (nullptr, election); ASSERT_NE (nullptr, election);
// Add key to node1 // Add key to node1
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// Add representative to disabled rep crawler // Add representative to disabled rep crawler
auto peers (node2.network.random_set (1)); auto peers (node2.network.random_set (1));
ASSERT_FALSE (peers.empty ()); ASSERT_FALSE (peers.empty ());
{ {
nano::lock_guard<std::mutex> guard (node2.rep_crawler.probable_reps_mutex); nano::lock_guard<std::mutex> guard (node2.rep_crawler.probable_reps_mutex);
node2.rep_crawler.probable_reps.emplace (nano::test_genesis_key.pub, nano::genesis_amount, *peers.begin ()); node2.rep_crawler.probable_reps.emplace (nano::dev_genesis_key.pub, nano::genesis_amount, *peers.begin ());
} }
ASSERT_TIMELY (5s, node2.ledger.cache.cemented_count == 2 && node2.active.empty ()); ASSERT_TIMELY (5s, node2.ledger.cache.cemented_count == 2 && node2.active.empty ());
ASSERT_GT (election->confirmation_request_count, 0u); ASSERT_GT (election->confirmation_request_count, 0u);
@ -110,21 +110,21 @@ TEST (active_transactions, adjusted_multiplier_priority)
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 10 * nano::xrb_ratio) .balance (nano::genesis_amount - 10 * nano::xrb_ratio)
.link (key1.pub) .link (key1.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build_shared (); .build_shared ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send1->hash ()) .previous (send1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 20 * nano::xrb_ratio) .balance (nano::genesis_amount - 20 * nano::xrb_ratio)
.link (key2.pub) .link (key2.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
auto open1 = builder.make_block () auto open1 = builder.make_block ()
@ -177,21 +177,21 @@ TEST (active_transactions, adjusted_multiplier_priority)
//genesis and key1,key2 are opened //genesis and key1,key2 are opened
//start chain of 2 on each //start chain of 2 on each
auto send3 = builder.make_block () auto send3 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send2->hash ()) .previous (send2->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (9 * nano::xrb_ratio) .balance (9 * nano::xrb_ratio)
.link (key3.pub) .link (key3.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send2->hash (), nano::difficulty::from_multiplier (150, node1.network_params.network.publish_thresholds.base))) .work (*system.work.generate (send2->hash (), nano::difficulty::from_multiplier (150, node1.network_params.network.publish_thresholds.base)))
.build_shared (); .build_shared ();
auto send4 = builder.make_block () auto send4 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send3->hash ()) .previous (send3->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (8 * nano::xrb_ratio) .balance (8 * nano::xrb_ratio)
.link (key3.pub) .link (key3.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send3->hash (), nano::difficulty::from_multiplier (150, node1.network_params.network.publish_thresholds.base))) .work (*system.work.generate (send3->hash (), nano::difficulty::from_multiplier (150, node1.network_params.network.publish_thresholds.base)))
.build_shared (); .build_shared ();
auto send5 = builder.make_block () auto send5 = builder.make_block ()
@ -272,13 +272,13 @@ TEST (active_transactions, keep_local)
nano::genesis genesis; nano::genesis genesis;
//key 1/2 will be managed by the wallet //key 1/2 will be managed by the wallet
nano::keypair key1, key2, key3, key4, key5, key6; nano::keypair key1, key2, key3, key4, key5, key6;
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (wallet.send_action (nano::test_genesis_key.pub, key1.pub, node.config.receive_minimum.number ())); auto send1 (wallet.send_action (nano::dev_genesis_key.pub, key1.pub, node.config.receive_minimum.number ()));
auto send2 (wallet.send_action (nano::test_genesis_key.pub, key2.pub, node.config.receive_minimum.number ())); auto send2 (wallet.send_action (nano::dev_genesis_key.pub, key2.pub, node.config.receive_minimum.number ()));
auto send3 (wallet.send_action (nano::test_genesis_key.pub, key3.pub, node.config.receive_minimum.number ())); auto send3 (wallet.send_action (nano::dev_genesis_key.pub, key3.pub, node.config.receive_minimum.number ()));
auto send4 (wallet.send_action (nano::test_genesis_key.pub, key4.pub, node.config.receive_minimum.number ())); auto send4 (wallet.send_action (nano::dev_genesis_key.pub, key4.pub, node.config.receive_minimum.number ()));
auto send5 (wallet.send_action (nano::test_genesis_key.pub, key5.pub, node.config.receive_minimum.number ())); auto send5 (wallet.send_action (nano::dev_genesis_key.pub, key5.pub, node.config.receive_minimum.number ()));
auto send6 (wallet.send_action (nano::test_genesis_key.pub, key6.pub, node.config.receive_minimum.number ())); auto send6 (wallet.send_action (nano::dev_genesis_key.pub, key6.pub, node.config.receive_minimum.number ()));
// should not drop wallet created transactions // should not drop wallet created transactions
ASSERT_TIMELY (5s, node.active.size () == 6); ASSERT_TIMELY (5s, node.active.size () == 6);
ASSERT_EQ (0, node.active.recently_dropped.size ()); ASSERT_EQ (0, node.active.recently_dropped.size ());
@ -342,12 +342,12 @@ TEST (active_transactions, prioritize_chains)
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 10 * nano::xrb_ratio) .balance (nano::genesis_amount - 10 * nano::xrb_ratio)
.link (key1.pub) .link (key1.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
auto open1 = builder.make_block () auto open1 = builder.make_block ()
@ -387,7 +387,7 @@ TEST (active_transactions, prioritize_chains)
.previous (send1->hash ()) .previous (send1->hash ())
.balance (nano::genesis_amount - 20 * nano::xrb_ratio) .balance (nano::genesis_amount - 20 * nano::xrb_ratio)
.link (key2.pub) .link (key2.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
auto send6 = builder.make_block () auto send6 = builder.make_block ()
@ -395,7 +395,7 @@ TEST (active_transactions, prioritize_chains)
.previous (send5->hash ()) .previous (send5->hash ())
.balance (nano::genesis_amount - 30 * nano::xrb_ratio) .balance (nano::genesis_amount - 30 * nano::xrb_ratio)
.link (key3.pub) .link (key3.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send5->hash ())) .work (*system.work.generate (send5->hash ()))
.build_shared (); .build_shared ();
auto open2 = builder.make_block () auto open2 = builder.make_block ()
@ -455,16 +455,16 @@ TEST (active_transactions, inactive_votes_cache)
{ {
nano::system system (1); nano::system system (1);
auto & node = *system.nodes[0]; auto & node = *system.nodes[0];
nano::block_hash latest (node.latest (nano::test_genesis_key.pub)); nano::block_hash latest (node.latest (nano::dev_genesis_key.pub));
nano::keypair key; nano::keypair key;
auto send = nano::send_block_builder () auto send = nano::send_block_builder ()
.previous (latest) .previous (latest)
.destination (key.pub) .destination (key.pub)
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest)) .work (*system.work.generate (latest))
.build_shared (); .build_shared ();
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send->hash ()))); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send->hash ())));
node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version)); node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version));
ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1); ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1);
node.process_active (send); node.process_active (send);
@ -477,24 +477,24 @@ TEST (active_transactions, inactive_votes_cache_fork)
{ {
nano::system system (1); nano::system system (1);
auto & node = *system.nodes[0]; auto & node = *system.nodes[0];
nano::block_hash latest (node.latest (nano::test_genesis_key.pub)); nano::block_hash latest (node.latest (nano::dev_genesis_key.pub));
nano::keypair key; nano::keypair key;
nano::send_block_builder builder; nano::send_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.previous (latest) .previous (latest)
.destination (key.pub) .destination (key.pub)
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest)) .work (*system.work.generate (latest))
.build_shared (); .build_shared ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.previous (latest) .previous (latest)
.destination (key.pub) .destination (key.pub)
.balance (nano::genesis_amount - 200) .balance (nano::genesis_amount - 200)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest)) .work (*system.work.generate (latest))
.build_shared (); .build_shared ();
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send1->hash ()))); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send1->hash ())));
node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version)); node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version));
auto channel1 (node.network.udp_channels.create (node.network.endpoint ())); auto channel1 (node.network.udp_channels.create (node.network.endpoint ()));
ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1); ASSERT_TIMELY (5s, node.active.inactive_votes_cache_size () == 1);
@ -520,14 +520,14 @@ TEST (active_transactions, inactive_votes_cache_existing_vote)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
nano::block_hash latest (node.latest (nano::test_genesis_key.pub)); nano::block_hash latest (node.latest (nano::dev_genesis_key.pub));
nano::keypair key; nano::keypair key;
nano::block_builder builder; nano::block_builder builder;
auto send = builder.send () auto send = builder.send ()
.previous (latest) .previous (latest)
.destination (key.pub) .destination (key.pub)
.balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest)) .work (*system.work.generate (latest))
.build_shared (); .build_shared ();
auto open = builder.state () auto open = builder.state ()
@ -587,21 +587,21 @@ TEST (active_transactions, inactive_votes_cache_multiple_votes)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
nano::block_hash latest (node.latest (nano::test_genesis_key.pub)); nano::block_hash latest (node.latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
nano::block_builder builder; nano::block_builder builder;
auto send1 = builder.send () auto send1 = builder.send ()
.previous (latest) .previous (latest)
.destination (key1.pub) .destination (key1.pub)
.balance (nano::genesis_amount - 100 * nano::Gxrb_ratio) .balance (nano::genesis_amount - 100 * nano::Gxrb_ratio)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest)) .work (*system.work.generate (latest))
.build_shared (); .build_shared ();
auto send2 = builder.send () auto send2 = builder.send ()
.previous (send1->hash ()) .previous (send1->hash ())
.destination (key1.pub) .destination (key1.pub)
.balance (100 * nano::Gxrb_ratio) .balance (100 * nano::Gxrb_ratio)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
auto open = builder.state () auto open = builder.state ()
@ -620,7 +620,7 @@ TEST (active_transactions, inactive_votes_cache_multiple_votes)
// Process votes // Process votes
auto vote1 (std::make_shared<nano::vote> (key1.pub, key1.prv, 0, std::vector<nano::block_hash> (1, send1->hash ()))); auto vote1 (std::make_shared<nano::vote> (key1.pub, key1.prv, 0, std::vector<nano::block_hash> (1, send1->hash ())));
node.vote_processor.vote (vote1, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version)); node.vote_processor.vote (vote1, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version));
auto vote2 (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send1->hash ()))); auto vote2 (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, std::vector<nano::block_hash> (1, send1->hash ())));
node.vote_processor.vote (vote2, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version)); node.vote_processor.vote (vote2, std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version));
system.deadline_set (5s); system.deadline_set (5s);
while (true) while (true)
@ -656,23 +656,23 @@ TEST (active_transactions, update_difficulty)
// Generate blocks & start elections // Generate blocks & start elections
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.link (key1.pub) .link (key1.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
auto difficulty1 (send1->difficulty ()); auto difficulty1 (send1->difficulty ());
auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (send1->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node1.network_params.network.publish_thresholds.epoch_1)); auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (send1->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node1.network_params.network.publish_thresholds.epoch_1));
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send1->hash ()) .previous (send1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 200) .balance (nano::genesis_amount - 200)
.link (key1.pub) .link (key1.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
auto difficulty2 (send2->difficulty ()); auto difficulty2 (send2->difficulty ());
@ -737,12 +737,12 @@ TEST (active_transactions, vote_replays)
nano::keypair key; nano::keypair key;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - nano::Gxrb_ratio) .balance (nano::genesis_amount - nano::Gxrb_ratio)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
ASSERT_NE (nullptr, send1); ASSERT_NE (nullptr, send1);
@ -761,7 +761,7 @@ TEST (active_transactions, vote_replays)
nano::blocks_confirm (node, { send1, open1 }); nano::blocks_confirm (node, { send1, open1 });
ASSERT_EQ (2, node.active.size ()); ASSERT_EQ (2, node.active.size ());
// First vote is not a replay and confirms the election, second vote should be a replay since the election has confirmed but not yet removed // First vote is not a replay and confirms the election, second vote should be a replay since the election has confirmed but not yet removed
auto vote_send1 (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, send1)); auto vote_send1 (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, send1));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_send1)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_send1));
ASSERT_EQ (2, node.active.size ()); ASSERT_EQ (2, node.active.size ());
ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1)); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1));
@ -769,7 +769,7 @@ TEST (active_transactions, vote_replays)
ASSERT_TIMELY (3s, node.active.size () == 1); ASSERT_TIMELY (3s, node.active.size () == 1);
ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1)); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_send1));
// Open new account // Open new account
auto vote_open1 (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, open1)); auto vote_open1 (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, open1));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_open1)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote_open1));
ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, node.active.size ());
ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_open1)); ASSERT_EQ (nano::vote_code::replay, node.active.vote (vote_open1));
@ -790,7 +790,7 @@ TEST (active_transactions, vote_replays)
node.process_active (send2); node.process_active (send2);
nano::blocks_confirm (node, { send2 }); nano::blocks_confirm (node, { send2 });
ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, node.active.size ());
auto vote1_send2 (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, send2)); auto vote1_send2 (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, send2));
auto vote2_send2 (std::make_shared<nano::vote> (key.pub, key.prv, 0, send2)); auto vote2_send2 (std::make_shared<nano::vote> (key.pub, key.prv, 0, send2));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2_send2)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2_send2));
ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, node.active.size ());
@ -828,16 +828,16 @@ TEST (active_transactions, activate_dependencies)
auto node1 (system.add_node (config, flags)); auto node1 (system.add_node (config, flags));
config.peering_port = nano::get_available_port (); config.peering_port = nano::get_available_port ();
auto node2 (system.add_node (config, flags)); auto node2 (system.add_node (config, flags));
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::genesis genesis; nano::genesis genesis;
nano::block_builder builder; nano::block_builder builder;
auto block0 = builder.state () auto block0 = builder.state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - nano::Gxrb_ratio) .balance (nano::genesis_amount - nano::Gxrb_ratio)
.link (0) .link (0)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (node1->work_generate_blocking (genesis.hash ()).value ()) .work (node1->work_generate_blocking (genesis.hash ()).value ())
.build_shared (); .build_shared ();
// Establish a representative // Establish a representative
@ -845,12 +845,12 @@ TEST (active_transactions, activate_dependencies)
node2->block_processor.flush (); node2->block_processor.flush ();
ASSERT_TIMELY (10s, node1->block (block0->hash ())); ASSERT_TIMELY (10s, node1->block (block0->hash ()));
auto block1 = builder.state () auto block1 = builder.state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (block0->hash ()) .previous (block0->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - nano::Gxrb_ratio) .balance (nano::genesis_amount - nano::Gxrb_ratio)
.link (0) .link (0)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (node1->work_generate_blocking (block0->hash ()).value ()) .work (node1->work_generate_blocking (block0->hash ()).value ())
.build (); .build ();
// Wait for confirmation of the previous block, which tries to activate the successor // Wait for confirmation of the previous block, which tries to activate the successor
@ -861,12 +861,12 @@ TEST (active_transactions, activate_dependencies)
ASSERT_EQ (nano::process_result::progress, node2->ledger.process (transaction, *block1).code); ASSERT_EQ (nano::process_result::progress, node2->ledger.process (transaction, *block1).code);
} }
std::shared_ptr<nano::block> block2 = builder.state () std::shared_ptr<nano::block> block2 = builder.state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (block1->hash ()) .previous (block1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio)
.link (0) .link (0)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (node1->work_generate_blocking (block1->hash ()).value ()) .work (node1->work_generate_blocking (block1->hash ()).value ())
.build (); .build ();
node2->process_active (block2); node2->process_active (block2);
@ -954,10 +954,10 @@ TEST (active_transactions, confirmation_consistency)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
for (unsigned i = 0; i < 10; ++i) for (unsigned i = 0; i < 10; ++i)
{ {
auto block (system.wallet (0)->send_action (nano::test_genesis_key.pub, nano::public_key (), node.config.receive_minimum.number ())); auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::public_key (), node.config.receive_minimum.number ()));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
system.deadline_set (5s); system.deadline_set (5s);
while (!node.ledger.block_confirmed (node.store.tx_begin_read (), block->hash ())) while (!node.ledger.block_confirmed (node.store.tx_begin_read (), block->hash ()))
@ -986,66 +986,66 @@ TEST (active_transactions, insertion_prioritization)
auto & node = *system.add_node (node_config, node_flags); auto & node = *system.add_node (node_config, node_flags);
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 10 * nano::xrb_ratio) .balance (nano::genesis_amount - 10 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build_shared (); .build_shared ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send1->hash ()) .previous (send1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 20 * nano::xrb_ratio) .balance (nano::genesis_amount - 20 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
auto send3 = builder.make_block () auto send3 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send2->hash ()) .previous (send2->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 30 * nano::xrb_ratio) .balance (nano::genesis_amount - 30 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send2->hash ())) .work (*system.work.generate (send2->hash ()))
.build_shared (); .build_shared ();
auto send4 = builder.make_block () auto send4 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send3->hash ()) .previous (send3->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 40 * nano::xrb_ratio) .balance (nano::genesis_amount - 40 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send3->hash ())) .work (*system.work.generate (send3->hash ()))
.build_shared (); .build_shared ();
auto send5 = builder.make_block () auto send5 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send4->hash ()) .previous (send4->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 50 * nano::xrb_ratio) .balance (nano::genesis_amount - 50 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send4->hash ())) .work (*system.work.generate (send4->hash ()))
.build_shared (); .build_shared ();
auto send6 = builder.make_block () auto send6 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send5->hash ()) .previous (send5->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 60 * nano::xrb_ratio) .balance (nano::genesis_amount - 60 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send5->hash ())) .work (*system.work.generate (send5->hash ()))
.build_shared (); .build_shared ();
auto send7 = builder.make_block () auto send7 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send6->hash ()) .previous (send6->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 70 * nano::xrb_ratio) .balance (nano::genesis_amount - 70 * nano::xrb_ratio)
.link (nano::public_key ()) .link (nano::public_key ())
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send6->hash ())) .work (*system.work.generate (send6->hash ()))
.build_shared (); .build_shared ();
// Sort by difficulty, descending // Sort by difficulty, descending
@ -1178,12 +1178,12 @@ TEST (active_transactions, election_difficulty_update_old)
nano::keypair key; nano::keypair key;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 10 * nano::xrb_ratio) .balance (nano::genesis_amount - 10 * nano::xrb_ratio)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
auto send1_copy = builder.make_block ().from (*send1).build_shared (); auto send1_copy = builder.make_block ().from (*send1).build_shared ();
@ -1226,12 +1226,12 @@ TEST (active_transactions, election_difficulty_update_fork)
nano::keypair key; nano::keypair key;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (epoch2->hash ()) .previous (epoch2->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - nano::Gxrb_ratio) .balance (nano::genesis_amount - nano::Gxrb_ratio)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (epoch2->hash ())) .work (*system.work.generate (epoch2->hash ()))
.build_shared (); .build_shared ();
auto open1 = builder.make_block () auto open1 = builder.make_block ()
@ -1244,12 +1244,12 @@ TEST (active_transactions, election_difficulty_update_fork)
.work (*system.work.generate (key.pub)) .work (*system.work.generate (key.pub))
.build_shared (); .build_shared ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send1->hash ()) .previous (send1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 2 * nano::Gxrb_ratio) .balance (nano::genesis_amount - 2 * nano::Gxrb_ratio)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node.process (*send1).code);
@ -1274,7 +1274,7 @@ TEST (active_transactions, election_difficulty_update_fork)
auto fork_change = builder.make_block () auto fork_change = builder.make_block ()
.account (key.pub) .account (key.pub)
.previous (open1->hash ()) .previous (open1->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::Gxrb_ratio) .balance (nano::Gxrb_ratio)
.link (0) .link (0)
.sign (key.prv, key.pub) .sign (key.prv, key.pub)
@ -1346,7 +1346,7 @@ TEST (active_transactions, confirm_new)
.previous (genesis.hash ()) .previous (genesis.hash ())
.destination (nano::public_key ()) .destination (nano::public_key ())
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
node1.process_active (send); node1.process_active (send);
@ -1354,7 +1354,7 @@ TEST (active_transactions, confirm_new)
ASSERT_EQ (1, node1.active.size ()); ASSERT_EQ (1, node1.active.size ());
auto & node2 = *system.add_node (); auto & node2 = *system.add_node ();
// Add key to node2 // Add key to node2
system.wallet (1)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv);
// Let node2 know about the block // Let node2 know about the block
ASSERT_TIMELY (5s, node2.block (send->hash ())); ASSERT_TIMELY (5s, node2.block (send->hash ()));
// Wait confirmation // Wait confirmation
@ -1369,12 +1369,12 @@ TEST (active_transactions, restart_dropped)
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
nano::genesis genesis; nano::genesis genesis;
auto send = nano::state_block_builder () auto send = nano::state_block_builder ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - nano::xrb_ratio) .balance (nano::genesis_amount - nano::xrb_ratio)
.link (nano::test_genesis_key.pub) .link (nano::dev_genesis_key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); // Process only in ledger and simulate dropping the election .build_shared (); // Process only in ledger and simulate dropping the election
ASSERT_EQ (nano::process_result::progress, node.process (*send).code); ASSERT_EQ (nano::process_result::progress, node.process (*send).code);
@ -1406,7 +1406,7 @@ TEST (active_transactions, restart_dropped)
// Generate even higher difficulty work // Generate even higher difficulty work
ASSERT_TRUE (node.work_generate_blocking (*send, send->difficulty () + 1).is_initialized ()); ASSERT_TRUE (node.work_generate_blocking (*send, send->difficulty () + 1).is_initialized ());
// Add voting // Add voting
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// Process the same block with updated work // Process the same block with updated work
ASSERT_EQ (0, node.active.size ()); ASSERT_EQ (0, node.active.size ());
node.process_active (send); node.process_active (send);
@ -1429,24 +1429,24 @@ TEST (active_transactions, conflicting_block_vote_existing_election)
nano::keypair key; nano::keypair key;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send = builder.make_block () auto send = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 100) .balance (nano::genesis_amount - 100)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
auto fork = builder.make_block () auto fork = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (genesis.hash ()) .previous (genesis.hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 200) .balance (nano::genesis_amount - 200)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (genesis.hash ())) .work (*system.work.generate (genesis.hash ()))
.build_shared (); .build_shared ();
auto vote_fork (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, fork)); auto vote_fork (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, fork));
ASSERT_EQ (nano::process_result::progress, node.process_local (send).code); ASSERT_EQ (nano::process_result::progress, node.process_local (send).code);
ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, node.active.size ());
@ -1474,30 +1474,30 @@ TEST (active_transactions, activate_account_chain)
nano::keypair key; nano::keypair key;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send = builder.make_block () auto send = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.link (nano::test_genesis_key.pub) .link (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 1) .balance (nano::genesis_amount - 1)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build (); .build ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send->hash ()) .previous (send->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.link (key.pub) .link (key.pub)
.balance (nano::genesis_amount - 2) .balance (nano::genesis_amount - 2)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send->hash ())) .work (*system.work.generate (send->hash ()))
.build (); .build ();
auto send3 = builder.make_block () auto send3 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (send2->hash ()) .previous (send2->hash ())
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.link (key.pub) .link (key.pub)
.balance (nano::genesis_amount - 3) .balance (nano::genesis_amount - 3)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send2->hash ())) .work (*system.work.generate (send2->hash ()))
.build (); .build ();
auto open = builder.make_block () auto open = builder.make_block ()
@ -1524,11 +1524,11 @@ TEST (active_transactions, activate_account_chain)
ASSERT_EQ (nano::process_result::progress, node.process (*open).code); ASSERT_EQ (nano::process_result::progress, node.process (*open).code);
ASSERT_EQ (nano::process_result::progress, node.process (*receive).code); ASSERT_EQ (nano::process_result::progress, node.process (*receive).code);
auto result = node.active.activate (nano::test_genesis_key.pub); auto result = node.active.activate (nano::dev_genesis_key.pub);
ASSERT_TRUE (result.inserted); ASSERT_TRUE (result.inserted);
ASSERT_EQ (1, node.active.size ()); ASSERT_EQ (1, node.active.size ());
ASSERT_EQ (1, result.election->blocks.count (send->hash ())); ASSERT_EQ (1, result.election->blocks.count (send->hash ()));
auto result2 = node.active.activate (nano::test_genesis_key.pub); auto result2 = node.active.activate (nano::dev_genesis_key.pub);
ASSERT_FALSE (result2.inserted); ASSERT_FALSE (result2.inserted);
ASSERT_EQ (result2.election, result.election); ASSERT_EQ (result2.election, result.election);
{ {
@ -1538,7 +1538,7 @@ TEST (active_transactions, activate_account_chain)
ASSERT_TIMELY (3s, node.block_confirmed (send->hash ())); ASSERT_TIMELY (3s, node.block_confirmed (send->hash ()));
// On cementing, the next election is started // On cementing, the next election is started
ASSERT_TIMELY (3s, node.active.active (send2->qualified_root ())); ASSERT_TIMELY (3s, node.active.active (send2->qualified_root ()));
auto result3 = node.active.activate (nano::test_genesis_key.pub); auto result3 = node.active.activate (nano::dev_genesis_key.pub);
ASSERT_FALSE (result3.inserted); ASSERT_FALSE (result3.inserted);
ASSERT_NE (nullptr, result3.election); ASSERT_NE (nullptr, result3.election);
ASSERT_EQ (1, result3.election->blocks.count (send2->hash ())); ASSERT_EQ (1, result3.election->blocks.count (send2->hash ()));
@ -1550,7 +1550,7 @@ TEST (active_transactions, activate_account_chain)
// On cementing, the next election is started // On cementing, the next election is started
ASSERT_TIMELY (3s, node.active.active (open->qualified_root ())); ASSERT_TIMELY (3s, node.active.active (open->qualified_root ()));
ASSERT_TIMELY (3s, node.active.active (send3->qualified_root ())); ASSERT_TIMELY (3s, node.active.active (send3->qualified_root ()));
auto result4 = node.active.activate (nano::test_genesis_key.pub); auto result4 = node.active.activate (nano::dev_genesis_key.pub);
ASSERT_FALSE (result4.inserted); ASSERT_FALSE (result4.inserted);
ASSERT_NE (nullptr, result4.election); ASSERT_NE (nullptr, result4.election);
ASSERT_EQ (1, result4.election->blocks.count (send3->hash ())); ASSERT_EQ (1, result4.election->blocks.count (send3->hash ()));

82
nano/core_test/block_store.cpp
View file

@ -346,10 +346,10 @@ TEST (block_store, genesis)
ASSERT_FALSE (store->confirmation_height_get (transaction, nano::genesis_account, confirmation_height_info)); ASSERT_FALSE (store->confirmation_height_get (transaction, nano::genesis_account, confirmation_height_info));
ASSERT_EQ (confirmation_height_info.height, 1); ASSERT_EQ (confirmation_height_info.height, 1);
ASSERT_EQ (confirmation_height_info.frontier, hash); ASSERT_EQ (confirmation_height_info.frontier, hash);
auto test_pub_text (nano::test_genesis_key.pub.to_string ()); auto dev_pub_text (nano::dev_genesis_key.pub.to_string ());
auto test_pub_account (nano::test_genesis_key.pub.to_account ()); auto dev_pub_account (nano::dev_genesis_key.pub.to_account ());
auto test_prv_text (nano::test_genesis_key.prv.data.to_string ()); auto dev_prv_text (nano::dev_genesis_key.prv.data.to_string ());
ASSERT_EQ (nano::genesis_account, nano::test_genesis_key.pub); ASSERT_EQ (nano::genesis_account, nano::dev_genesis_key.pub);
} }
TEST (bootstrap, simple) TEST (bootstrap, simple)
@ -919,8 +919,8 @@ TEST (block_store, DISABLED_change_dupsort) // Unchecked is no longer dupsort ta
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
ASSERT_EQ (0, mdb_drop (store.env.tx (transaction), store.unchecked, 1)); ASSERT_EQ (0, mdb_drop (store.env.tx (transaction), store.unchecked, 1));
ASSERT_EQ (0, mdb_dbi_open (store.env.tx (transaction), "unchecked", MDB_CREATE, &store.unchecked)); ASSERT_EQ (0, mdb_dbi_open (store.env.tx (transaction), "unchecked", MDB_CREATE, &store.unchecked));
auto send1 (std::make_shared<nano::send_block> (0, 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
auto send2 (std::make_shared<nano::send_block> (1, 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send2 (std::make_shared<nano::send_block> (1, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
ASSERT_NE (send1->hash (), send2->hash ()); ASSERT_NE (send1->hash (), send2->hash ());
store.unchecked_put (transaction, send1->hash (), send1); store.unchecked_put (transaction, send1->hash (), send1);
store.unchecked_put (transaction, send1->hash (), send2); store.unchecked_put (transaction, send1->hash (), send2);
@ -963,7 +963,7 @@ TEST (block_store, sequence_flush)
ASSERT_FALSE (store->init_error ()); ASSERT_FALSE (store->init_error ());
auto transaction (store->tx_begin_write ()); auto transaction (store->tx_begin_write ());
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (0, 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
auto vote1 (store->vote_generate (transaction, key1.pub, key1.prv, send1)); auto vote1 (store->vote_generate (transaction, key1.pub, key1.prv, send1));
auto seq2 (store->vote_get (transaction, vote1->account)); auto seq2 (store->vote_get (transaction, vote1->account));
ASSERT_EQ (nullptr, seq2); ASSERT_EQ (nullptr, seq2);
@ -1038,29 +1038,29 @@ TEST (mdb_block_store, sideband_height)
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
store.initialize (transaction, genesis, ledger.cache); store.initialize (transaction, genesis, ledger.cache);
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::send_block send (genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); nano::send_block send (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
nano::receive_block receive (send.hash (), send.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (send.hash ())); nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code);
nano::change_block change (receive.hash (), 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (receive.hash ())); nano::change_block change (receive.hash (), 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code);
nano::state_block state_send1 (nano::test_genesis_key.pub, change.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (change.hash ())); nano::state_block state_send1 (nano::dev_genesis_key.pub, change.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send1).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send1).code);
nano::state_block state_send2 (nano::test_genesis_key.pub, state_send1.hash (), 0, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_send1.hash ())); nano::state_block state_send2 (nano::dev_genesis_key.pub, state_send1.hash (), 0, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send1.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send2).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send2).code);
nano::state_block state_send3 (nano::test_genesis_key.pub, state_send2.hash (), 0, nano::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_send2.hash ())); nano::state_block state_send3 (nano::dev_genesis_key.pub, state_send2.hash (), 0, nano::genesis_amount - 3 * nano::Gxrb_ratio, key3.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send2.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send3).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_send3).code);
nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send1.hash (), key1.prv, key1.pub, *pool.generate (key1.pub));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_open).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_open).code);
nano::state_block epoch (key1.pub, state_open.hash (), 0, nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_open.hash ())); nano::state_block epoch (key1.pub, state_open.hash (), 0, nano::Gxrb_ratio, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_open.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch).code);
ASSERT_EQ (nano::epoch::epoch_1, store.block_version (transaction, epoch.hash ())); ASSERT_EQ (nano::epoch::epoch_1, store.block_version (transaction, epoch.hash ()));
nano::state_block epoch_open (key2.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (key2.pub)); nano::state_block epoch_open (key2.pub, 0, 0, 0, ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (key2.pub));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch_open).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, epoch_open).code);
ASSERT_EQ (nano::epoch::epoch_1, store.block_version (transaction, epoch_open.hash ())); ASSERT_EQ (nano::epoch::epoch_1, store.block_version (transaction, epoch_open.hash ()));
nano::state_block state_receive (key2.pub, epoch_open.hash (), 0, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (epoch_open.hash ())); nano::state_block state_receive (key2.pub, epoch_open.hash (), 0, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (epoch_open.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_receive).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, state_receive).code);
nano::open_block open (state_send3.hash (), nano::test_genesis_key.pub, key3.pub, key3.prv, key3.pub, *pool.generate (key3.pub)); nano::open_block open (state_send3.hash (), nano::dev_genesis_key.pub, key3.pub, key3.prv, key3.pub, *pool.generate (key3.pub));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code);
auto block1 (store.block_get (transaction, genesis.hash ())); auto block1 (store.block_get (transaction, genesis.hash ()));
ASSERT_EQ (block1->sideband ().height, 1); ASSERT_EQ (block1->sideband ().height, 1);
@ -1218,9 +1218,9 @@ TEST (mdb_block_store, upgrade_v14_v15)
nano::genesis genesis; nano::genesis genesis;
nano::network_params network_params; nano::network_params network_params;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::send_block send (genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); nano::send_block send (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
nano::state_block epoch (nano::test_genesis_key.pub, send.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (send.hash ())); nano::state_block epoch (nano::dev_genesis_key.pub, send.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ()));
nano::state_block state_send (nano::test_genesis_key.pub, epoch.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (epoch.hash ())); nano::state_block state_send (nano::dev_genesis_key.pub, epoch.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch.hash ()));
{ {
nano::logger_mt logger; nano::logger_mt logger;
nano::mdb_store store (logger, path); nano::mdb_store store (logger, path);
@ -1261,8 +1261,8 @@ TEST (mdb_block_store, upgrade_v14_v15)
store.block_del (transaction, epoch.hash ()); store.block_del (transaction, epoch.hash ());
// Turn pending into v14 // Turn pending into v14
ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0, nano::mdb_val (nano::pending_key (nano::test_genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_0)), 0)); ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v0, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_0)), 0));
ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1, nano::mdb_val (nano::pending_key (nano::test_genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_1)), 0)); ASSERT_FALSE (mdb_put (store.env.tx (transaction), store.pending_v1, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), nano::mdb_val (nano::pending_info_v14 (nano::genesis_account, nano::Gxrb_ratio, nano::epoch::epoch_1)), 0));
// This should fail as sizes are no longer correct for account_info // This should fail as sizes are no longer correct for account_info
nano::mdb_val value; nano::mdb_val value;
@ -1296,7 +1296,7 @@ TEST (mdb_block_store, upgrade_v14_v15)
// accounts_v1, state_blocks_v1 & pending_v1 tables should be deleted // accounts_v1, state_blocks_v1 & pending_v1 tables should be deleted
auto error_get_accounts_v1 (mdb_get (store.env.tx (transaction), store.accounts_v1, nano::mdb_val (nano::genesis_account), value)); auto error_get_accounts_v1 (mdb_get (store.env.tx (transaction), store.accounts_v1, nano::mdb_val (nano::genesis_account), value));
ASSERT_NE (error_get_accounts_v1, MDB_SUCCESS); ASSERT_NE (error_get_accounts_v1, MDB_SUCCESS);
auto error_get_pending_v1 (mdb_get (store.env.tx (transaction), store.pending_v1, nano::mdb_val (nano::pending_key (nano::test_genesis_key.pub, state_send.hash ())), value)); auto error_get_pending_v1 (mdb_get (store.env.tx (transaction), store.pending_v1, nano::mdb_val (nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ())), value));
ASSERT_NE (error_get_pending_v1, MDB_SUCCESS); ASSERT_NE (error_get_pending_v1, MDB_SUCCESS);
auto error_get_state_v1 (mdb_get (store.env.tx (transaction), store.state_blocks_v1, nano::mdb_val (state_send.hash ()), value)); auto error_get_state_v1 (mdb_get (store.env.tx (transaction), store.state_blocks_v1, nano::mdb_val (state_send.hash ()), value));
ASSERT_NE (error_get_state_v1, MDB_SUCCESS); ASSERT_NE (error_get_state_v1, MDB_SUCCESS);
@ -1310,9 +1310,9 @@ TEST (mdb_block_store, upgrade_v14_v15)
ASSERT_EQ (block->sideband ().details.epoch, nano::epoch::epoch_0); ASSERT_EQ (block->sideband ().details.epoch, nano::epoch::epoch_0);
ASSERT_EQ (info.epoch (), nano::epoch::epoch_1); ASSERT_EQ (info.epoch (), nano::epoch::epoch_1);
nano::pending_info pending_info; nano::pending_info pending_info;
store.pending_get (transaction, nano::pending_key (nano::test_genesis_key.pub, send.hash ()), pending_info); store.pending_get (transaction, nano::pending_key (nano::dev_genesis_key.pub, send.hash ()), pending_info);
ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_0); ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_0);
store.pending_get (transaction, nano::pending_key (nano::test_genesis_key.pub, state_send.hash ()), pending_info); store.pending_get (transaction, nano::pending_key (nano::dev_genesis_key.pub, state_send.hash ()), pending_info);
ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_1); ASSERT_EQ (pending_info.epoch, nano::epoch::epoch_1);
// Version should be correct // Version should be correct
@ -1364,9 +1364,9 @@ TEST (mdb_block_store, upgrade_v16_v17)
{ {
nano::genesis genesis; nano::genesis genesis;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::state_block block1 (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); nano::state_block block1 (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
nano::state_block block2 (nano::test_genesis_key.pub, block1.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (block1.hash ())); nano::state_block block2 (nano::dev_genesis_key.pub, block1.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 1, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block1.hash ()));
nano::state_block block3 (nano::test_genesis_key.pub, block2.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 2, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (block2.hash ())); nano::state_block block3 (nano::dev_genesis_key.pub, block2.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio - 2, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (block2.hash ()));
auto code = [&block1, &block2, &block3](auto confirmation_height, nano::block_hash const & expected_cemented_frontier) { auto code = [&block1, &block2, &block3](auto confirmation_height, nano::block_hash const & expected_cemented_frontier) {
auto path (nano::unique_path ()); auto path (nano::unique_path ());
@ -1428,16 +1428,16 @@ TEST (mdb_block_store, upgrade_v17_v18)
nano::keypair key3; nano::keypair key3;
nano::network_params network_params; nano::network_params network_params;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::send_block send_zero (genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); nano::send_block send_zero (genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
nano::state_block state_receive_zero (nano::test_genesis_key.pub, send_zero.hash (), nano::test_genesis_key.pub, nano::genesis_amount, send_zero.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (send_zero.hash ())); nano::state_block state_receive_zero (nano::dev_genesis_key.pub, send_zero.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, send_zero.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send_zero.hash ()));
nano::state_block epoch (nano::test_genesis_key.pub, state_receive_zero.hash (), nano::test_genesis_key.pub, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_receive_zero.hash ())); nano::state_block epoch (nano::dev_genesis_key.pub, state_receive_zero.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_receive_zero.hash ()));
nano::state_block state_send (nano::test_genesis_key.pub, epoch.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (epoch.hash ())); nano::state_block state_send (nano::dev_genesis_key.pub, epoch.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (epoch.hash ()));
nano::state_block state_receive (nano::test_genesis_key.pub, state_send.hash (), nano::test_genesis_key.pub, nano::genesis_amount, state_send.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_send.hash ())); nano::state_block state_receive (nano::dev_genesis_key.pub, state_send.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, state_send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send.hash ()));
nano::state_block state_change (nano::test_genesis_key.pub, state_receive.hash (), nano::test_genesis_key.pub, nano::genesis_amount, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_receive.hash ())); nano::state_block state_change (nano::dev_genesis_key.pub, state_receive.hash (), nano::dev_genesis_key.pub, nano::genesis_amount, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_receive.hash ()));
nano::state_block state_send_change (nano::test_genesis_key.pub, state_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_change.hash ())); nano::state_block state_send_change (nano::dev_genesis_key.pub, state_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_change.hash ()));
nano::state_block epoch_first (key1.pub, 0, 0, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (key1.pub)); nano::state_block epoch_first (key1.pub, 0, 0, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (key1.pub));
nano::state_block state_receive2 (key1.pub, epoch_first.hash (), key1.pub, nano::Gxrb_ratio, state_send_change.hash (), key1.prv, key1.pub, *pool.generate (epoch_first.hash ())); nano::state_block state_receive2 (key1.pub, epoch_first.hash (), key1.pub, nano::Gxrb_ratio, state_send_change.hash (), key1.prv, key1.pub, *pool.generate (epoch_first.hash ()));
nano::state_block state_send2 (nano::test_genesis_key.pub, state_send_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_send_change.hash ())); nano::state_block state_send2 (nano::dev_genesis_key.pub, state_send_change.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_send_change.hash ()));
nano::state_block state_open (key2.pub, 0, key2.pub, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (key2.pub)); nano::state_block state_open (key2.pub, 0, key2.pub, nano::Gxrb_ratio, state_send2.hash (), key2.prv, key2.pub, *pool.generate (key2.pub));
nano::state_block state_send_epoch_link (key2.pub, state_open.hash (), key2.pub, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), key2.prv, key2.pub, *pool.generate (state_open.hash ())); nano::state_block state_send_epoch_link (key2.pub, state_open.hash (), key2.pub, 0, network_params.ledger.epochs.link (nano::epoch::epoch_2), key2.prv, key2.pub, *pool.generate (state_open.hash ()));
{ {
@ -1624,11 +1624,11 @@ TEST (mdb_block_store, upgrade_v18_v19)
nano::keypair key1; nano::keypair key1;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::network_params network_params; nano::network_params network_params;
nano::send_block send (nano::genesis_hash, nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (nano::genesis_hash)); nano::send_block send (nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash));
nano::receive_block receive (send.hash (), send.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (send.hash ())); nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send.hash ()));
nano::change_block change (receive.hash (), 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (receive.hash ())); nano::change_block change (receive.hash (), 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (receive.hash ()));
nano::state_block state_epoch (nano::test_genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (change.hash ())); nano::state_block state_epoch (nano::dev_genesis_key.pub, change.hash (), 0, nano::genesis_amount, network_params.ledger.epochs.link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (change.hash ()));
nano::state_block state_send (nano::test_genesis_key.pub, state_epoch.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (state_epoch.hash ())); nano::state_block state_send (nano::dev_genesis_key.pub, state_epoch.hash (), 0, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (state_epoch.hash ()));
nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send.hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); nano::state_block state_open (key1.pub, 0, 0, nano::Gxrb_ratio, state_send.hash (), key1.prv, key1.pub, *pool.generate (key1.pub));
{ {

196
nano/core_test/bootstrap.cpp
View file

@ -26,11 +26,11 @@ TEST (bulk_pull, genesis_to_end)
nano::system system (1); nano::system system (1);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
auto req = std::make_unique<nano::bulk_pull> (); auto req = std::make_unique<nano::bulk_pull> ();
req->start = nano::test_genesis_key.pub; req->start = nano::dev_genesis_key.pub;
req->end.clear (); req->end.clear ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req))); auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req)));
ASSERT_EQ (system.nodes[0]->latest (nano::test_genesis_key.pub), request->current); ASSERT_EQ (system.nodes[0]->latest (nano::dev_genesis_key.pub), request->current);
ASSERT_EQ (request->request->end, request->request->end); ASSERT_EQ (request->request->end, request->request->end);
} }
@ -40,11 +40,11 @@ TEST (bulk_pull, no_end)
nano::system system (1); nano::system system (1);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
auto req = std::make_unique<nano::bulk_pull> (); auto req = std::make_unique<nano::bulk_pull> ();
req->start = nano::test_genesis_key.pub; req->start = nano::dev_genesis_key.pub;
req->end = 1; req->end = 1;
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req))); auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req)));
ASSERT_EQ (system.nodes[0]->latest (nano::test_genesis_key.pub), request->current); ASSERT_EQ (system.nodes[0]->latest (nano::dev_genesis_key.pub), request->current);
ASSERT_TRUE (request->request->end.is_zero ()); ASSERT_TRUE (request->request->end.is_zero ());
} }
@ -52,9 +52,9 @@ TEST (bulk_pull, end_not_owned)
{ {
nano::system system (1); nano::system system (1);
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100));
nano::block_hash latest (system.nodes[0]->latest (nano::test_genesis_key.pub)); nano::block_hash latest (system.nodes[0]->latest (nano::dev_genesis_key.pub));
nano::open_block open (0, 1, 2, nano::keypair ().prv, 4, 5); nano::open_block open (0, 1, 2, nano::keypair ().prv, 4, 5);
open.hashables.account = key2.pub; open.hashables.account = key2.pub;
open.hashables.representative = key2.pub; open.hashables.representative = key2.pub;
@ -79,7 +79,7 @@ TEST (bulk_pull, none)
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
nano::genesis genesis; nano::genesis genesis;
auto req = std::make_unique<nano::bulk_pull> (); auto req = std::make_unique<nano::bulk_pull> ();
req->start = nano::test_genesis_key.pub; req->start = nano::dev_genesis_key.pub;
req->end = genesis.hash (); req->end = genesis.hash ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req))); auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req)));
@ -92,7 +92,7 @@ TEST (bulk_pull, get_next_on_open)
nano::system system (1); nano::system system (1);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
auto req = std::make_unique<nano::bulk_pull> (); auto req = std::make_unique<nano::bulk_pull> ();
req->start = nano::test_genesis_key.pub; req->start = nano::dev_genesis_key.pub;
req->end.clear (); req->end.clear ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req))); auto request (std::make_shared<nano::bulk_pull_server> (connection, std::move (req)));
@ -144,9 +144,9 @@ TEST (bulk_pull, count_limit)
nano::system system (1); nano::system system (1);
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::send_block> (system.nodes[0]->latest (nano::test_genesis_key.pub), nano::test_genesis_key.pub, 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (system.nodes[0]->latest (nano::test_genesis_key.pub)))); auto send1 (std::make_shared<nano::send_block> (system.nodes[0]->latest (nano::dev_genesis_key.pub), nano::dev_genesis_key.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (system.nodes[0]->latest (nano::dev_genesis_key.pub))));
ASSERT_EQ (nano::process_result::progress, system.nodes[0]->process (*send1).code); ASSERT_EQ (nano::process_result::progress, system.nodes[0]->process (*send1).code);
auto receive1 (std::make_shared<nano::receive_block> (send1->hash (), send1->hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto receive1 (std::make_shared<nano::receive_block> (send1->hash (), send1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, system.nodes[0]->process (*receive1).code); ASSERT_EQ (nano::process_result::progress, system.nodes[0]->process (*receive1).code);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
@ -194,18 +194,18 @@ TEST (bootstrap_processor, process_one)
nano::node_flags node_flags; nano::node_flags node_flags;
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
auto node0 = system.add_node (node_config, node_flags); auto node0 = system.add_node (node_config, node_flags);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, nano::test_genesis_key.pub, 100)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 100));
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
node_flags.disable_rep_crawler = true; node_flags.disable_rep_crawler = true;
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::unique_path (), system.alarm, node_config, system.work, node_flags)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::unique_path (), system.alarm, node_config, system.work, node_flags));
nano::block_hash hash1 (node0->latest (nano::test_genesis_key.pub)); nano::block_hash hash1 (node0->latest (nano::dev_genesis_key.pub));
nano::block_hash hash2 (node1->latest (nano::test_genesis_key.pub)); nano::block_hash hash2 (node1->latest (nano::dev_genesis_key.pub));
ASSERT_NE (hash1, hash2); ASSERT_NE (hash1, hash2);
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_NE (node1->latest (nano::test_genesis_key.pub), node0->latest (nano::test_genesis_key.pub)); ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub));
ASSERT_TIMELY (10s, node1->latest (nano::test_genesis_key.pub) == node0->latest (nano::test_genesis_key.pub)); ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node1->active.size ()); ASSERT_EQ (0, node1->active.size ());
node1->stop (); node1->stop ();
} }
@ -218,20 +218,20 @@ TEST (bootstrap_processor, process_two)
nano::node_flags node_flags; nano::node_flags node_flags;
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
auto node0 (system.add_node (config, node_flags)); auto node0 (system.add_node (config, node_flags));
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash hash1 (node0->latest (nano::test_genesis_key.pub)); nano::block_hash hash1 (node0->latest (nano::dev_genesis_key.pub));
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, nano::test_genesis_key.pub, 50)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 50));
nano::block_hash hash2 (node0->latest (nano::test_genesis_key.pub)); nano::block_hash hash2 (node0->latest (nano::dev_genesis_key.pub));
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, nano::test_genesis_key.pub, 50)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 50));
nano::block_hash hash3 (node0->latest (nano::test_genesis_key.pub)); nano::block_hash hash3 (node0->latest (nano::dev_genesis_key.pub));
ASSERT_NE (hash1, hash2); ASSERT_NE (hash1, hash2);
ASSERT_NE (hash1, hash3); ASSERT_NE (hash1, hash3);
ASSERT_NE (hash2, hash3); ASSERT_NE (hash2, hash3);
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node1->init_error ()); ASSERT_FALSE (node1->init_error ());
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_NE (node1->latest (nano::test_genesis_key.pub), node0->latest (nano::test_genesis_key.pub)); ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub));
ASSERT_TIMELY (10s, node1->latest (nano::test_genesis_key.pub) == node0->latest (nano::test_genesis_key.pub)); ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub));
node1->stop (); node1->stop ();
} }
@ -245,19 +245,19 @@ TEST (bootstrap_processor, process_state)
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
auto node0 (system.add_node (config, node_flags)); auto node0 (system.add_node (config, node_flags));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto block1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, node0->latest (nano::test_genesis_key.pub), nano::test_genesis_key.pub, nano::genesis_amount - 100, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, node0->latest (nano::dev_genesis_key.pub), nano::dev_genesis_key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
auto block2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, block1->hash (), nano::test_genesis_key.pub, nano::genesis_amount, block1->hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, block1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount, block1->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node0->work_generate_blocking (*block1); node0->work_generate_blocking (*block1);
node0->work_generate_blocking (*block2); node0->work_generate_blocking (*block2);
node0->process (*block1); node0->process (*block1);
node0->process (*block2); node0->process (*block2);
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_EQ (node0->latest (nano::test_genesis_key.pub), block2->hash ()); ASSERT_EQ (node0->latest (nano::dev_genesis_key.pub), block2->hash ());
ASSERT_NE (node1->latest (nano::test_genesis_key.pub), block2->hash ()); ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), block2->hash ());
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_NE (node1->latest (nano::test_genesis_key.pub), node0->latest (nano::test_genesis_key.pub)); ASSERT_NE (node1->latest (nano::dev_genesis_key.pub), node0->latest (nano::dev_genesis_key.pub));
ASSERT_TIMELY (10s, node1->latest (nano::test_genesis_key.pub) == node0->latest (nano::test_genesis_key.pub)); ASSERT_TIMELY (10s, node1->latest (nano::dev_genesis_key.pub) == node0->latest (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node1->active.size ()); ASSERT_EQ (0, node1->active.size ());
node1->stop (); node1->stop ();
} }
@ -272,18 +272,18 @@ TEST (bootstrap_processor, process_new)
auto node1 (system.add_node (config, node_flags)); auto node1 (system.add_node (config, node_flags));
config.peering_port = nano::get_available_port (); config.peering_port = nano::get_available_port ();
auto node2 (system.add_node (config, node_flags)); auto node2 (system.add_node (config, node_flags));
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
system.wallet (1)->insert_adhoc (key2.prv); system.wallet (1)->insert_adhoc (key2.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ()));
ASSERT_TIMELY (10s, !node1->balance (key2.pub).is_zero ()); ASSERT_TIMELY (10s, !node1->balance (key2.pub).is_zero ());
nano::uint128_t balance1 (node1->balance (nano::test_genesis_key.pub)); nano::uint128_t balance1 (node1->balance (nano::dev_genesis_key.pub));
nano::uint128_t balance2 (node1->balance (key2.pub)); nano::uint128_t balance2 (node1->balance (key2.pub));
auto node3 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node3 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node3->init_error ()); ASSERT_FALSE (node3->init_error ());
node3->bootstrap_initiator.bootstrap (node1->network.endpoint ()); node3->bootstrap_initiator.bootstrap (node1->network.endpoint ());
ASSERT_TIMELY (10s, node3->balance (key2.pub) == balance2); ASSERT_TIMELY (10s, node3->balance (key2.pub) == balance2);
ASSERT_EQ (balance1, node3->balance (nano::test_genesis_key.pub)); ASSERT_EQ (balance1, node3->balance (nano::dev_genesis_key.pub));
node3->stop (); node3->stop ();
} }
@ -296,19 +296,19 @@ TEST (bootstrap_processor, pull_diamond)
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
auto node0 (system.add_node (config, node_flags)); auto node0 (system.add_node (config, node_flags));
nano::keypair key; nano::keypair key;
auto send1 (std::make_shared<nano::send_block> (node0->latest (nano::test_genesis_key.pub), key.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (node0->latest (nano::test_genesis_key.pub)))); auto send1 (std::make_shared<nano::send_block> (node0->latest (nano::dev_genesis_key.pub), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub))));
ASSERT_EQ (nano::process_result::progress, node0->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node0->process (*send1).code);
auto open (std::make_shared<nano::open_block> (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub)));
ASSERT_EQ (nano::process_result::progress, node0->process (*open).code); ASSERT_EQ (nano::process_result::progress, node0->process (*open).code);
auto send2 (std::make_shared<nano::send_block> (open->hash (), nano::test_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); auto send2 (std::make_shared<nano::send_block> (open->hash (), nano::dev_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ())));
ASSERT_EQ (nano::process_result::progress, node0->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node0->process (*send2).code);
auto receive (std::make_shared<nano::receive_block> (send1->hash (), send2->hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto receive (std::make_shared<nano::receive_block> (send1->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node0->process (*receive).code); ASSERT_EQ (nano::process_result::progress, node0->process (*receive).code);
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node1->init_error ()); ASSERT_FALSE (node1->init_error ());
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_TIMELY (10s, node1->balance (nano::test_genesis_key.pub) == 100); ASSERT_TIMELY (10s, node1->balance (nano::dev_genesis_key.pub) == 100);
ASSERT_EQ (100, node1->balance (nano::test_genesis_key.pub)); ASSERT_EQ (100, node1->balance (nano::dev_genesis_key.pub));
node1->stop (); node1->stop ();
} }
@ -325,7 +325,7 @@ TEST (bootstrap_processor, DISABLED_pull_requeue_network_error)
auto node2 (system.add_node (config, node_flags)); auto node2 (system.add_node (config, node_flags));
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
node1->bootstrap_initiator.bootstrap (node2->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node2->network.endpoint ());
auto attempt (node1->bootstrap_initiator.current_attempt ()); auto attempt (node1->bootstrap_initiator.current_attempt ());
@ -336,7 +336,7 @@ TEST (bootstrap_processor, DISABLED_pull_requeue_network_error)
nano::unique_lock<std::mutex> lock (node1->bootstrap_initiator.connections->mutex); nano::unique_lock<std::mutex> lock (node1->bootstrap_initiator.connections->mutex);
ASSERT_FALSE (attempt->stopped); ASSERT_FALSE (attempt->stopped);
++attempt->pulling; ++attempt->pulling;
node1->bootstrap_initiator.connections->pulls.push_back (nano::pull_info (nano::test_genesis_key.pub, send1->hash (), genesis.hash (), attempt->incremental_id)); node1->bootstrap_initiator.connections->pulls.push_back (nano::pull_info (nano::dev_genesis_key.pub, send1->hash (), genesis.hash (), attempt->incremental_id));
node1->bootstrap_initiator.connections->request_pull (lock); node1->bootstrap_initiator.connections->request_pull (lock);
node2->stop (); node2->stop ();
} }
@ -361,9 +361,9 @@ TEST (bootstrap_processor, frontiers_unconfirmed)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1, key2; nano::keypair key1, key2;
// Generating invalid chain // Generating invalid chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code);
@ -375,11 +375,11 @@ TEST (bootstrap_processor, frontiers_unconfirmed)
node_flags.disable_rep_crawler = false; node_flags.disable_rep_crawler = false;
auto node2 = system.add_node (node_config, node_flags); auto node2 = system.add_node (node_config, node_flags);
// Generating valid chain // Generating valid chain
auto send3 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::xrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send3 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::xrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node2->process (*send3).code); ASSERT_EQ (nano::process_result::progress, node2->process (*send3).code);
auto open3 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::xrb_ratio, send3->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open3 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::xrb_ratio, send3->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)));
ASSERT_EQ (nano::process_result::progress, node2->process (*open3).code); ASSERT_EQ (nano::process_result::progress, node2->process (*open3).code);
system.wallet (1)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv);
// Ensure node2 can generate votes // Ensure node2 can generate votes
node2->block_confirm (send3); node2->block_confirm (send3);
@ -418,15 +418,15 @@ TEST (bootstrap_processor, frontiers_confirmed)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1, key2; nano::keypair key1, key2;
// Generating valid chain // Generating valid chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code);
auto open2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *system.work.generate (key2.pub))); auto open2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open2).code);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// Confirm all blocks so node1 is free to generate votes // Confirm all blocks so node1 is free to generate votes
node1->block_confirm (send1); node1->block_confirm (send1);
@ -464,9 +464,9 @@ TEST (bootstrap_processor, frontiers_unconfirmed_threshold)
// Generating invalid chain // Generating invalid chain
auto threshold (node1->gap_cache.bootstrap_threshold () + 1); auto threshold (node1->gap_cache.bootstrap_threshold () + 1);
ASSERT_LT (threshold, node1->config.online_weight_minimum.number ()); ASSERT_LT (threshold, node1->config.online_weight_minimum.number ());
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - threshold, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - threshold, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - threshold - nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - threshold - nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, threshold, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, threshold, send1->hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open1).code);
@ -477,7 +477,7 @@ TEST (bootstrap_processor, frontiers_unconfirmed_threshold)
// Test node with large representative // Test node with large representative
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
auto node2 = system.add_node (node_config, node_flags); auto node2 = system.add_node (node_config, node_flags);
system.wallet (1)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (1)->insert_adhoc (nano::dev_genesis_key.prv);
// Test node to bootstrap // Test node to bootstrap
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
@ -505,19 +505,19 @@ TEST (bootstrap_processor, push_diamond)
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node1->init_error ()); ASSERT_FALSE (node1->init_error ());
auto wallet1 (node1->wallets.create (100)); auto wallet1 (node1->wallets.create (100));
wallet1->insert_adhoc (nano::test_genesis_key.prv); wallet1->insert_adhoc (nano::dev_genesis_key.prv);
wallet1->insert_adhoc (key.prv); wallet1->insert_adhoc (key.prv);
auto send1 (std::make_shared<nano::send_block> (node0->latest (nano::test_genesis_key.pub), key.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (node0->latest (nano::test_genesis_key.pub)))); auto send1 (std::make_shared<nano::send_block> (node0->latest (nano::dev_genesis_key.pub), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub))));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto open (std::make_shared<nano::open_block> (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), 1, key.pub, key.prv, key.pub, *system.work.generate (key.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code);
auto send2 (std::make_shared<nano::send_block> (open->hash (), nano::test_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ()))); auto send2 (std::make_shared<nano::send_block> (open->hash (), nano::dev_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 100, key.prv, key.pub, *system.work.generate (open->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto receive (std::make_shared<nano::receive_block> (send1->hash (), send2->hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto receive (std::make_shared<nano::receive_block> (send1->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*receive).code); ASSERT_EQ (nano::process_result::progress, node1->process (*receive).code);
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_TIMELY (10s, node0->balance (nano::test_genesis_key.pub) == 100); ASSERT_TIMELY (10s, node0->balance (nano::dev_genesis_key.pub) == 100);
ASSERT_EQ (100, node0->balance (nano::test_genesis_key.pub)); ASSERT_EQ (100, node0->balance (nano::dev_genesis_key.pub));
node1->stop (); node1->stop ();
} }
@ -531,12 +531,12 @@ TEST (bootstrap_processor, push_one)
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
auto wallet (node1->wallets.create (nano::random_wallet_id ())); auto wallet (node1->wallets.create (nano::random_wallet_id ()));
ASSERT_NE (nullptr, wallet); ASSERT_NE (nullptr, wallet);
wallet->insert_adhoc (nano::test_genesis_key.prv); wallet->insert_adhoc (nano::dev_genesis_key.prv);
nano::uint128_t balance1 (node1->balance (nano::test_genesis_key.pub)); nano::uint128_t balance1 (node1->balance (nano::dev_genesis_key.pub));
ASSERT_NE (nullptr, wallet->send_action (nano::test_genesis_key.pub, key1.pub, 100)); ASSERT_NE (nullptr, wallet->send_action (nano::dev_genesis_key.pub, key1.pub, 100));
ASSERT_NE (balance1, node1->balance (nano::test_genesis_key.pub)); ASSERT_NE (balance1, node1->balance (nano::dev_genesis_key.pub));
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
ASSERT_TIMELY (10s, node0->balance (nano::test_genesis_key.pub) != balance1); ASSERT_TIMELY (10s, node0->balance (nano::dev_genesis_key.pub) != balance1);
node1->stop (); node1->stop ();
} }
@ -552,7 +552,7 @@ TEST (bootstrap_processor, lazy_hash)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ())));
auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub)));
@ -588,7 +588,7 @@ TEST (bootstrap_processor, lazy_hash_bootstrap_id)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ())));
auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub)));
@ -624,12 +624,12 @@ TEST (bootstrap_processor, lazy_max_pull_count)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ())));
auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub)));
auto change1 (std::make_shared<nano::state_block> (key2.pub, receive2->hash (), key1.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (receive2->hash ()))); auto change1 (std::make_shared<nano::state_block> (key2.pub, receive2->hash (), key1.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (receive2->hash ())));
auto change2 (std::make_shared<nano::state_block> (key2.pub, change1->hash (), nano::test_genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (change1->hash ()))); auto change2 (std::make_shared<nano::state_block> (key2.pub, change1->hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (change1->hash ())));
auto change3 (std::make_shared<nano::state_block> (key2.pub, change2->hash (), key2.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (change2->hash ()))); auto change3 (std::make_shared<nano::state_block> (key2.pub, change2->hash (), key2.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *node0->work_generate_blocking (change2->hash ())));
// Processing test chain // Processing test chain
node0->block_processor.add (send1); node0->block_processor.add (send1);
@ -664,9 +664,9 @@ TEST (bootstrap_processor, lazy_unclear_state_link)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key; nano::keypair key;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code);
@ -698,7 +698,7 @@ TEST (bootstrap_processor, lazy_unclear_state_link_not_existing)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key, key2; nano::keypair key, key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code);
@ -729,9 +729,9 @@ TEST (bootstrap_processor, lazy_destinations)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1, key2; nano::keypair key1, key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send2).code);
auto open (std::make_shared<nano::open_block> (send1->hash (), key1.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), key1.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)));
ASSERT_EQ (nano::process_result::progress, node1->process (*open).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open).code);
@ -763,7 +763,7 @@ TEST (bootstrap_processor, wallet_lazy_frontier)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ())));
auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node0->work_generate_blocking (key2.pub)));
@ -803,7 +803,7 @@ TEST (bootstrap_processor, wallet_lazy_pending)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node0->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node0->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node0->work_generate_blocking (receive1->hash ())));
// Processing test chain // Processing test chain
@ -835,7 +835,7 @@ TEST (bootstrap_processor, multiple_attempts)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
// Generating test chain // Generating test chain
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node1->work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1->work_generate_blocking (genesis.hash ())));
auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node1->work_generate_blocking (key1.pub))); auto receive1 (std::make_shared<nano::state_block> (key1.pub, 0, key1.pub, nano::Gxrb_ratio, send1->hash (), key1.prv, key1.pub, *node1->work_generate_blocking (key1.pub)));
auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node1->work_generate_blocking (receive1->hash ()))); auto send2 (std::make_shared<nano::state_block> (key1.pub, receive1->hash (), key1.pub, 0, key2.pub, key1.prv, key1.pub, *node1->work_generate_blocking (receive1->hash ())));
auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node1->work_generate_blocking (key2.pub))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, 0, key2.pub, nano::Gxrb_ratio, send2->hash (), key2.prv, key2.pub, *node1->work_generate_blocking (key2.pub)));
@ -877,7 +877,7 @@ TEST (bootstrap_processor, bootstrap_fork)
node_flags.disable_legacy_bootstrap = true; node_flags.disable_legacy_bootstrap = true;
auto node0 (system.add_node (config, node_flags)); auto node0 (system.add_node (config, node_flags));
nano::keypair key; nano::keypair key;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, node0->latest (nano::test_genesis_key.pub), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (node0->latest (nano::test_genesis_key.pub)))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, node0->latest (nano::dev_genesis_key.pub), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (node0->latest (nano::dev_genesis_key.pub))));
ASSERT_EQ (nano::process_result::progress, node0->process (*send).code); ASSERT_EQ (nano::process_result::progress, node0->process (*send).code);
// Confirm send block to vote later // Confirm send block to vote later
node0->block_confirm (send); node0->block_confirm (send);
@ -892,13 +892,13 @@ TEST (bootstrap_processor, bootstrap_fork)
auto open_work (*system.work.generate (key.pub)); auto open_work (*system.work.generate (key.pub));
auto open (std::make_shared<nano::state_block> (key.pub, 0, key.pub, nano::Gxrb_ratio, send->hash (), key.prv, key.pub, open_work)); auto open (std::make_shared<nano::state_block> (key.pub, 0, key.pub, nano::Gxrb_ratio, send->hash (), key.prv, key.pub, open_work));
ASSERT_EQ (nano::process_result::progress, node0->process (*open).code); ASSERT_EQ (nano::process_result::progress, node0->process (*open).code);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// Create forked node // Create forked node
config.peering_port = nano::get_available_port (); config.peering_port = nano::get_available_port ();
node_flags.disable_legacy_bootstrap = false; node_flags.disable_legacy_bootstrap = false;
auto node1 (system.add_node (config, node_flags)); auto node1 (system.add_node (config, node_flags));
ASSERT_EQ (nano::process_result::progress, node1->process (*send).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send).code);
auto open_fork (std::make_shared<nano::state_block> (key.pub, 0, nano::test_genesis_key.pub, nano::Gxrb_ratio, send->hash (), key.prv, key.pub, open_work)); auto open_fork (std::make_shared<nano::state_block> (key.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, send->hash (), key.prv, key.pub, open_work));
ASSERT_EQ (nano::process_result::progress, node1->process (*open_fork).code); ASSERT_EQ (nano::process_result::progress, node1->process (*open_fork).code);
// Resolve fork // Resolve fork
node1->bootstrap_initiator.bootstrap (node0->network.endpoint ()); node1->bootstrap_initiator.bootstrap (node0->network.endpoint ());
@ -935,7 +935,7 @@ TEST (frontier_req, begin)
req->count = std::numeric_limits<decltype (req->count)>::max (); req->count = std::numeric_limits<decltype (req->count)>::max ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req))); auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req)));
ASSERT_EQ (nano::test_genesis_key.pub, request->current); ASSERT_EQ (nano::dev_genesis_key.pub, request->current);
nano::genesis genesis; nano::genesis genesis;
ASSERT_EQ (genesis.hash (), request->frontier); ASSERT_EQ (genesis.hash (), request->frontier);
} }
@ -945,7 +945,7 @@ TEST (frontier_req, end)
nano::system system (1); nano::system system (1);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0])); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, system.nodes[0]));
auto req = std::make_unique<nano::frontier_req> (); auto req = std::make_unique<nano::frontier_req> ();
req->start = nano::test_genesis_key.pub.number () + 1; req->start = nano::dev_genesis_key.pub.number () + 1;
req->age = std::numeric_limits<decltype (req->age)>::max (); req->age = std::numeric_limits<decltype (req->age)>::max ();
req->count = std::numeric_limits<decltype (req->count)>::max (); req->count = std::numeric_limits<decltype (req->count)>::max ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
@ -960,10 +960,10 @@ TEST (frontier_req, count)
nano::genesis genesis; nano::genesis genesis;
// Public key FB93... after genesis in accounts table // Public key FB93... after genesis in accounts table
nano::keypair key1 ("ED5AE0A6505B14B67435C29FD9FEEBC26F597D147BC92F6D795FFAD7AFD3D967"); nano::keypair key1 ("ED5AE0A6505B14B67435C29FD9FEEBC26F597D147BC92F6D795FFAD7AFD3D967");
nano::state_block send1 (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0); nano::state_block send1 (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0);
node1->work_generate_blocking (send1); node1->work_generate_blocking (send1);
ASSERT_EQ (nano::process_result::progress, node1->process (send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (send1).code);
nano::state_block receive1 (key1.pub, 0, nano::test_genesis_key.pub, nano::Gxrb_ratio, send1.hash (), key1.prv, key1.pub, 0); nano::state_block receive1 (key1.pub, 0, nano::dev_genesis_key.pub, nano::Gxrb_ratio, send1.hash (), key1.prv, key1.pub, 0);
node1->work_generate_blocking (receive1); node1->work_generate_blocking (receive1);
ASSERT_EQ (nano::process_result::progress, node1->process (receive1).code); ASSERT_EQ (nano::process_result::progress, node1->process (receive1).code);
auto connection (std::make_shared<nano::bootstrap_server> (nullptr, node1)); auto connection (std::make_shared<nano::bootstrap_server> (nullptr, node1));
@ -973,7 +973,7 @@ TEST (frontier_req, count)
req->count = 1; req->count = 1;
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req))); auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req)));
ASSERT_EQ (nano::test_genesis_key.pub, request->current); ASSERT_EQ (nano::dev_genesis_key.pub, request->current);
ASSERT_EQ (send1.hash (), request->frontier); ASSERT_EQ (send1.hash (), request->frontier);
} }
@ -987,7 +987,7 @@ TEST (frontier_req, time_bound)
req->count = std::numeric_limits<decltype (req->count)>::max (); req->count = std::numeric_limits<decltype (req->count)>::max ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req))); auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req)));
ASSERT_EQ (nano::test_genesis_key.pub, request->current); ASSERT_EQ (nano::dev_genesis_key.pub, request->current);
// Wait 2 seconds until age of account will be > 1 seconds // Wait 2 seconds until age of account will be > 1 seconds
std::this_thread::sleep_for (std::chrono::milliseconds (2100)); std::this_thread::sleep_for (std::chrono::milliseconds (2100));
auto req2 (std::make_unique<nano::frontier_req> ()); auto req2 (std::make_unique<nano::frontier_req> ());
@ -1010,7 +1010,7 @@ TEST (frontier_req, time_cutoff)
req->count = std::numeric_limits<decltype (req->count)>::max (); req->count = std::numeric_limits<decltype (req->count)>::max ();
connection->requests.push (std::unique_ptr<nano::message>{}); connection->requests.push (std::unique_ptr<nano::message>{});
auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req))); auto request (std::make_shared<nano::frontier_req_server> (connection, std::move (req)));
ASSERT_EQ (nano::test_genesis_key.pub, request->current); ASSERT_EQ (nano::dev_genesis_key.pub, request->current);
nano::genesis genesis; nano::genesis genesis;
ASSERT_EQ (genesis.hash (), request->frontier); ASSERT_EQ (genesis.hash (), request->frontier);
// Wait 4 seconds until age of account will be > 3 seconds // Wait 4 seconds until age of account will be > 3 seconds
@ -1034,19 +1034,19 @@ TEST (bulk, genesis)
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_lazy_bootstrap = true; node_flags.disable_lazy_bootstrap = true;
auto node1 = system.add_node (config, node_flags); auto node1 = system.add_node (config, node_flags);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto node2 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node2 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node2->init_error ()); ASSERT_FALSE (node2->init_error ());
nano::block_hash latest1 (node1->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1->latest (nano::dev_genesis_key.pub));
nano::block_hash latest2 (node2->latest (nano::test_genesis_key.pub)); nano::block_hash latest2 (node2->latest (nano::dev_genesis_key.pub));
ASSERT_EQ (latest1, latest2); ASSERT_EQ (latest1, latest2);
nano::keypair key2; nano::keypair key2;
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, 100)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 100));
nano::block_hash latest3 (node1->latest (nano::test_genesis_key.pub)); nano::block_hash latest3 (node1->latest (nano::dev_genesis_key.pub));
ASSERT_NE (latest1, latest3); ASSERT_NE (latest1, latest3);
node2->bootstrap_initiator.bootstrap (node1->network.endpoint ()); node2->bootstrap_initiator.bootstrap (node1->network.endpoint ());
ASSERT_TIMELY (10s, node2->latest (nano::test_genesis_key.pub) == node1->latest (nano::test_genesis_key.pub)); ASSERT_TIMELY (10s, node2->latest (nano::dev_genesis_key.pub) == node1->latest (nano::dev_genesis_key.pub));
ASSERT_EQ (node2->latest (nano::test_genesis_key.pub), node1->latest (nano::test_genesis_key.pub)); ASSERT_EQ (node2->latest (nano::dev_genesis_key.pub), node1->latest (nano::dev_genesis_key.pub));
node2->stop (); node2->stop ();
} }
@ -1059,7 +1059,7 @@ TEST (bulk, offline_send)
node_flags.disable_bootstrap_bulk_push_client = true; node_flags.disable_bootstrap_bulk_push_client = true;
node_flags.disable_lazy_bootstrap = true; node_flags.disable_lazy_bootstrap = true;
auto node1 = system.add_node (config, node_flags); auto node1 = system.add_node (config, node_flags);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto node2 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work)); auto node2 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.alarm, system.logging, system.work));
ASSERT_FALSE (node2->init_error ()); ASSERT_FALSE (node2->init_error ());
node2->start (); node2->start ();
@ -1067,8 +1067,8 @@ TEST (bulk, offline_send)
nano::keypair key2; nano::keypair key2;
auto wallet (node2->wallets.create (nano::random_wallet_id ())); auto wallet (node2->wallets.create (nano::random_wallet_id ()));
wallet->insert_adhoc (key2.prv); wallet->insert_adhoc (key2.prv);
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, node1->config.receive_minimum.number ()));
ASSERT_NE (std::numeric_limits<nano::uint256_t>::max (), node1->balance (nano::test_genesis_key.pub)); ASSERT_NE (std::numeric_limits<nano::uint256_t>::max (), node1->balance (nano::dev_genesis_key.pub));
// Wait to finish election background tasks // Wait to finish election background tasks
ASSERT_TIMELY (10s, node1->active.empty ()); ASSERT_TIMELY (10s, node1->active.empty ());
// Initiate bootstrap // Initiate bootstrap
@ -1080,7 +1080,7 @@ TEST (bulk, offline_send)
ASSERT_NO_ERROR (system.poll ()); ASSERT_NO_ERROR (system.poll ());
} while (node1->network.empty () || node2->network.empty ()); } while (node1->network.empty () || node2->network.empty ());
// Send block arrival via bootstrap // Send block arrival via bootstrap
ASSERT_TIMELY (10s, node2->balance (nano::test_genesis_key.pub) != std::numeric_limits<nano::uint256_t>::max ()); ASSERT_TIMELY (10s, node2->balance (nano::dev_genesis_key.pub) != std::numeric_limits<nano::uint256_t>::max ());
// Receiving send block // Receiving send block
ASSERT_TIMELY (20s, node2->balance (key2.pub) == node1->config.receive_minimum.number ()); ASSERT_TIMELY (20s, node2->balance (key2.pub) == node1->config.receive_minimum.number ());
node2->stop (); node2->stop ();
@ -1091,7 +1091,7 @@ TEST (bulk_pull_account, basics)
nano::system system (1); nano::system system (1);
system.nodes[0]->config.receive_minimum = 20; system.nodes[0]->config.receive_minimum = 20;
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (0)->insert_adhoc (key1.prv); system.wallet (0)->insert_adhoc (key1.prv);
auto send1 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 25)); auto send1 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 25));
auto send2 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 10)); auto send2 (system.wallet (0)->send_action (nano::genesis_account, key1.pub, 10));

244
nano/core_test/confirmation_height.cpp
View file

@ -38,15 +38,15 @@ TEST (confirmation_height, single)
node_flags.confirmation_height_processor_mode = mode_a; node_flags.confirmation_height_processor_mode = mode_a;
auto node = system.add_node (node_flags); auto node = system.add_node (node_flags);
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash latest1 (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node->latest (nano::dev_genesis_key.pub));
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, latest1, nano::test_genesis_key.pub, amount - 100, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, latest1, nano::dev_genesis_key.pub, amount - 100, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)));
// Check confirmation heights before, should be uninitialized (1 for genesis). // Check confirmation heights before, should be uninitialized (1 for genesis).
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
add_callback_stats (*node); add_callback_stats (*node);
auto transaction = node->store.tx_begin_read (); auto transaction = node->store.tx_begin_read ();
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (1, confirmation_height_info.height);
ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier);
@ -58,7 +58,7 @@ TEST (confirmation_height, single)
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_TRUE (node->ledger.block_confirmed (transaction, send1->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, send1->hash ()));
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (2, confirmation_height_info.height); ASSERT_EQ (2, confirmation_height_info.height);
ASSERT_EQ (send1->hash (), confirmation_height_info.frontier); ASSERT_EQ (send1->hash (), confirmation_height_info.frontier);
@ -90,12 +90,12 @@ TEST (confirmation_height, multiple_accounts)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
nano::keypair key3; nano::keypair key3;
nano::block_hash latest1 (system.nodes[0]->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (system.nodes[0]->latest (nano::dev_genesis_key.pub));
// Send to all accounts // Send to all accounts
nano::send_block send1 (latest1, key1.pub, system.nodes.front ()->config.online_weight_minimum.number () + 300, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1)); nano::send_block send1 (latest1, key1.pub, system.nodes.front ()->config.online_weight_minimum.number () + 300, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1));
nano::send_block send2 (send1.hash (), key2.pub, system.nodes.front ()->config.online_weight_minimum.number () + 200, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::send_block send2 (send1.hash (), key2.pub, system.nodes.front ()->config.online_weight_minimum.number () + 200, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::send_block send3 (send2.hash (), key3.pub, system.nodes.front ()->config.online_weight_minimum.number () + 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send2.hash ())); nano::send_block send3 (send2.hash (), key3.pub, system.nodes.front ()->config.online_weight_minimum.number () + 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ()));
// Open all accounts // Open all accounts
nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
@ -132,7 +132,7 @@ TEST (confirmation_height, multiple_accounts)
// Check confirmation heights of all the accounts are uninitialized (0), // Check confirmation heights of all the accounts are uninitialized (0),
// as we have any just added them to the ledger and not processed any live transactions yet. // as we have any just added them to the ledger and not processed any live transactions yet.
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (1, confirmation_height_info.height);
ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier);
ASSERT_FALSE (node->store.confirmation_height_get (transaction, key1.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, key1.pub, confirmation_height_info));
@ -165,8 +165,8 @@ TEST (confirmation_height, multiple_accounts)
auto & store = node->store; auto & store = node->store;
auto transaction = node->store.tx_begin_read (); auto transaction = node->store.tx_begin_read ();
ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ()));
ASSERT_FALSE (store.account_get (transaction, nano::test_genesis_key.pub, account_info)); ASSERT_FALSE (store.account_get (transaction, nano::dev_genesis_key.pub, account_info));
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (4, confirmation_height_info.height); ASSERT_EQ (4, confirmation_height_info.height);
ASSERT_EQ (send3.hash (), confirmation_height_info.frontier); ASSERT_EQ (send3.hash (), confirmation_height_info.frontier);
ASSERT_EQ (4, account_info.block_count); ASSERT_EQ (4, account_info.block_count);
@ -201,7 +201,7 @@ TEST (confirmation_height, multiple_accounts)
// Confirm the other latest can't be rolled back either // Confirm the other latest can't be rolled back either
ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (key3.pub))); ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (key3.pub)));
ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (nano::test_genesis_key.pub))); ASSERT_TRUE (node->ledger.rollback (transaction, node->latest (nano::dev_genesis_key.pub)));
// Attempt some others which have been cemented // Attempt some others which have been cemented
ASSERT_TRUE (node->ledger.rollback (transaction, open1.hash ())); ASSERT_TRUE (node->ledger.rollback (transaction, open1.hash ()));
@ -228,11 +228,11 @@ TEST (confirmation_height, gap_bootstrap)
auto & node1 = *system.add_node (node_flags); auto & node1 = *system.add_node (node_flags);
nano::genesis genesis; nano::genesis genesis;
nano::keypair destination; nano::keypair destination;
auto send1 (std::make_shared<nano::state_block> (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::state_block> (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send1); node1.work_generate_blocking (*send1);
auto send2 (std::make_shared<nano::state_block> (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send2 (std::make_shared<nano::state_block> (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send2); node1.work_generate_blocking (*send2);
auto send3 (std::make_shared<nano::state_block> (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send3 (std::make_shared<nano::state_block> (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send3); node1.work_generate_blocking (*send3);
auto open1 (std::make_shared<nano::open_block> (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); auto open1 (std::make_shared<nano::open_block> (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0));
node1.work_generate_blocking (*open1); node1.work_generate_blocking (*open1);
@ -262,7 +262,7 @@ TEST (confirmation_height, gap_bootstrap)
ASSERT_EQ (unchecked_count, 2); ASSERT_EQ (unchecked_count, 2);
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node1.store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node1.store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (1, confirmation_height_info.height);
ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier);
} }
@ -278,7 +278,7 @@ TEST (confirmation_height, gap_bootstrap)
ASSERT_EQ (unchecked_count, 0); ASSERT_EQ (unchecked_count, 0);
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node1.store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node1.store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (1, confirmation_height_info.height);
ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier); ASSERT_EQ (genesis.hash (), confirmation_height_info.frontier);
ASSERT_FALSE (node1.store.confirmation_height_get (transaction, destination.pub, confirmation_height_info)); ASSERT_FALSE (node1.store.confirmation_height_get (transaction, destination.pub, confirmation_height_info));
@ -309,15 +309,15 @@ TEST (confirmation_height, gap_live)
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
system.add_node (node_config, node_flags); system.add_node (node_config, node_flags);
nano::keypair destination; nano::keypair destination;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (1)->insert_adhoc (destination.prv); system.wallet (1)->insert_adhoc (destination.prv);
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::state_block> (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::state_block> (nano::genesis_account, genesis.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node->work_generate_blocking (*send1); node->work_generate_blocking (*send1);
auto send2 (std::make_shared<nano::state_block> (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send2 (std::make_shared<nano::state_block> (nano::genesis_account, send1->hash (), nano::genesis_account, nano::genesis_amount - 2 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node->work_generate_blocking (*send2); node->work_generate_blocking (*send2);
auto send3 (std::make_shared<nano::state_block> (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send3 (std::make_shared<nano::state_block> (nano::genesis_account, send2->hash (), nano::genesis_account, nano::genesis_amount - 3 * nano::Gxrb_ratio, destination.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node->work_generate_blocking (*send3); node->work_generate_blocking (*send3);
auto open1 (std::make_shared<nano::open_block> (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0)); auto open1 (std::make_shared<nano::open_block> (send1->hash (), destination.pub, destination.pub, destination.prv, destination.pub, 0));
@ -343,7 +343,7 @@ TEST (confirmation_height, gap_live)
{ {
auto transaction = node->store.tx_begin_read (); auto transaction = node->store.tx_begin_read ();
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (1, confirmation_height_info.height); ASSERT_EQ (1, confirmation_height_info.height);
ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier); ASSERT_EQ (nano::genesis_hash, confirmation_height_info.frontier);
} }
@ -368,7 +368,7 @@ TEST (confirmation_height, gap_live)
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive2->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive2->hash ()));
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (4, confirmation_height_info.height); ASSERT_EQ (4, confirmation_height_info.height);
ASSERT_EQ (send3->hash (), confirmation_height_info.frontier); ASSERT_EQ (send3->hash (), confirmation_height_info.frontier);
ASSERT_FALSE (node->store.confirmation_height_get (transaction, destination.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, destination.pub, confirmation_height_info));
@ -397,24 +397,24 @@ TEST (confirmation_height, send_receive_between_2_accounts)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::keypair key1; nano::keypair key1;
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::send_block send1 (latest, key1.pub, node->config.online_weight_minimum.number () + 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send1 (latest, key1.pub, node->config.online_weight_minimum.number () + 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
nano::send_block send2 (open1.hash (), nano::genesis_account, 1000, key1.prv, key1.pub, *system.work.generate (open1.hash ())); nano::send_block send2 (open1.hash (), nano::genesis_account, 1000, key1.prv, key1.pub, *system.work.generate (open1.hash ()));
nano::send_block send3 (send2.hash (), nano::genesis_account, 900, key1.prv, key1.pub, *system.work.generate (send2.hash ())); nano::send_block send3 (send2.hash (), nano::genesis_account, 900, key1.prv, key1.pub, *system.work.generate (send2.hash ()));
nano::send_block send4 (send3.hash (), nano::genesis_account, 500, key1.prv, key1.pub, *system.work.generate (send3.hash ())); nano::send_block send4 (send3.hash (), nano::genesis_account, 500, key1.prv, key1.pub, *system.work.generate (send3.hash ()));
nano::receive_block receive1 (send1.hash (), send2.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::receive_block receive1 (send1.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::receive_block receive2 (receive1.hash (), send3.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive1.hash ())); nano::receive_block receive2 (receive1.hash (), send3.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1.hash ()));
nano::receive_block receive3 (receive2.hash (), send4.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive2.hash ())); nano::receive_block receive3 (receive2.hash (), send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ()));
nano::send_block send5 (receive3.hash (), key1.pub, node->config.online_weight_minimum.number () + 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive3.hash ())); nano::send_block send5 (receive3.hash (), key1.pub, node->config.online_weight_minimum.number () + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive3.hash ()));
auto receive4 = std::make_shared<nano::receive_block> (send4.hash (), send5.hash (), key1.prv, key1.pub, *system.work.generate (send4.hash ())); auto receive4 = std::make_shared<nano::receive_block> (send4.hash (), send5.hash (), key1.prv, key1.pub, *system.work.generate (send4.hash ()));
// Unpocketed send // Unpocketed send
nano::keypair key2; nano::keypair key2;
nano::send_block send6 (send5.hash (), key2.pub, node->config.online_weight_minimum.number (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send5.hash ())); nano::send_block send6 (send5.hash (), key2.pub, node->config.online_weight_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code);
@ -451,8 +451,8 @@ TEST (confirmation_height, send_receive_between_2_accounts)
ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive4->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive4->hash ()));
nano::account_info account_info; nano::account_info account_info;
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.account_get (transaction, nano::test_genesis_key.pub, account_info)); ASSERT_FALSE (node->store.account_get (transaction, nano::dev_genesis_key.pub, account_info));
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (6, confirmation_height_info.height); ASSERT_EQ (6, confirmation_height_info.height);
ASSERT_EQ (send5.hash (), confirmation_height_info.frontier); ASSERT_EQ (send5.hash (), confirmation_height_info.frontier);
ASSERT_EQ (7, account_info.block_count); ASSERT_EQ (7, account_info.block_count);
@ -484,19 +484,19 @@ TEST (confirmation_height, send_receive_self)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::send_block send1 (latest, nano::test_genesis_key.pub, nano::genesis_amount - 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send1 (latest, nano::dev_genesis_key.pub, nano::genesis_amount - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::receive_block receive1 (send1.hash (), send1.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::receive_block receive1 (send1.hash (), send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::send_block send2 (receive1.hash (), nano::test_genesis_key.pub, nano::genesis_amount - 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive1.hash ())); nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1.hash ()));
nano::send_block send3 (send2.hash (), nano::test_genesis_key.pub, nano::genesis_amount - 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send2.hash ())); nano::send_block send3 (send2.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ()));
nano::receive_block receive2 (send3.hash (), send2.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send3.hash ())); nano::receive_block receive2 (send3.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ()));
auto receive3 = std::make_shared<nano::receive_block> (receive2.hash (), send3.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive2.hash ())); auto receive3 = std::make_shared<nano::receive_block> (receive2.hash (), send3.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ()));
// Send to another account to prevent automatic receiving on the genesis account // Send to another account to prevent automatic receiving on the genesis account
nano::keypair key1; nano::keypair key1;
nano::send_block send4 (receive3->hash (), key1.pub, node->config.online_weight_minimum.number (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive3->hash ())); nano::send_block send4 (receive3->hash (), key1.pub, node->config.online_weight_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive3->hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send1).code);
@ -524,9 +524,9 @@ TEST (confirmation_height, send_receive_self)
auto transaction (node->store.tx_begin_read ()); auto transaction (node->store.tx_begin_read ());
ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, receive3->hash ()));
nano::account_info account_info; nano::account_info account_info;
ASSERT_FALSE (node->store.account_get (transaction, nano::test_genesis_key.pub, account_info)); ASSERT_FALSE (node->store.account_get (transaction, nano::dev_genesis_key.pub, account_info));
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (7, confirmation_height_info.height); ASSERT_EQ (7, confirmation_height_info.height);
ASSERT_EQ (receive3->hash (), confirmation_height_info.frontier); ASSERT_EQ (receive3->hash (), confirmation_height_info.frontier);
ASSERT_EQ (8, account_info.block_count); ASSERT_EQ (8, account_info.block_count);
@ -550,14 +550,14 @@ TEST (confirmation_height, all_block_types)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
auto & store = node->store; auto & store = node->store;
nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::send_block send1 (send.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); nano::send_block send1 (send.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
nano::open_block open (send.hash (), nano::test_genesis_key.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
nano::state_block state_open (key2.pub, 0, 0, nano::Gxrb_ratio, send1.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)); nano::state_block state_open (key2.pub, 0, 0, nano::Gxrb_ratio, send1.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub));
nano::send_block send2 (open.hash (), key2.pub, 0, key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::send_block send2 (open.hash (), key2.pub, 0, key1.prv, key1.pub, *system.work.generate (open.hash ()));
@ -568,19 +568,19 @@ TEST (confirmation_height, all_block_types)
nano::change_block change (receive.hash (), key2.pub, key1.prv, key1.pub, *system.work.generate (receive.hash ())); nano::change_block change (receive.hash (), key2.pub, key1.prv, key1.pub, *system.work.generate (receive.hash ()));
nano::state_block state_change (key2.pub, state_send.hash (), nano::test_genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *system.work.generate (state_send.hash ())); nano::state_block state_change (key2.pub, state_send.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, 0, key2.prv, key2.pub, *system.work.generate (state_send.hash ()));
nano::state_block epoch (key2.pub, state_change.hash (), nano::test_genesis_key.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (state_change.hash ())); nano::state_block epoch (key2.pub, state_change.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (state_change.hash ()));
nano::state_block epoch1 (key1.pub, change.hash (), key2.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (change.hash ())); nano::state_block epoch1 (key1.pub, change.hash (), key2.pub, nano::Gxrb_ratio, node->ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (change.hash ()));
nano::state_block state_send1 (key1.pub, epoch1.hash (), 0, nano::Gxrb_ratio - 1, key2.pub, key1.prv, key1.pub, *system.work.generate (epoch1.hash ())); nano::state_block state_send1 (key1.pub, epoch1.hash (), 0, nano::Gxrb_ratio - 1, key2.pub, key1.prv, key1.pub, *system.work.generate (epoch1.hash ()));
nano::state_block state_receive2 (key2.pub, epoch.hash (), 0, nano::Gxrb_ratio + 1, state_send1.hash (), key2.prv, key2.pub, *system.work.generate (epoch.hash ())); nano::state_block state_receive2 (key2.pub, epoch.hash (), 0, nano::Gxrb_ratio + 1, state_send1.hash (), key2.prv, key2.pub, *system.work.generate (epoch.hash ()));
auto state_send2 = std::make_shared<nano::state_block> (key2.pub, state_receive2.hash (), 0, nano::Gxrb_ratio, key1.pub, key2.prv, key2.pub, *system.work.generate (state_receive2.hash ())); auto state_send2 = std::make_shared<nano::state_block> (key2.pub, state_receive2.hash (), 0, nano::Gxrb_ratio, key1.pub, key2.prv, key2.pub, *system.work.generate (state_receive2.hash ()));
nano::state_block state_send3 (key2.pub, state_send2->hash (), 0, nano::Gxrb_ratio - 1, key1.pub, key2.prv, key2.pub, *system.work.generate (state_send2->hash ())); nano::state_block state_send3 (key2.pub, state_send2->hash (), 0, nano::Gxrb_ratio - 1, key1.pub, key2.prv, key2.pub, *system.work.generate (state_send2->hash ()));
nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::test_genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ())); nano::state_block state_send4 (key1.pub, state_send1.hash (), 0, nano::Gxrb_ratio - 2, nano::dev_genesis_key.pub, key1.prv, key1.pub, *system.work.generate (state_send1.hash ()));
nano::state_block state_receive3 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::state_block state_receive3 (nano::genesis_account, send1.hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio * 2 + 1, state_send4.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
{ {
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
@ -625,8 +625,8 @@ TEST (confirmation_height, all_block_types)
ASSERT_TRUE (node->ledger.block_confirmed (transaction, state_send2->hash ())); ASSERT_TRUE (node->ledger.block_confirmed (transaction, state_send2->hash ()));
nano::account_info account_info; nano::account_info account_info;
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.account_get (transaction, nano::test_genesis_key.pub, account_info)); ASSERT_FALSE (node->store.account_get (transaction, nano::dev_genesis_key.pub, account_info));
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (3, confirmation_height_info.height); ASSERT_EQ (3, confirmation_height_info.height);
ASSERT_EQ (send1.hash (), confirmation_height_info.frontier); ASSERT_EQ (send1.hash (), confirmation_height_info.frontier);
ASSERT_LE (4, account_info.block_count); ASSERT_LE (4, account_info.block_count);
@ -670,10 +670,10 @@ TEST (confirmation_height, conflict_rollback_cemented)
ASSERT_EQ (1, node1->network.size ()); ASSERT_EQ (1, node1->network.size ());
nano::keypair key1; nano::keypair key1;
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
nano::publish publish1 (send1); nano::publish publish1 (send1);
nano::keypair key2; nano::keypair key2;
auto send2 (std::make_shared<nano::send_block> (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send2 (std::make_shared<nano::send_block> (genesis.hash (), key2.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
nano::publish publish2 (send2); nano::publish publish2 (send2);
auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ())); auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ()));
node1->network.process_message (publish1, channel1); node1->network.process_message (publish1, channel1);
@ -683,7 +683,7 @@ TEST (confirmation_height, conflict_rollback_cemented)
node2->block_processor.flush (); node2->block_processor.flush ();
ASSERT_EQ (1, node1->active.size ()); ASSERT_EQ (1, node1->active.size ());
ASSERT_EQ (1, node2->active.size ()); ASSERT_EQ (1, node2->active.size ());
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node1->network.process_message (publish2, channel1); node1->network.process_message (publish2, channel1);
node1->block_processor.flush (); node1->block_processor.flush ();
node2->network.process_message (publish1, channel2); node2->network.process_message (publish1, channel2);
@ -748,7 +748,7 @@ TEST (confirmation_heightDeathTest, rollback_added_block)
nano::write_database_queue write_database_queue; nano::write_database_queue write_database_queue;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); auto send = std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
{ {
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
store.initialize (transaction, genesis, ledger.cache); store.initialize (transaction, genesis, ledger.cache);
@ -779,9 +779,9 @@ TEST (confirmation_height, observers)
node_flags.confirmation_height_processor_mode = mode_a; node_flags.confirmation_height_processor_mode = mode_a;
auto node1 = system.add_node (node_flags); auto node1 = system.add_node (node_flags);
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash latest1 (node1->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1->latest (nano::dev_genesis_key.pub));
auto send1 (std::make_shared<nano::send_block> (latest1, key1.pub, amount - node1->config.receive_minimum.number (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1))); auto send1 (std::make_shared<nano::send_block> (latest1, key1.pub, amount - node1->config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)));
add_callback_stats (*node1); add_callback_stats (*node1);
@ -820,7 +820,7 @@ TEST (confirmation_heightDeathTest, modified_chain)
nano::write_database_queue write_database_queue; nano::write_database_queue write_database_queue;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (nano::genesis_hash)); auto send = std::make_shared<nano::send_block> (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash));
{ {
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
store.initialize (transaction, genesis, ledger.cache); store.initialize (transaction, genesis, ledger.cache);
@ -886,7 +886,7 @@ TEST (confirmation_heightDeathTest, modified_chain_account_removed)
nano::write_database_queue write_database_queue; nano::write_database_queue write_database_queue;
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (nano::genesis_hash)); auto send = std::make_shared<nano::send_block> (nano::genesis_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (nano::genesis_hash));
auto open = std::make_shared<nano::state_block> (key1.pub, 0, 0, nano::Gxrb_ratio, send->hash (), key1.prv, key1.pub, *pool.generate (key1.pub)); auto open = std::make_shared<nano::state_block> (key1.pub, 0, 0, nano::Gxrb_ratio, send->hash (), key1.prv, key1.pub, *pool.generate (key1.pub));
{ {
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
@ -946,12 +946,12 @@ TEST (confirmation_height, pending_observer_callbacks)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
auto send1 = std::make_shared<nano::send_block> (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); auto send1 = std::make_shared<nano::send_block> (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -989,29 +989,29 @@ TEST (confirmation_height, prioritize_frontiers)
nano::keypair key2; nano::keypair key2;
nano::keypair key3; nano::keypair key3;
nano::keypair key4; nano::keypair key4;
nano::block_hash latest1 (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node->latest (nano::dev_genesis_key.pub));
// Send different numbers of blocks all accounts // Send different numbers of blocks all accounts
nano::send_block send1 (latest1, key1.pub, node->config.online_weight_minimum.number () + 10000, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1)); nano::send_block send1 (latest1, key1.pub, node->config.online_weight_minimum.number () + 10000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1));
nano::send_block send2 (send1.hash (), key1.pub, node->config.online_weight_minimum.number () + 8500, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::send_block send2 (send1.hash (), key1.pub, node->config.online_weight_minimum.number () + 8500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::send_block send3 (send2.hash (), key1.pub, node->config.online_weight_minimum.number () + 8000, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send2.hash ())); nano::send_block send3 (send2.hash (), key1.pub, node->config.online_weight_minimum.number () + 8000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2.hash ()));
nano::send_block send4 (send3.hash (), key2.pub, node->config.online_weight_minimum.number () + 7500, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send3.hash ())); nano::send_block send4 (send3.hash (), key2.pub, node->config.online_weight_minimum.number () + 7500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ()));
nano::send_block send5 (send4.hash (), key3.pub, node->config.online_weight_minimum.number () + 6500, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send4.hash ())); nano::send_block send5 (send4.hash (), key3.pub, node->config.online_weight_minimum.number () + 6500, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send4.hash ()));
nano::send_block send6 (send5.hash (), key4.pub, node->config.online_weight_minimum.number () + 6000, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send5.hash ())); nano::send_block send6 (send5.hash (), key4.pub, node->config.online_weight_minimum.number () + 6000, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send5.hash ()));
// Open all accounts and add other sends to get different uncemented counts (as well as some which are the same) // Open all accounts and add other sends to get different uncemented counts (as well as some which are the same)
nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open1 (send1.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
nano::send_block send7 (open1.hash (), nano::test_genesis_key.pub, 500, key1.prv, key1.pub, *system.work.generate (open1.hash ())); nano::send_block send7 (open1.hash (), nano::dev_genesis_key.pub, 500, key1.prv, key1.pub, *system.work.generate (open1.hash ()));
nano::open_block open2 (send4.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); nano::open_block open2 (send4.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub));
nano::open_block open3 (send5.hash (), nano::genesis_account, key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub)); nano::open_block open3 (send5.hash (), nano::genesis_account, key3.pub, key3.prv, key3.pub, *system.work.generate (key3.pub));
nano::send_block send8 (open3.hash (), nano::test_genesis_key.pub, 500, key3.prv, key3.pub, *system.work.generate (open3.hash ())); nano::send_block send8 (open3.hash (), nano::dev_genesis_key.pub, 500, key3.prv, key3.pub, *system.work.generate (open3.hash ()));
nano::send_block send9 (send8.hash (), nano::test_genesis_key.pub, 200, key3.prv, key3.pub, *system.work.generate (send8.hash ())); nano::send_block send9 (send8.hash (), nano::dev_genesis_key.pub, 200, key3.prv, key3.pub, *system.work.generate (send8.hash ()));
nano::open_block open4 (send6.hash (), nano::genesis_account, key4.pub, key4.prv, key4.pub, *system.work.generate (key4.pub)); nano::open_block open4 (send6.hash (), nano::genesis_account, key4.pub, key4.prv, key4.pub, *system.work.generate (key4.pub));
nano::send_block send10 (open4.hash (), nano::test_genesis_key.pub, 500, key4.prv, key4.pub, *system.work.generate (open4.hash ())); nano::send_block send10 (open4.hash (), nano::dev_genesis_key.pub, 500, key4.prv, key4.pub, *system.work.generate (open4.hash ()));
nano::send_block send11 (send10.hash (), nano::test_genesis_key.pub, 200, key4.prv, key4.pub, *system.work.generate (send10.hash ())); nano::send_block send11 (send10.hash (), nano::dev_genesis_key.pub, 200, key4.prv, key4.pub, *system.work.generate (send10.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -1054,7 +1054,7 @@ TEST (confirmation_height, prioritize_frontiers)
{ {
// Add some to the local node wallets and check ordering of both containers // Add some to the local node wallets and check ordering of both containers
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (0)->insert_adhoc (key1.prv); system.wallet (0)->insert_adhoc (key1.prv);
system.wallet (0)->insert_adhoc (key2.prv); system.wallet (0)->insert_adhoc (key2.prv);
node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1)); node->active.prioritize_frontiers_for_confirmation (transaction, std::chrono::seconds (1), std::chrono::seconds (1));
@ -1080,12 +1080,12 @@ TEST (confirmation_height, prioritize_frontiers)
} }
// Check that accounts which already exist have their order modified when the uncemented count changes. // Check that accounts which already exist have their order modified when the uncemented count changes.
nano::send_block send12 (send9.hash (), nano::test_genesis_key.pub, 100, key3.prv, key3.pub, *system.work.generate (send9.hash ())); nano::send_block send12 (send9.hash (), nano::dev_genesis_key.pub, 100, key3.prv, key3.pub, *system.work.generate (send9.hash ()));
nano::send_block send13 (send12.hash (), nano::test_genesis_key.pub, 90, key3.prv, key3.pub, *system.work.generate (send12.hash ())); nano::send_block send13 (send12.hash (), nano::dev_genesis_key.pub, 90, key3.prv, key3.pub, *system.work.generate (send12.hash ()));
nano::send_block send14 (send13.hash (), nano::test_genesis_key.pub, 80, key3.prv, key3.pub, *system.work.generate (send13.hash ())); nano::send_block send14 (send13.hash (), nano::dev_genesis_key.pub, 80, key3.prv, key3.pub, *system.work.generate (send13.hash ()));
nano::send_block send15 (send14.hash (), nano::test_genesis_key.pub, 70, key3.prv, key3.pub, *system.work.generate (send14.hash ())); nano::send_block send15 (send14.hash (), nano::dev_genesis_key.pub, 70, key3.prv, key3.pub, *system.work.generate (send14.hash ()));
nano::send_block send16 (send15.hash (), nano::test_genesis_key.pub, 60, key3.prv, key3.pub, *system.work.generate (send15.hash ())); nano::send_block send16 (send15.hash (), nano::dev_genesis_key.pub, 60, key3.prv, key3.pub, *system.work.generate (send15.hash ()));
nano::send_block send17 (send16.hash (), nano::test_genesis_key.pub, 50, key3.prv, key3.pub, *system.work.generate (send16.hash ())); nano::send_block send17 (send16.hash (), nano::dev_genesis_key.pub, 50, key3.prv, key3.pub, *system.work.generate (send16.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send12).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send12).code);
@ -1129,7 +1129,7 @@ TEST (confirmation_height, frontiers_confirmation_mode)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::always; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::always;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::state_block send (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
@ -1142,7 +1142,7 @@ TEST (confirmation_height, frontiers_confirmation_mode)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::automatic; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::automatic;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::state_block send (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
@ -1155,12 +1155,12 @@ TEST (confirmation_height, frontiers_confirmation_mode)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::state_block send (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node->work_generate_blocking (genesis.hash ())); nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node->work_generate_blocking (genesis.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
} }
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
std::this_thread::sleep_for (std::chrono::seconds (1)); std::this_thread::sleep_for (std::chrono::seconds (1));
ASSERT_EQ (0, node->active.size ()); ASSERT_EQ (0, node->active.size ());
} }
@ -1181,16 +1181,16 @@ TEST (confirmation_height, callback_confirmed_history)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code);
} }
auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send->hash ())); auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ()));
add_callback_stats (*node); add_callback_stats (*node);
@ -1264,12 +1264,12 @@ TEST (confirmation_height, dependent_election)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send->hash ())); auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ()));
auto send2 = std::make_shared<nano::send_block> (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ())); auto send2 = std::make_shared<nano::send_block> (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code);
@ -1317,27 +1317,27 @@ TEST (confirmation_height, cemented_gap_below_receive)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (key1.prv); system.wallet (0)->insert_adhoc (key1.prv);
nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
nano::keypair dummy_key; nano::keypair dummy_key;
nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ()));
nano::send_block send2 (receive1.hash (), nano::test_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ()));
nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (dummy_send.hash ())); nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send.hash ()));
nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive2.hash ())); nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ()));
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (key2.prv); system.wallet (0)->insert_adhoc (key2.prv);
nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ()));
nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send3.hash ())); nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ()));
auto open1 = std::make_shared<nano::open_block> (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); auto open1 = std::make_shared<nano::open_block> (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub));
@ -1405,27 +1405,27 @@ TEST (confirmation_height, cemented_gap_below_no_cache)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (key1.prv); system.wallet (0)->insert_adhoc (key1.prv);
nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); nano::send_block send1 (send.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
nano::keypair dummy_key; nano::keypair dummy_key;
nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::send_block dummy_send (send1.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ())); nano::receive_block receive1 (open.hash (), send1.hash (), key1.prv, key1.pub, *system.work.generate (open.hash ()));
nano::send_block send2 (receive1.hash (), nano::test_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ())); nano::send_block send2 (receive1.hash (), nano::dev_genesis_key.pub, nano::Gxrb_ratio, key1.prv, key1.pub, *system.work.generate (receive1.hash ()));
nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (dummy_send.hash ())); nano::receive_block receive2 (dummy_send.hash (), send2.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send.hash ()));
nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive2.hash ())); nano::send_block dummy_send1 (receive2.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive2.hash ()));
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (key2.prv); system.wallet (0)->insert_adhoc (key2.prv);
nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (dummy_send1.hash ())); nano::send_block send3 (dummy_send1.hash (), key2.pub, nano::genesis_amount - nano::Gxrb_ratio * 4, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (dummy_send1.hash ()));
nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send3.hash ())); nano::send_block dummy_send2 (send3.hash (), dummy_key.pub, nano::genesis_amount - nano::Gxrb_ratio * 5, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send3.hash ()));
auto open1 = std::make_shared<nano::open_block> (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub)); auto open1 = std::make_shared<nano::open_block> (send3.hash (), nano::genesis_account, key2.pub, key2.prv, key2.pub, *system.work.generate (key2.pub));
@ -1491,12 +1491,12 @@ TEST (confirmation_height, election_winner_details_clearing)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config, node_flags); auto node = system.add_node (node_config, node_flags);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); auto send = std::make_shared<nano::send_block> (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send->hash ())); auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send->hash ()));
auto send2 = std::make_shared<nano::send_block> (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ())); auto send2 = std::make_shared<nano::send_block> (send1->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 3, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -1566,7 +1566,7 @@ TEST (confirmation_height, election_winner_details_clearing_node_process_confirm
nano::system system (1); nano::system system (1);
auto node = system.nodes.front (); auto node = system.nodes.front ();
auto send = std::make_shared<nano::send_block> (nano::genesis_hash, nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (nano::genesis_hash)); auto send = std::make_shared<nano::send_block> (nano::genesis_hash, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash));
// Add to election_winner_details. Use an unrealistic iteration so that it should fall into the else case and do a cleanup // Add to election_winner_details. Use an unrealistic iteration so that it should fall into the else case and do a cleanup
node->active.add_election_winner_details (send->hash (), nullptr); node->active.add_election_winner_details (send->hash (), nullptr);
nano::election_status election; nano::election_status election;
@ -1588,8 +1588,8 @@ TEST (confirmation_height, unbounded_block_cache_iteration)
boost::latch initialized_latch{ 0 }; boost::latch initialized_latch{ 0 };
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key1; nano::keypair key1;
auto send = std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); auto send = std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (send->hash ())); auto send1 = std::make_shared<nano::send_block> (send->hash (), key1.pub, nano::genesis_amount - nano::Gxrb_ratio * 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (send->hash ()));
{ {
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
store.initialize (transaction, genesis, ledger.cache); store.initialize (transaction, genesis, ledger.cache);

12
nano/core_test/confirmation_solicitor.cpp
View file

@ -19,16 +19,16 @@ TEST (confirmation_solicitor, batches)
auto & node2 = *system.add_node (node_flags); auto & node2 = *system.add_node (node_flags);
auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ()));
// Solicitor will only solicit from this representative // Solicitor will only solicit from this representative
nano::representative representative (nano::test_genesis_key.pub, nano::genesis_amount, channel1); nano::representative representative (nano::dev_genesis_key.pub, nano::genesis_amount, channel1);
std::vector<nano::representative> representatives{ representative }; std::vector<nano::representative> representatives{ representative };
nano::confirmation_solicitor solicitor (node2.network, node2.network_params.network); nano::confirmation_solicitor solicitor (node2.network, node2.network_params.network);
solicitor.prepare (representatives); solicitor.prepare (representatives);
// Ensure the representatives are correct // Ensure the representatives are correct
ASSERT_EQ (1, representatives.size ()); ASSERT_EQ (1, representatives.size ());
ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (channel1, representatives.front ().channel);
ASSERT_EQ (nano::test_genesis_key.pub, representatives.front ().account); ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account);
ASSERT_TIMELY (3s, node2.network.size () == 1); ASSERT_TIMELY (3s, node2.network.size () == 1);
auto send (std::make_shared<nano::send_block> (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (nano::genesis_hash))); auto send (std::make_shared<nano::send_block> (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash)));
send->sideband_set ({}); send->sideband_set ({});
{ {
nano::lock_guard<std::mutex> guard (node2.active.mutex); nano::lock_guard<std::mutex> guard (node2.active.mutex);
@ -62,16 +62,16 @@ TEST (confirmation_solicitor, different_hash)
auto & node2 = *system.add_node (node_flags); auto & node2 = *system.add_node (node_flags);
auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ())); auto channel1 (node2.network.udp_channels.create (node1.network.endpoint ()));
// Solicitor will only solicit from this representative // Solicitor will only solicit from this representative
nano::representative representative (nano::test_genesis_key.pub, nano::genesis_amount, channel1); nano::representative representative (nano::dev_genesis_key.pub, nano::genesis_amount, channel1);
std::vector<nano::representative> representatives{ representative }; std::vector<nano::representative> representatives{ representative };
nano::confirmation_solicitor solicitor (node2.network, node2.network_params.network); nano::confirmation_solicitor solicitor (node2.network, node2.network_params.network);
solicitor.prepare (representatives); solicitor.prepare (representatives);
// Ensure the representatives are correct // Ensure the representatives are correct
ASSERT_EQ (1, representatives.size ()); ASSERT_EQ (1, representatives.size ());
ASSERT_EQ (channel1, representatives.front ().channel); ASSERT_EQ (channel1, representatives.front ().channel);
ASSERT_EQ (nano::test_genesis_key.pub, representatives.front ().account); ASSERT_EQ (nano::dev_genesis_key.pub, representatives.front ().account);
ASSERT_TIMELY (3s, node2.network.size () == 1); ASSERT_TIMELY (3s, node2.network.size () == 1);
auto send (std::make_shared<nano::send_block> (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (nano::genesis_hash))); auto send (std::make_shared<nano::send_block> (nano::genesis_hash, nano::keypair ().pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::genesis_hash)));
send->sideband_set ({}); send->sideband_set ({});
{ {
nano::lock_guard<std::mutex> guard (node2.active.mutex); nano::lock_guard<std::mutex> guard (node2.active.mutex);

32
nano/core_test/conflicts.cpp
View file

@ -14,7 +14,7 @@ TEST (conflicts, start_stop)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send1); node1.work_generate_blocking (*send1);
ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code);
ASSERT_EQ (0, node1.active.size ()); ASSERT_EQ (0, node1.active.size ());
@ -33,12 +33,12 @@ TEST (conflicts, add_existing)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send1); node1.work_generate_blocking (*send1);
ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code);
node1.active.insert (send1); node1.active.insert (send1);
nano::keypair key2; nano::keypair key2;
auto send2 (std::make_shared<nano::send_block> (genesis.hash (), key2.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send2 (std::make_shared<nano::send_block> (genesis.hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
send2->sideband_set ({}); send2->sideband_set ({});
auto election1 = node1.active.insert (send2); auto election1 = node1.active.insert (send2);
ASSERT_EQ (1, node1.active.size ()); ASSERT_EQ (1, node1.active.size ());
@ -59,12 +59,12 @@ TEST (conflicts, add_two)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send1); node1.work_generate_blocking (*send1);
ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send1).code);
node1.active.insert (send1); node1.active.insert (send1);
nano::keypair key2; nano::keypair key2;
auto send2 (std::make_shared<nano::send_block> (send1->hash (), key2.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send2 (std::make_shared<nano::send_block> (send1->hash (), key2.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send2); node1.work_generate_blocking (*send2);
ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code); ASSERT_EQ (nano::process_result::progress, node1.process (*send2).code);
node1.active.insert (send2); node1.active.insert (send2);
@ -164,7 +164,7 @@ TEST (conflicts, reprioritize)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*send1); node1.work_generate_blocking (*send1);
auto difficulty1 (send1->difficulty ()); auto difficulty1 (send1->difficulty ());
auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (send1->work_version (), nano::block_details (nano::epoch::epoch_0, false /* unused */, false /* unused */, false /* unused */))), node1.network_params.network.publish_thresholds.epoch_1)); auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (send1->work_version (), nano::block_details (nano::epoch::epoch_0, false /* unused */, false /* unused */, false /* unused */))), node1.network_params.network.publish_thresholds.epoch_1));
@ -198,9 +198,9 @@ TEST (conflicts, dependency)
auto node1 = system.add_node (node_config); auto node1 = system.add_node (node_config);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key1; nano::keypair key1;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::xrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - nano::xrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1->work_generate_blocking (*send1); node1->work_generate_blocking (*send1);
auto state_open1 (std::make_shared<nano::state_block> (key1.pub, 0, nano::test_genesis_key.pub, nano::xrb_ratio, send1->hash (), key1.prv, key1.pub, 0)); auto state_open1 (std::make_shared<nano::state_block> (key1.pub, 0, nano::dev_genesis_key.pub, nano::xrb_ratio, send1->hash (), key1.prv, key1.pub, 0));
node1->work_generate_blocking (*state_open1); node1->work_generate_blocking (*state_open1);
ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*send1).code);
ASSERT_EQ (nano::process_result::progress, node1->process (*state_open1).code); ASSERT_EQ (nano::process_result::progress, node1->process (*state_open1).code);
@ -228,11 +228,11 @@ TEST (conflicts, adjusted_multiplier)
nano::keypair key2; nano::keypair key2;
nano::keypair key3; nano::keypair key3;
ASSERT_EQ (0, node1.active.size ()); ASSERT_EQ (0, node1.active.size ());
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - 2 * nano::xrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, nano::genesis_amount - 2 * nano::xrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
node1.process_active (send1); node1.process_active (send1);
auto send2 (std::make_shared<nano::send_block> (send1->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 3 * nano::xrb_ratio, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::send_block> (send1->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 3 * nano::xrb_ratio, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
node1.process_active (send2); node1.process_active (send2);
auto receive1 (std::make_shared<nano::receive_block> (send2->hash (), send2->hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send2->hash ()))); auto receive1 (std::make_shared<nano::receive_block> (send2->hash (), send2->hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send2->hash ())));
node1.process_active (receive1); node1.process_active (receive1);
auto open1 (std::make_shared<nano::open_block> (send1->hash (), key1.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub))); auto open1 (std::make_shared<nano::open_block> (send1->hash (), key1.pub, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)));
node1.process_active (open1); node1.process_active (open1);
@ -240,17 +240,17 @@ TEST (conflicts, adjusted_multiplier)
node1.process_active (send3); node1.process_active (send3);
auto send4 (std::make_shared<nano::state_block> (key1.pub, send3->hash (), key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (send3->hash ()))); auto send4 (std::make_shared<nano::state_block> (key1.pub, send3->hash (), key1.pub, 0, key3.pub, key1.prv, key1.pub, *system.work.generate (send3->hash ())));
node1.process_active (send4); node1.process_active (send4);
ASSERT_EQ (node1.ledger.epoch_signer (node1.ledger.epoch_link (nano::epoch::epoch_1)), nano::test_genesis_key.pub); ASSERT_EQ (node1.ledger.epoch_signer (node1.ledger.epoch_link (nano::epoch::epoch_1)), nano::dev_genesis_key.pub);
auto open_epoch1 (std::make_shared<nano::state_block> (key2.pub, 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (key2.pub))); auto open_epoch1 (std::make_shared<nano::state_block> (key2.pub, 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (key2.pub)));
node1.process_active (open_epoch1); node1.process_active (open_epoch1);
auto receive2 (std::make_shared<nano::state_block> (key2.pub, open_epoch1->hash (), 0, nano::xrb_ratio, send3->hash (), key2.prv, key2.pub, *system.work.generate (open_epoch1->hash ()))); auto receive2 (std::make_shared<nano::state_block> (key2.pub, open_epoch1->hash (), 0, nano::xrb_ratio, send3->hash (), key2.prv, key2.pub, *system.work.generate (open_epoch1->hash ())));
node1.process_active (receive2); node1.process_active (receive2);
auto open2 (std::make_shared<nano::state_block> (key3.pub, 0, key3.pub, nano::xrb_ratio, send4->hash (), key3.prv, key3.pub, *system.work.generate (key3.pub))); auto open2 (std::make_shared<nano::state_block> (key3.pub, 0, key3.pub, nano::xrb_ratio, send4->hash (), key3.prv, key3.pub, *system.work.generate (key3.pub)));
node1.process_active (open2); node1.process_active (open2);
auto change1 (std::make_shared<nano::state_block> (key3.pub, open2->hash (), nano::test_genesis_key.pub, nano::xrb_ratio, 0, key3.prv, key3.pub, *system.work.generate (open2->hash ()))); auto change1 (std::make_shared<nano::state_block> (key3.pub, open2->hash (), nano::dev_genesis_key.pub, nano::xrb_ratio, 0, key3.prv, key3.pub, *system.work.generate (open2->hash ())));
node1.process_active (change1); node1.process_active (change1);
nano::keypair key4; nano::keypair key4;
auto send5 (std::make_shared<nano::state_block> (key3.pub, change1->hash (), nano::test_genesis_key.pub, 0, key4.pub, key3.prv, key3.pub, *system.work.generate (change1->hash ()))); // Pending for open epoch block auto send5 (std::make_shared<nano::state_block> (key3.pub, change1->hash (), nano::dev_genesis_key.pub, 0, key4.pub, key3.prv, key3.pub, *system.work.generate (change1->hash ()))); // Pending for open epoch block
node1.process_active (send5); node1.process_active (send5);
nano::blocks_confirm (node1, { send1, send2, receive1, open1, send3, send4, open_epoch1, receive2, open2, change1, send5 }); nano::blocks_confirm (node1, { send1, send2, receive1, open1, send3, send4, open_epoch1, receive2, open2, change1, send5 });
ASSERT_TIMELY (3s, node1.active.size () == 11); ASSERT_TIMELY (3s, node1.active.size () == 11);
@ -279,7 +279,7 @@ TEST (conflicts, adjusted_multiplier)
ASSERT_GT (adjusted_multipliers.find (open2->hash ())->second, adjusted_multipliers.find (change1->hash ())->second); ASSERT_GT (adjusted_multipliers.find (open2->hash ())->second, adjusted_multipliers.find (change1->hash ())->second);
ASSERT_GT (adjusted_multipliers.find (change1->hash ())->second, adjusted_multipliers.find (send5->hash ())->second); ASSERT_GT (adjusted_multipliers.find (change1->hash ())->second, adjusted_multipliers.find (send5->hash ())->second);
// Independent elections can have higher difficulty than adjusted tree // Independent elections can have higher difficulty than adjusted tree
auto open_epoch2 (std::make_shared<nano::state_block> (key4.pub, 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (key4.pub, nano::difficulty::from_multiplier ((adjusted_multipliers.find (send1->hash ())->second), node1.network_params.network.publish_thresholds.base)))); auto open_epoch2 (std::make_shared<nano::state_block> (key4.pub, 0, 0, 0, node1.ledger.epoch_link (nano::epoch::epoch_1), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (key4.pub, nano::difficulty::from_multiplier ((adjusted_multipliers.find (send1->hash ())->second), node1.network_params.network.publish_thresholds.base))));
ASSERT_GT (open_epoch2->difficulty (), nano::difficulty::from_multiplier ((adjusted_multipliers.find (send1->hash ())->second), node1.network_params.network.publish_thresholds.base)); ASSERT_GT (open_epoch2->difficulty (), nano::difficulty::from_multiplier ((adjusted_multipliers.find (send1->hash ())->second), node1.network_params.network.publish_thresholds.base));
node1.process_active (open_epoch2); node1.process_active (open_epoch2);
node1.block_processor.flush (); node1.block_processor.flush ();

8
nano/core_test/core_test_main.cc
View file

@ -7,21 +7,21 @@
namespace nano namespace nano
{ {
void cleanup_test_directories_on_exit (); void cleanup_dev_directories_on_exit ();
void force_nano_test_network (); void force_nano_dev_network ();
boost::filesystem::path unique_path (); boost::filesystem::path unique_path ();
} }
GTEST_API_ int main (int argc, char ** argv) GTEST_API_ int main (int argc, char ** argv)
{ {
printf ("Running main() from core_test_main.cc\n"); printf ("Running main() from core_test_main.cc\n");
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard; nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard;
// Setting up logging so that there aren't any piped to standard output. // Setting up logging so that there aren't any piped to standard output.
nano::logging logging; nano::logging logging;
logging.init (nano::unique_path ()); logging.init (nano::unique_path ());
testing::InitGoogleTest (&argc, argv); testing::InitGoogleTest (&argc, argv);
auto res = RUN_ALL_TESTS (); auto res = RUN_ALL_TESTS ();
nano::cleanup_test_directories_on_exit (); nano::cleanup_dev_directories_on_exit ();
return res; return res;
} }

10
nano/core_test/difficulty.cpp
View file

@ -126,7 +126,7 @@ TEST (difficulty, network_constants)
nano::network_constants constants; nano::network_constants constants;
auto & full_thresholds = constants.publish_full; auto & full_thresholds = constants.publish_full;
auto & beta_thresholds = constants.publish_beta; auto & beta_thresholds = constants.publish_beta;
auto & test_thresholds = constants.publish_test; auto & dev_thresholds = constants.publish_dev;
ASSERT_NEAR (8., nano::difficulty::to_multiplier (full_thresholds.epoch_2, full_thresholds.epoch_1), 1e-10); ASSERT_NEAR (8., nano::difficulty::to_multiplier (full_thresholds.epoch_2, full_thresholds.epoch_1), 1e-10);
ASSERT_NEAR (1 / 8., nano::difficulty::to_multiplier (full_thresholds.epoch_2_receive, full_thresholds.epoch_1), 1e-10); ASSERT_NEAR (1 / 8., nano::difficulty::to_multiplier (full_thresholds.epoch_2_receive, full_thresholds.epoch_1), 1e-10);
@ -139,10 +139,10 @@ TEST (difficulty, network_constants)
ASSERT_NEAR (1., nano::difficulty::to_multiplier (beta_thresholds.epoch_2_receive, beta_thresholds.entry), 1e-10); ASSERT_NEAR (1., nano::difficulty::to_multiplier (beta_thresholds.epoch_2_receive, beta_thresholds.entry), 1e-10);
ASSERT_NEAR (1., nano::difficulty::to_multiplier (beta_thresholds.epoch_2, beta_thresholds.base), 1e-10); ASSERT_NEAR (1., nano::difficulty::to_multiplier (beta_thresholds.epoch_2, beta_thresholds.base), 1e-10);
ASSERT_NEAR (8., nano::difficulty::to_multiplier (test_thresholds.epoch_2, test_thresholds.epoch_1), 1e-10); ASSERT_NEAR (8., nano::difficulty::to_multiplier (dev_thresholds.epoch_2, dev_thresholds.epoch_1), 1e-10);
ASSERT_NEAR (1 / 8., nano::difficulty::to_multiplier (test_thresholds.epoch_2_receive, test_thresholds.epoch_1), 1e-10); ASSERT_NEAR (1 / 8., nano::difficulty::to_multiplier (dev_thresholds.epoch_2_receive, dev_thresholds.epoch_1), 1e-10);
ASSERT_NEAR (1., nano::difficulty::to_multiplier (test_thresholds.epoch_2_receive, test_thresholds.entry), 1e-10); ASSERT_NEAR (1., nano::difficulty::to_multiplier (dev_thresholds.epoch_2_receive, dev_thresholds.entry), 1e-10);
ASSERT_NEAR (1., nano::difficulty::to_multiplier (test_thresholds.epoch_2, test_thresholds.base), 1e-10); ASSERT_NEAR (1., nano::difficulty::to_multiplier (dev_thresholds.epoch_2, dev_thresholds.base), 1e-10);
nano::work_version version{ nano::work_version::work_1 }; nano::work_version version{ nano::work_version::work_1 };
ASSERT_EQ (constants.publish_thresholds.base, constants.publish_thresholds.epoch_2); ASSERT_EQ (constants.publish_thresholds.base, constants.publish_thresholds.epoch_2);

16
nano/core_test/election.cpp
View file

@ -28,7 +28,7 @@ TEST (election, bisect_dependencies)
auto & node = *system.add_node (flags); auto & node = *system.add_node (flags);
nano::genesis genesis; nano::genesis genesis;
nano::confirmation_height_info conf_info; nano::confirmation_height_info conf_info;
ASSERT_FALSE (node.store.confirmation_height_get (node.store.tx_begin_read (), nano::test_genesis_key.pub, conf_info)); ASSERT_FALSE (node.store.confirmation_height_get (node.store.tx_begin_read (), nano::dev_genesis_key.pub, conf_info));
ASSERT_EQ (1, conf_info.height); ASSERT_EQ (1, conf_info.height);
std::vector<std::shared_ptr<nano::block>> blocks; std::vector<std::shared_ptr<nano::block>> blocks;
blocks.push_back (nullptr); // idx == height blocks.push_back (nullptr); // idx == height
@ -40,11 +40,11 @@ TEST (election, bisect_dependencies)
auto latest = blocks.back (); auto latest = blocks.back ();
blocks.push_back (builder.state () blocks.push_back (builder.state ()
.previous (latest->hash ()) .previous (latest->hash ())
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (--amount) .balance (--amount)
.link (nano::test_genesis_key.pub) .link (nano::dev_genesis_key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (latest->hash ())) .work (*system.work.generate (latest->hash ()))
.build ()); .build ());
ASSERT_EQ (nano::process_result::progress, node.process (*blocks.back ()).code); ASSERT_EQ (nano::process_result::progress, node.process (*blocks.back ()).code);
@ -109,12 +109,12 @@ TEST (election, dependencies_open_link)
// Send to key // Send to key
auto gen_send = builder.make_block () auto gen_send = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.link (key.pub) .link (key.pub)
.balance (nano::genesis_amount - 1) .balance (nano::genesis_amount - 1)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build (); .build ();
// Receive from genesis // Receive from genesis

12
nano/core_test/gap_cache.cpp
View file

@ -65,9 +65,9 @@ TEST (gap_cache, gap_bootstrap)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
auto & node2 (*system.nodes[1]); auto & node2 (*system.nodes[1]);
nano::block_hash latest (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest (node1.latest (nano::dev_genesis_key.pub));
nano::keypair key; nano::keypair key;
auto send (std::make_shared<nano::send_block> (latest, key.pub, nano::genesis_amount - 100, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest))); auto send (std::make_shared<nano::send_block> (latest, key.pub, nano::genesis_amount - 100, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest)));
node1.process (*send); node1.process (*send);
ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::genesis_account)); ASSERT_EQ (nano::genesis_amount - 100, node1.balance (nano::genesis_account));
ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account)); ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account));
@ -81,8 +81,8 @@ TEST (gap_cache, gap_bootstrap)
} }
ASSERT_TIMELY (2s, node1.block_confirmed (send->hash ())); ASSERT_TIMELY (2s, node1.block_confirmed (send->hash ()));
node1.active.erase (*send); node1.active.erase (*send);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto latest_block (system.wallet (0)->send_action (nano::test_genesis_key.pub, key.pub, 100)); auto latest_block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_NE (nullptr, latest_block); ASSERT_NE (nullptr, latest_block);
ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::genesis_account)); ASSERT_EQ (nano::genesis_amount - 200, node1.balance (nano::genesis_account));
ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account)); ASSERT_EQ (nano::genesis_amount, node2.balance (nano::genesis_account));
@ -95,8 +95,8 @@ TEST (gap_cache, two_dependencies)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::keypair key; nano::keypair key;
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key.pub, 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key.pub, 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
auto send2 (std::make_shared<nano::send_block> (send1->hash (), key.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1->hash ()))); auto send2 (std::make_shared<nano::send_block> (send1->hash (), key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1->hash ())));
auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::open_block> (send1->hash (), key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)));
ASSERT_EQ (0, node1.gap_cache.size ()); ASSERT_EQ (0, node1.gap_cache.size ());
node1.block_processor.add (send2, nano::seconds_since_epoch ()); node1.block_processor.add (send2, nano::seconds_since_epoch ());

586
nano/core_test/ledger.cpp
View file

File diff suppressed because it is too large Load diff

12
nano/core_test/message_parser.cpp
View file

@ -5,7 +5,7 @@
namespace namespace
{ {
class test_visitor : public nano::message_visitor class dev_visitor : public nano::message_visitor
{ {
public: public:
void keepalive (nano::keepalive const &) override void keepalive (nano::keepalive const &) override
@ -63,7 +63,7 @@ public:
TEST (message_parser, exact_confirm_ack_size) TEST (message_parser, exact_confirm_ack_size)
{ {
nano::system system (1); nano::system system (1);
test_visitor visitor; dev_visitor visitor;
nano::network_filter filter (1); nano::network_filter filter (1);
nano::block_uniquer block_uniquer; nano::block_uniquer block_uniquer;
nano::vote_uniquer vote_uniquer (block_uniquer); nano::vote_uniquer vote_uniquer (block_uniquer);
@ -97,7 +97,7 @@ TEST (message_parser, exact_confirm_ack_size)
TEST (message_parser, exact_confirm_req_size) TEST (message_parser, exact_confirm_req_size)
{ {
nano::system system (1); nano::system system (1);
test_visitor visitor; dev_visitor visitor;
nano::network_filter filter (1); nano::network_filter filter (1);
nano::block_uniquer block_uniquer; nano::block_uniquer block_uniquer;
nano::vote_uniquer vote_uniquer (block_uniquer); nano::vote_uniquer vote_uniquer (block_uniquer);
@ -130,7 +130,7 @@ TEST (message_parser, exact_confirm_req_size)
TEST (message_parser, exact_confirm_req_hash_size) TEST (message_parser, exact_confirm_req_hash_size)
{ {
nano::system system (1); nano::system system (1);
test_visitor visitor; dev_visitor visitor;
nano::network_filter filter (1); nano::network_filter filter (1);
nano::block_uniquer block_uniquer; nano::block_uniquer block_uniquer;
nano::vote_uniquer vote_uniquer (block_uniquer); nano::vote_uniquer vote_uniquer (block_uniquer);
@ -163,7 +163,7 @@ TEST (message_parser, exact_confirm_req_hash_size)
TEST (message_parser, exact_publish_size) TEST (message_parser, exact_publish_size)
{ {
nano::system system (1); nano::system system (1);
test_visitor visitor; dev_visitor visitor;
nano::network_filter filter (1); nano::network_filter filter (1);
nano::block_uniquer block_uniquer; nano::block_uniquer block_uniquer;
nano::vote_uniquer vote_uniquer (block_uniquer); nano::vote_uniquer vote_uniquer (block_uniquer);
@ -196,7 +196,7 @@ TEST (message_parser, exact_publish_size)
TEST (message_parser, exact_keepalive_size) TEST (message_parser, exact_keepalive_size)
{ {
nano::system system (1); nano::system system (1);
test_visitor visitor; dev_visitor visitor;
nano::network_filter filter (1); nano::network_filter filter (1);
nano::block_uniquer block_uniquer; nano::block_uniquer block_uniquer;
nano::vote_uniquer vote_uniquer (block_uniquer); nano::vote_uniquer vote_uniquer (block_uniquer);

72
nano/core_test/network.cpp
View file

@ -200,13 +200,13 @@ TEST (network, send_discarded_publish)
{ {
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
node1.network.flood_block (block); node1.network.flood_block (block);
ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub));
ASSERT_EQ (genesis.hash (), node2.latest (nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub));
} }
ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0);
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub));
ASSERT_EQ (genesis.hash (), node2.latest (nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub));
} }
TEST (network, send_invalid_publish) TEST (network, send_invalid_publish)
@ -215,17 +215,17 @@ TEST (network, send_invalid_publish)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
auto & node2 (*system.nodes[1]); auto & node2 (*system.nodes[1]);
nano::genesis genesis; nano::genesis genesis;
auto block (std::make_shared<nano::send_block> (1, 1, 20, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (nano::root (1)))); auto block (std::make_shared<nano::send_block> (1, 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (nano::root (1))));
{ {
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
node1.network.flood_block (block); node1.network.flood_block (block);
ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub));
ASSERT_EQ (genesis.hash (), node2.latest (nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub));
} }
ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); ASSERT_TIMELY (10s, node2.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0);
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node1.ledger.latest (transaction, nano::dev_genesis_key.pub));
ASSERT_EQ (genesis.hash (), node2.latest (nano::test_genesis_key.pub)); ASSERT_EQ (genesis.hash (), node2.latest (nano::dev_genesis_key.pub));
} }
TEST (network, send_valid_confirm_ack) TEST (network, send_valid_confirm_ack)
@ -244,16 +244,16 @@ TEST (network, send_valid_confirm_ack)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
auto & node2 (*system.nodes[1]); auto & node2 (*system.nodes[1]);
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (1)->insert_adhoc (key2.prv); system.wallet (1)->insert_adhoc (key2.prv);
nano::block_hash latest1 (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub));
nano::send_block block2 (latest1, key2.pub, 50, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1)); nano::send_block block2 (latest1, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1));
nano::block_hash latest2 (node2.latest (nano::test_genesis_key.pub)); nano::block_hash latest2 (node2.latest (nano::dev_genesis_key.pub));
node1.process_active (std::make_shared<nano::send_block> (block2)); node1.process_active (std::make_shared<nano::send_block> (block2));
// Keep polling until latest block changes // Keep polling until latest block changes
ASSERT_TIMELY (10s, node2.latest (nano::test_genesis_key.pub) != latest2); ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) != latest2);
// Make sure the balance has decreased after processing the block. // Make sure the balance has decreased after processing the block.
ASSERT_EQ (50, node2.balance (nano::test_genesis_key.pub)); ASSERT_EQ (50, node2.balance (nano::dev_genesis_key.pub));
} }
} }
@ -274,18 +274,18 @@ TEST (network, send_valid_publish)
auto & node2 (*system.nodes[1]); auto & node2 (*system.nodes[1]);
node1.bootstrap_initiator.stop (); node1.bootstrap_initiator.stop ();
node2.bootstrap_initiator.stop (); node2.bootstrap_initiator.stop ();
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
system.wallet (1)->insert_adhoc (key2.prv); system.wallet (1)->insert_adhoc (key2.prv);
nano::block_hash latest1 (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub));
nano::send_block block2 (latest1, key2.pub, 50, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1)); nano::send_block block2 (latest1, key2.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1));
auto hash2 (block2.hash ()); auto hash2 (block2.hash ());
nano::block_hash latest2 (node2.latest (nano::test_genesis_key.pub)); nano::block_hash latest2 (node2.latest (nano::dev_genesis_key.pub));
node2.process_active (std::make_shared<nano::send_block> (block2)); node2.process_active (std::make_shared<nano::send_block> (block2));
ASSERT_TIMELY (10s, node1.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0); ASSERT_TIMELY (10s, node1.stats.count (nano::stat::type::message, nano::stat::detail::publish, nano::stat::dir::in) != 0);
ASSERT_NE (hash2, latest2); ASSERT_NE (hash2, latest2);
ASSERT_TIMELY (10s, node2.latest (nano::test_genesis_key.pub) != latest2); ASSERT_TIMELY (10s, node2.latest (nano::dev_genesis_key.pub) != latest2);
ASSERT_EQ (50, node2.balance (nano::test_genesis_key.pub)); ASSERT_EQ (50, node2.balance (nano::dev_genesis_key.pub));
} }
} }
@ -296,7 +296,7 @@ TEST (network, send_insufficient_work)
node_flags.disable_udp = false; node_flags.disable_udp = false;
auto & node1 = *system.add_node (node_flags); auto & node1 = *system.add_node (node_flags);
auto & node2 = *system.add_node (node_flags); auto & node2 = *system.add_node (node_flags);
auto block (std::make_shared<nano::send_block> (0, 1, 20, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block (std::make_shared<nano::send_block> (0, 1, 20, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
nano::publish publish (block); nano::publish publish (block);
nano::transport::channel_udp channel (node1.network.udp_channels, node2.network.endpoint (), node1.network_params.protocol.protocol_version); nano::transport::channel_udp channel (node1.network.udp_channels, node2.network.endpoint (), node1.network_params.protocol.protocol_version);
channel.send (publish, [](boost::system::error_code const & ec, size_t size) {}); channel.send (publish, [](boost::system::error_code const & ec, size_t size) {});
@ -310,7 +310,7 @@ TEST (receivable_processor, confirm_insufficient_pos)
nano::system system (1); nano::system system (1);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
auto block1 (std::make_shared<nano::send_block> (genesis.hash (), 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block1 (std::make_shared<nano::send_block> (genesis.hash (), 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*block1); node1.work_generate_blocking (*block1);
ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code);
node1.active.insert (block1); node1.active.insert (block1);
@ -325,11 +325,11 @@ TEST (receivable_processor, confirm_sufficient_pos)
nano::system system (1); nano::system system (1);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
auto block1 (std::make_shared<nano::send_block> (genesis.hash (), 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block1 (std::make_shared<nano::send_block> (genesis.hash (), 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
node1.work_generate_blocking (*block1); node1.work_generate_blocking (*block1);
ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code); ASSERT_EQ (nano::process_result::progress, node1.process (*block1).code);
node1.active.insert (block1); node1.active.insert (block1);
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, block1)); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, block1));
nano::confirm_ack con1 (vote); nano::confirm_ack con1 (vote);
node1.network.process_message (con1, node1.network.udp_channels.create (node1.network.endpoint ())); node1.network.process_message (con1, node1.network.udp_channels.create (node1.network.endpoint ()));
} }
@ -351,26 +351,26 @@ TEST (receivable_processor, send_with_receive)
auto & node2 (*system.nodes[1]); auto & node2 (*system.nodes[1]);
auto amount (std::numeric_limits<nano::uint128_t>::max ()); auto amount (std::numeric_limits<nano::uint128_t>::max ());
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash latest1 (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub));
system.wallet (1)->insert_adhoc (key2.prv); system.wallet (1)->insert_adhoc (key2.prv);
auto block1 (std::make_shared<nano::send_block> (latest1, key2.pub, amount - node1.config.receive_minimum.number (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest1))); auto block1 (std::make_shared<nano::send_block> (latest1, key2.pub, amount - node1.config.receive_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest1)));
ASSERT_EQ (amount, node1.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount, node1.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node1.balance (key2.pub)); ASSERT_EQ (0, node1.balance (key2.pub));
ASSERT_EQ (amount, node2.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount, node2.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node2.balance (key2.pub)); ASSERT_EQ (0, node2.balance (key2.pub));
node1.process_active (block1); node1.process_active (block1);
node1.block_processor.flush (); node1.block_processor.flush ();
node2.process_active (block1); node2.process_active (block1);
node2.block_processor.flush (); node2.block_processor.flush ();
ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node1.balance (key2.pub)); ASSERT_EQ (0, node1.balance (key2.pub));
ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (0, node2.balance (key2.pub)); ASSERT_EQ (0, node2.balance (key2.pub));
ASSERT_TIMELY (10s, node1.balance (key2.pub) == node1.config.receive_minimum.number () && node2.balance (key2.pub) == node1.config.receive_minimum.number ()); ASSERT_TIMELY (10s, node1.balance (key2.pub) == node1.config.receive_minimum.number () && node2.balance (key2.pub) == node1.config.receive_minimum.number ());
ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount - node1.config.receive_minimum.number (), node1.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (node1.config.receive_minimum.number (), node1.balance (key2.pub)); ASSERT_EQ (node1.config.receive_minimum.number (), node1.balance (key2.pub));
ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::test_genesis_key.pub)); ASSERT_EQ (amount - node1.config.receive_minimum.number (), node2.balance (nano::dev_genesis_key.pub));
ASSERT_EQ (node1.config.receive_minimum.number (), node2.balance (key2.pub)); ASSERT_EQ (node1.config.receive_minimum.number (), node2.balance (key2.pub));
} }
} }
@ -378,14 +378,14 @@ TEST (receivable_processor, send_with_receive)
TEST (network, receive_weight_change) TEST (network, receive_weight_change)
{ {
nano::system system (2); nano::system system (2);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
system.wallet (1)->insert_adhoc (key2.prv); system.wallet (1)->insert_adhoc (key2.prv);
{ {
auto transaction (system.nodes[1]->wallets.tx_begin_write ()); auto transaction (system.nodes[1]->wallets.tx_begin_write ());
system.wallet (1)->store.representative_set (transaction, key2.pub); system.wallet (1)->store.representative_set (transaction, key2.pub);
} }
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, system.nodes[0]->config.receive_minimum.number ()));
ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&](std::shared_ptr<nano::node> const & node_a) { return node_a->weight (key2.pub) == system.nodes[0]->config.receive_minimum.number (); })); ASSERT_TIMELY (10s, std::all_of (system.nodes.begin (), system.nodes.end (), [&](std::shared_ptr<nano::node> const & node_a) { return node_a->weight (key2.pub) == system.nodes[0]->config.receive_minimum.number (); }));
} }

4
nano/core_test/network_filter.cpp
View file

@ -37,7 +37,7 @@ TEST (network_filter, unit)
{ {
one_block (genesis.open, true); one_block (genesis.open, true);
} }
auto new_block (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.open->hash (), nano::test_genesis_key.pub, nano::genesis_amount - 10 * nano::xrb_ratio, nano::public_key (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto new_block (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.open->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 10 * nano::xrb_ratio, nano::public_key (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
one_block (new_block, false); one_block (new_block, false);
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
@ -57,7 +57,7 @@ TEST (network_filter, many)
nano::keypair key1; nano::keypair key1;
for (int i = 0; i < 100; ++i) for (int i = 0; i < 100; ++i)
{ {
auto block (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.open->hash (), nano::test_genesis_key.pub, nano::genesis_amount - i * 10 * nano::xrb_ratio, key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.open->hash (), nano::dev_genesis_key.pub, nano::genesis_amount - i * 10 * nano::xrb_ratio, key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
nano::publish message (block); nano::publish message (block);
auto bytes (message.to_bytes (false)); auto bytes (message.to_bytes (false));

690
nano/core_test/node.cpp
View file

File diff suppressed because it is too large Load diff

12
nano/core_test/processor_service.cpp
View file

@ -25,9 +25,9 @@ TEST (processor_service, bad_send_signature)
store->initialize (transaction, genesis, ledger.cache); store->initialize (transaction, genesis, ledger.cache);
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::account_info info1; nano::account_info info1;
ASSERT_FALSE (store->account_get (transaction, nano::test_genesis_key.pub, info1)); ASSERT_FALSE (store->account_get (transaction, nano::dev_genesis_key.pub, info1));
nano::keypair key2; nano::keypair key2;
nano::send_block send (info1.head, nano::test_genesis_key.pub, 50, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (info1.head)); nano::send_block send (info1.head, nano::dev_genesis_key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head));
send.signature.bytes[32] ^= 0x1; send.signature.bytes[32] ^= 0x1;
ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, send).code);
} }
@ -44,13 +44,13 @@ TEST (processor_service, bad_receive_signature)
store->initialize (transaction, genesis, ledger.cache); store->initialize (transaction, genesis, ledger.cache);
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::account_info info1; nano::account_info info1;
ASSERT_FALSE (store->account_get (transaction, nano::test_genesis_key.pub, info1)); ASSERT_FALSE (store->account_get (transaction, nano::dev_genesis_key.pub, info1));
nano::send_block send (info1.head, nano::test_genesis_key.pub, 50, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (info1.head)); nano::send_block send (info1.head, nano::dev_genesis_key.pub, 50, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (info1.head));
nano::block_hash hash1 (send.hash ()); nano::block_hash hash1 (send.hash ());
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
nano::account_info info2; nano::account_info info2;
ASSERT_FALSE (store->account_get (transaction, nano::test_genesis_key.pub, info2)); ASSERT_FALSE (store->account_get (transaction, nano::dev_genesis_key.pub, info2));
nano::receive_block receive (hash1, hash1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (hash1)); nano::receive_block receive (hash1, hash1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (hash1));
receive.signature.bytes[32] ^= 0x1; receive.signature.bytes[32] ^= 0x1;
ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, receive).code); ASSERT_EQ (nano::process_result::bad_signature, ledger.process (transaction, receive).code);
} }

54
nano/core_test/request_aggregator.cpp
View file

@ -14,8 +14,8 @@ TEST (request_aggregator, one)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
auto channel (node.network.udp_channels.create (node.network.endpoint ())); auto channel (node.network.udp_channels.create (node.network.endpoint ()));
@ -50,8 +50,8 @@ TEST (request_aggregator, one_update)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (genesis.hash (), genesis.open->root ()); request.emplace_back (genesis.hash (), genesis.open->root ());
auto channel (node.network.udp_channels.create (node.network.endpoint ())); auto channel (node.network.udp_channels.create (node.network.endpoint ()));
@ -83,8 +83,8 @@ TEST (request_aggregator, two)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (genesis.hash (), genesis.open->root ()); request.emplace_back (genesis.hash (), genesis.open->root ());
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
@ -128,8 +128,8 @@ TEST (request_aggregator, two_endpoints)
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
auto & node2 (*system.add_node (node_config, node_flags)); auto & node2 (*system.add_node (node_config, node_flags));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node1.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node1.work_generate_blocking (genesis.hash ())));
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
ASSERT_EQ (nano::process_result::progress, node1.ledger.process (node1.store.tx_begin_write (), *send1).code); ASSERT_EQ (nano::process_result::progress, node1.ledger.process (node1.store.tx_begin_write (), *send1).code);
@ -160,7 +160,7 @@ TEST (request_aggregator, split)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
std::vector<std::shared_ptr<nano::block>> blocks; std::vector<std::shared_ptr<nano::block>> blocks;
auto previous = genesis.hash (); auto previous = genesis.hash ();
@ -170,12 +170,12 @@ TEST (request_aggregator, split)
nano::block_builder builder; nano::block_builder builder;
blocks.push_back (builder blocks.push_back (builder
.state () .state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (previous) .previous (previous)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - (i + 1)) .balance (nano::genesis_amount - (i + 1))
.link (nano::test_genesis_key.pub) .link (nano::dev_genesis_key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (previous)) .work (*system.work.generate (previous))
.build ()); .build ());
auto const & block = blocks.back (); auto const & block = blocks.back ();
@ -217,8 +217,8 @@ TEST (request_aggregator, channel_lifetime)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code);
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
@ -238,8 +238,8 @@ TEST (request_aggregator, channel_update)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code);
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
@ -267,8 +267,8 @@ TEST (request_aggregator, channel_max_queue)
node_config.max_queued_requests = 1; node_config.max_queued_requests = 1;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code);
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
@ -285,8 +285,8 @@ TEST (request_aggregator, unique)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto & node (*system.add_node (node_config)); auto & node (*system.add_node (node_config));
nano::genesis genesis; nano::genesis genesis;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *node.work_generate_blocking (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *node.work_generate_blocking (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code); ASSERT_EQ (nano::process_result::progress, node.ledger.process (node.store.tx_begin_write (), *send1).code);
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;
request.emplace_back (send1->hash (), send1->root ()); request.emplace_back (send1->hash (), send1->root ());
@ -308,24 +308,24 @@ TEST (request_aggregator, cannot_vote)
nano::genesis genesis; nano::genesis genesis;
nano::state_block_builder builder; nano::state_block_builder builder;
auto send1 = builder.make_block () auto send1 = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.balance (nano::genesis_amount - 1) .balance (nano::genesis_amount - 1)
.link (nano::test_genesis_key.pub) .link (nano::dev_genesis_key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build_shared (); .build_shared ();
auto send2 = builder.make_block () auto send2 = builder.make_block ()
.from (*send1) .from (*send1)
.previous (send1->hash ()) .previous (send1->hash ())
.balance (send1->balance ().number () - 1) .balance (send1->balance ().number () - 1)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send1->hash ())) .work (*system.work.generate (send1->hash ()))
.build_shared (); .build_shared ();
ASSERT_EQ (nano::process_result::progress, node.process (*send1).code); 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 (*send2).code);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
ASSERT_FALSE (node.ledger.can_vote (node.store.tx_begin_read (), *send2)); ASSERT_FALSE (node.ledger.can_vote (node.store.tx_begin_read (), *send2));
std::vector<std::pair<nano::block_hash, nano::root>> request; std::vector<std::pair<nano::block_hash, nano::root>> request;

6
nano/core_test/telemetry.cpp
View file

@ -252,7 +252,7 @@ TEST (telemetry, basic)
} }
// Wait the cache period and check cache is not used // Wait the cache period and check cache is not used
std::this_thread::sleep_for (nano::telemetry_cache_cutoffs::test); std::this_thread::sleep_for (nano::telemetry_cache_cutoffs::dev);
std::atomic<bool> done{ false }; std::atomic<bool> done{ false };
node_client->telemetry->get_metrics_single_peer_async (channel, [&done, &telemetry_data](nano::telemetry_data_response const & response_a) { node_client->telemetry->get_metrics_single_peer_async (channel, [&done, &telemetry_data](nano::telemetry_data_response const & response_a) {
@ -412,7 +412,7 @@ TEST (telemetry, dos_tcp)
}); });
} }
ASSERT_TIMELY (10s, (nano::telemetry_cache_cutoffs::test + orig) <= std::chrono::steady_clock::now ()); ASSERT_TIMELY (10s, (nano::telemetry_cache_cutoffs::dev + orig) <= std::chrono::steady_clock::now ());
// Should process no more telemetry_req messages // Should process no more telemetry_req messages
ASSERT_EQ (1, node_server->stats.count (nano::stat::type::message, nano::stat::detail::telemetry_req, nano::stat::dir::in)); ASSERT_EQ (1, node_server->stats.count (nano::stat::type::message, nano::stat::detail::telemetry_req, nano::stat::dir::in));
@ -455,7 +455,7 @@ TEST (telemetry, dos_udp)
}); });
} }
ASSERT_TIMELY (20s, (nano::telemetry_cache_cutoffs::test + orig) <= std::chrono::steady_clock::now ()); ASSERT_TIMELY (20s, (nano::telemetry_cache_cutoffs::dev + orig) <= std::chrono::steady_clock::now ());
// Should process no more telemetry_req messages // Should process no more telemetry_req messages
ASSERT_EQ (1, node_server->stats.count (nano::stat::type::message, nano::stat::detail::telemetry_req, nano::stat::dir::in)); ASSERT_EQ (1, node_server->stats.count (nano::stat::type::message, nano::stat::detail::telemetry_req, nano::stat::dir::in));

26
nano/core_test/toml.cpp
View file

@ -70,10 +70,10 @@ TEST (toml, daemon_config_update_array)
nano::tomlconfig t; nano::tomlconfig t;
boost::filesystem::path data_path ("."); boost::filesystem::path data_path (".");
nano::daemon_config c (data_path); nano::daemon_config c (data_path);
c.node.preconfigured_peers.push_back ("test-peer.org"); c.node.preconfigured_peers.push_back ("dev-peer.org");
c.serialize_toml (t); c.serialize_toml (t);
c.deserialize_toml (t); c.deserialize_toml (t);
ASSERT_EQ (c.node.preconfigured_peers[0], "test-peer.org"); ASSERT_EQ (c.node.preconfigured_peers[0], "dev-peer.org");
} }
/** Empty rpc config file should match a default config object */ /** Empty rpc config file should match a default config object */
@ -81,7 +81,7 @@ TEST (toml, rpc_config_deserialize_defaults)
{ {
std::stringstream ss; std::stringstream ss;
// A config file with values that differs from test-net defaults // A config file with values that differs from devnet defaults
ss << R"toml( ss << R"toml(
[process] [process]
)toml"; )toml";
@ -407,7 +407,7 @@ TEST (toml, daemon_config_deserialize_no_defaults)
password_fanout = 999 password_fanout = 999
peering_port = 999 peering_port = 999
pow_sleep_interval= 999 pow_sleep_interval= 999
preconfigured_peers = ["test.org"] preconfigured_peers = ["dev.org"]
preconfigured_representatives = ["nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4"] preconfigured_representatives = ["nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4"]
receive_minimum = "999" receive_minimum = "999"
signature_checker_threads = 999 signature_checker_threads = 999
@ -418,7 +418,7 @@ TEST (toml, daemon_config_deserialize_no_defaults)
vote_generator_delay = 999 vote_generator_delay = 999
vote_generator_threshold = 9 vote_generator_threshold = 9
vote_minimum = "999" vote_minimum = "999"
work_peers = ["test.org:999"] work_peers = ["dev.org:999"]
work_threads = 999 work_threads = 999
work_watcher_period = 999 work_watcher_period = 999
max_work_generate_multiplier = 1.0 max_work_generate_multiplier = 1.0
@ -431,16 +431,16 @@ TEST (toml, daemon_config_deserialize_no_defaults)
min_write_txn_time = 999 min_write_txn_time = 999
[node.httpcallback] [node.httpcallback]
address = "test.org" address = "dev.org"
port = 999 port = 999
target = "/test" target = "/dev"
[node.ipc.local] [node.ipc.local]
allow_unsafe = true allow_unsafe = true
enable = true enable = true
io_timeout = 999 io_timeout = 999
io_threads = 999 io_threads = 999
path = "/tmp/test" path = "/tmp/dev"
[node.ipc.tcp] [node.ipc.tcp]
enable = true enable = true
@ -482,8 +482,8 @@ TEST (toml, daemon_config_deserialize_no_defaults)
work_generation_time = false work_generation_time = false
[node.statistics.log] [node.statistics.log]
filename_counters = "testcounters.stat" filename_counters = "devcounters.stat"
filename_samples = "testsamples.stat" filename_samples = "devsamples.stat"
headers = false headers = false
interval_counters = 999 interval_counters = 999
interval_samples = 999 interval_samples = 999
@ -510,7 +510,7 @@ TEST (toml, daemon_config_deserialize_no_defaults)
io_threads = 99 io_threads = 99
[node.experimental] [node.experimental]
secondary_work_peers = ["test.org:998"] secondary_work_peers = ["dev.org:998"]
[opencl] [opencl]
device = 999 device = 999
@ -524,7 +524,7 @@ TEST (toml, daemon_config_deserialize_no_defaults)
[rpc.child_process] [rpc.child_process]
enable = true enable = true
rpc_path = "/test/nano_rpc" rpc_path = "/dev/nano_rpc"
)toml"; )toml";
nano::tomlconfig toml; nano::tomlconfig toml;
@ -694,7 +694,7 @@ TEST (toml, rpc_config_deserialize_no_defaults)
{ {
std::stringstream ss; std::stringstream ss;
// A config file with values that differs from test-net defaults // A config file with values that differs from devnet defaults
ss << R"toml( ss << R"toml(
address = "0:0:0:0:0:ffff:7f01:101" address = "0:0:0:0:0:ffff:7f01:101"
enable_control = true enable_control = true

4
nano/core_test/uint256_union.cpp
View file

@ -375,9 +375,9 @@ TEST (uint256_union, decode_nano_variant)
TEST (uint256_union, account_transcode) TEST (uint256_union, account_transcode)
{ {
nano::account value; nano::account value;
auto text (nano::test_genesis_key.pub.to_account ()); auto text (nano::dev_genesis_key.pub.to_account ());
ASSERT_FALSE (value.decode_account (text)); ASSERT_FALSE (value.decode_account (text));
ASSERT_EQ (nano::test_genesis_key.pub, value); ASSERT_EQ (nano::dev_genesis_key.pub, value);
/* /*
* Handle different offsets for the underscore separator * Handle different offsets for the underscore separator

60
nano/core_test/vote_processor.cpp
View file

@ -54,7 +54,7 @@ TEST (vote_processor, flush)
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
nano::genesis genesis; nano::genesis genesis;
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 1, std::vector<nano::block_hash>{ genesis.open->hash () })); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 1, std::vector<nano::block_hash>{ genesis.open->hash () }));
auto channel (std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version)); auto channel (std::make_shared<nano::transport::channel_udp> (node.network.udp_channels, node.network.endpoint (), node.network_params.protocol.protocol_version));
for (unsigned i = 0; i < 2000; ++i) for (unsigned i = 0; i < 2000; ++i)
{ {
@ -146,16 +146,16 @@ TEST (vote_processor, weights)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (1)->insert_adhoc (key0.prv); system.wallet (1)->insert_adhoc (key0.prv);
system.wallet (2)->insert_adhoc (key1.prv); system.wallet (2)->insert_adhoc (key1.prv);
system.wallet (3)->insert_adhoc (key2.prv); system.wallet (3)->insert_adhoc (key2.prv);
system.wallet (1)->store.representative_set (system.nodes[1]->wallets.tx_begin_write (), key0.pub); system.wallet (1)->store.representative_set (system.nodes[1]->wallets.tx_begin_write (), key0.pub);
system.wallet (2)->store.representative_set (system.nodes[2]->wallets.tx_begin_write (), key1.pub); system.wallet (2)->store.representative_set (system.nodes[2]->wallets.tx_begin_write (), key1.pub);
system.wallet (3)->store.representative_set (system.nodes[3]->wallets.tx_begin_write (), key2.pub); system.wallet (3)->store.representative_set (system.nodes[3]->wallets.tx_begin_write (), key2.pub);
system.wallet (0)->send_sync (nano::test_genesis_key.pub, key0.pub, level0); system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key0.pub, level0);
system.wallet (0)->send_sync (nano::test_genesis_key.pub, key1.pub, level1); system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key1.pub, level1);
system.wallet (0)->send_sync (nano::test_genesis_key.pub, key2.pub, level2); system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key2.pub, level2);
// Wait for representatives // Wait for representatives
ASSERT_TIMELY (10s, node.ledger.cache.rep_weights.get_rep_amounts ().size () == 4); ASSERT_TIMELY (10s, node.ledger.cache.rep_weights.get_rep_amounts ().size () == 4);
@ -173,9 +173,9 @@ TEST (vote_processor, weights)
ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (key2.pub)); ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (key2.pub));
ASSERT_EQ (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (key2.pub)); ASSERT_EQ (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (key2.pub));
ASSERT_NE (node.vote_processor.representatives_1.end (), node.vote_processor.representatives_1.find (nano::test_genesis_key.pub)); ASSERT_NE (node.vote_processor.representatives_1.end (), node.vote_processor.representatives_1.find (nano::dev_genesis_key.pub));
ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (nano::test_genesis_key.pub)); ASSERT_NE (node.vote_processor.representatives_2.end (), node.vote_processor.representatives_2.find (nano::dev_genesis_key.pub));
ASSERT_NE (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (nano::test_genesis_key.pub)); ASSERT_NE (node.vote_processor.representatives_3.end (), node.vote_processor.representatives_3.find (nano::dev_genesis_key.pub));
} }
} }
@ -191,29 +191,29 @@ TEST (vote_processor, no_broadcast_local)
// Reduce the weight of genesis to 2x default min voting weight // Reduce the weight of genesis to 2x default min voting weight
nano::keypair key; nano::keypair key;
std::shared_ptr<nano::block> send = builder.state () std::shared_ptr<nano::block> send = builder.state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.previous (nano::genesis_hash) .previous (nano::genesis_hash)
.balance (2 * node.config.vote_minimum.number ()) .balance (2 * node.config.vote_minimum.number ())
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::genesis_hash)) .work (*system.work.generate (nano::genesis_hash))
.build (ec); .build (ec);
ASSERT_FALSE (ec); ASSERT_FALSE (ec);
ASSERT_EQ (nano::process_result::progress, node.process_local (send).code); ASSERT_EQ (nano::process_result::progress, node.process_local (send).code);
ASSERT_EQ (2 * node.config.vote_minimum.number (), node.weight (nano::test_genesis_key.pub)); ASSERT_EQ (2 * node.config.vote_minimum.number (), node.weight (nano::dev_genesis_key.pub));
// Insert account in wallet // Insert account in wallet
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node.wallets.compute_reps (); node.wallets.compute_reps ();
ASSERT_TRUE (node.wallets.reps ().exists (nano::test_genesis_key.pub)); ASSERT_TRUE (node.wallets.reps ().exists (nano::dev_genesis_key.pub));
ASSERT_FALSE (node.wallets.reps ().have_half_rep ()); ASSERT_FALSE (node.wallets.reps ().have_half_rep ());
// Process a vote // Process a vote
auto vote (node.store.vote_generate (node.store.tx_begin_read (), nano::test_genesis_key.pub, nano::test_genesis_key.prv, { send->hash () })); auto vote (node.store.vote_generate (node.store.tx_begin_read (), nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, { send->hash () }));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote));
// Make sure the vote was processed // Make sure the vote was processed
auto election (node.active.election (send->qualified_root ())); auto election (node.active.election (send->qualified_root ()));
ASSERT_NE (nullptr, election); ASSERT_NE (nullptr, election);
auto existing (election->last_votes.find (nano::test_genesis_key.pub)); auto existing (election->last_votes.find (nano::dev_genesis_key.pub));
ASSERT_NE (election->last_votes.end (), existing); ASSERT_NE (election->last_votes.end (), existing);
ASSERT_EQ (vote->sequence, existing->second.sequence); ASSERT_EQ (vote->sequence, existing->second.sequence);
// Ensure the vote, from a local representative, was not broadcast on processing - it should be flooded on generation instead // Ensure the vote, from a local representative, was not broadcast on processing - it should be flooded on generation instead
@ -222,30 +222,30 @@ TEST (vote_processor, no_broadcast_local)
// Repeat test with no representative // Repeat test with no representative
// Erase account from the wallet // Erase account from the wallet
system.wallet (0)->store.erase (node.wallets.tx_begin_write (), nano::test_genesis_key.pub); system.wallet (0)->store.erase (node.wallets.tx_begin_write (), nano::dev_genesis_key.pub);
node.wallets.compute_reps (); node.wallets.compute_reps ();
ASSERT_FALSE (node.wallets.reps ().exists (nano::test_genesis_key.pub)); ASSERT_FALSE (node.wallets.reps ().exists (nano::dev_genesis_key.pub));
std::shared_ptr<nano::block> send2 = builder.state () std::shared_ptr<nano::block> send2 = builder.state ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.previous (send->hash ()) .previous (send->hash ())
.balance (node.config.vote_minimum) .balance (node.config.vote_minimum)
.link (key.pub) .link (key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (send->hash ())) .work (*system.work.generate (send->hash ()))
.build (ec); .build (ec);
ASSERT_FALSE (ec); ASSERT_FALSE (ec);
ASSERT_EQ (nano::process_result::progress, node.process_local (send2).code); ASSERT_EQ (nano::process_result::progress, node.process_local (send2).code);
ASSERT_EQ (node.config.vote_minimum, node.weight (nano::test_genesis_key.pub)); ASSERT_EQ (node.config.vote_minimum, node.weight (nano::dev_genesis_key.pub));
node.block_confirm (send2); node.block_confirm (send2);
// Process a vote // Process a vote
auto vote2 (node.store.vote_generate (node.store.tx_begin_read (), nano::test_genesis_key.pub, nano::test_genesis_key.prv, { send2->hash () })); auto vote2 (node.store.vote_generate (node.store.tx_begin_read (), nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, { send2->hash () }));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote2));
// Make sure the vote was processed // Make sure the vote was processed
auto election2 (node.active.election (send2->qualified_root ())); auto election2 (node.active.election (send2->qualified_root ()));
ASSERT_NE (nullptr, election2); ASSERT_NE (nullptr, election2);
auto existing2 (election2->last_votes.find (nano::test_genesis_key.pub)); auto existing2 (election2->last_votes.find (nano::dev_genesis_key.pub));
ASSERT_NE (election2->last_votes.end (), existing2); ASSERT_NE (election2->last_votes.end (), existing2);
ASSERT_EQ (vote2->sequence, existing2->second.sequence); ASSERT_EQ (vote2->sequence, existing2->second.sequence);
// Ensure the vote was broadcast // Ensure the vote was broadcast
@ -256,7 +256,7 @@ TEST (vote_processor, no_broadcast_local)
// Increase the genesis weight again // Increase the genesis weight again
std::shared_ptr<nano::block> open = builder.state () std::shared_ptr<nano::block> open = builder.state ()
.account (key.pub) .account (key.pub)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.previous (0) .previous (0)
.balance (nano::genesis_amount - 2 * node.config.vote_minimum.number ()) .balance (nano::genesis_amount - 2 * node.config.vote_minimum.number ())
.link (send->hash ()) .link (send->hash ())
@ -265,20 +265,20 @@ TEST (vote_processor, no_broadcast_local)
.build (ec); .build (ec);
ASSERT_FALSE (ec); ASSERT_FALSE (ec);
ASSERT_EQ (nano::process_result::progress, node.process_local (open).code); ASSERT_EQ (nano::process_result::progress, node.process_local (open).code);
ASSERT_EQ (nano::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::test_genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - node.config.vote_minimum.number (), node.weight (nano::dev_genesis_key.pub));
node.block_confirm (open); node.block_confirm (open);
// Insert account in wallet // Insert account in wallet
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node.wallets.compute_reps (); node.wallets.compute_reps ();
ASSERT_TRUE (node.wallets.reps ().exists (nano::test_genesis_key.pub)); ASSERT_TRUE (node.wallets.reps ().exists (nano::dev_genesis_key.pub));
ASSERT_TRUE (node.wallets.reps ().have_half_rep ()); ASSERT_TRUE (node.wallets.reps ().have_half_rep ());
// Process a vote // Process a vote
auto vote3 (node.store.vote_generate (node.store.tx_begin_read (), nano::test_genesis_key.pub, nano::test_genesis_key.prv, { open->hash () })); auto vote3 (node.store.vote_generate (node.store.tx_begin_read (), nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, { open->hash () }));
ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote3)); ASSERT_EQ (nano::vote_code::vote, node.active.vote (vote3));
// Make sure the vote was processed // Make sure the vote was processed
auto election3 (node.active.election (open->qualified_root ())); auto election3 (node.active.election (open->qualified_root ()));
ASSERT_NE (nullptr, election3); ASSERT_NE (nullptr, election3);
auto existing3 (election3->last_votes.find (nano::test_genesis_key.pub)); auto existing3 (election3->last_votes.find (nano::dev_genesis_key.pub));
ASSERT_NE (election3->last_votes.end (), existing3); ASSERT_NE (election3->last_votes.end (), existing3);
ASSERT_EQ (vote3->sequence, existing3->second.sequence); ASSERT_EQ (vote3->sequence, existing3->second.sequence);
// Ensure the vote wass not broadcasst // Ensure the vote wass not broadcasst

16
nano/core_test/voting.cpp
View file

@ -52,7 +52,7 @@ TEST (vote_generator, cache)
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
auto epoch1 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_1); auto epoch1 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node.active.generator.add (epoch1->root (), epoch1->hash ()); node.active.generator.add (epoch1->root (), epoch1->hash ());
ASSERT_TIMELY (1s, !node.history.votes (epoch1->root (), epoch1->hash ()).empty ()); ASSERT_TIMELY (1s, !node.history.votes (epoch1->root (), epoch1->hash ()).empty ());
auto votes (node.history.votes (epoch1->root (), epoch1->hash ())); auto votes (node.history.votes (epoch1->root (), epoch1->hash ()));
@ -66,14 +66,14 @@ TEST (vote_generator, multiple_representatives)
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
nano::keypair key1, key2, key3; nano::keypair key1, key2, key3;
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
wallet.insert_adhoc (key1.prv); wallet.insert_adhoc (key1.prv);
wallet.insert_adhoc (key2.prv); wallet.insert_adhoc (key2.prv);
wallet.insert_adhoc (key3.prv); wallet.insert_adhoc (key3.prv);
auto const amount = 100 * nano::Gxrb_ratio; auto const amount = 100 * nano::Gxrb_ratio;
wallet.send_sync (nano::test_genesis_key.pub, key1.pub, amount); wallet.send_sync (nano::dev_genesis_key.pub, key1.pub, amount);
wallet.send_sync (nano::test_genesis_key.pub, key2.pub, amount); wallet.send_sync (nano::dev_genesis_key.pub, key2.pub, amount);
wallet.send_sync (nano::test_genesis_key.pub, key3.pub, amount); wallet.send_sync (nano::dev_genesis_key.pub, key3.pub, amount);
ASSERT_TIMELY (3s, node.balance (key1.pub) == amount && node.balance (key2.pub) == amount && node.balance (key3.pub) == amount); ASSERT_TIMELY (3s, node.balance (key1.pub) == amount && node.balance (key2.pub) == amount && node.balance (key3.pub) == amount);
wallet.change_sync (key1.pub, key1.pub); wallet.change_sync (key1.pub, key1.pub);
wallet.change_sync (key2.pub, key2.pub); wallet.change_sync (key2.pub, key2.pub);
@ -81,12 +81,12 @@ TEST (vote_generator, multiple_representatives)
ASSERT_TRUE (node.weight (key1.pub) == amount && node.weight (key2.pub) == amount && node.weight (key3.pub) == amount); ASSERT_TRUE (node.weight (key1.pub) == amount && node.weight (key2.pub) == amount && node.weight (key3.pub) == amount);
node.wallets.compute_reps (); node.wallets.compute_reps ();
ASSERT_EQ (4, node.wallets.reps ().voting); ASSERT_EQ (4, node.wallets.reps ().voting);
auto hash = wallet.send_sync (nano::test_genesis_key.pub, nano::test_genesis_key.pub, 1); auto hash = wallet.send_sync (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, 1);
auto send = node.block (hash); auto send = node.block (hash);
ASSERT_NE (nullptr, send); ASSERT_NE (nullptr, send);
ASSERT_TIMELY (5s, node.history.votes (send->root (), send->hash ()).size () == 4); ASSERT_TIMELY (5s, node.history.votes (send->root (), send->hash ()).size () == 4);
auto votes (node.history.votes (send->root (), send->hash ())); auto votes (node.history.votes (send->root (), send->hash ()));
for (auto const & account : { key1.pub, key2.pub, key3.pub, nano::test_genesis_key.pub }) for (auto const & account : { key1.pub, key2.pub, key3.pub, nano::dev_genesis_key.pub })
{ {
auto existing (std::find_if (votes.begin (), votes.end (), [&account](std::shared_ptr<nano::vote> const & vote_a) -> bool { auto existing (std::find_if (votes.begin (), votes.end (), [&account](std::shared_ptr<nano::vote> const & vote_a) -> bool {
return vote_a->account == account; return vote_a->account == account;
@ -99,7 +99,7 @@ TEST (vote_generator, session)
{ {
nano::system system (1); nano::system system (1);
auto node (system.nodes[0]); auto node (system.nodes[0]);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::vote_generator_session generator_session (node->active.generator); nano::vote_generator_session generator_session (node->active.generator);
boost::thread thread ([node, &generator_session]() { boost::thread thread ([node, &generator_session]() {
nano::thread_role::set (nano::thread_role::name::request_loop); nano::thread_role::set (nano::thread_role::name::request_loop);

158
nano/core_test/wallet.cpp
View file

@ -166,43 +166,43 @@ TEST (wallet, insufficient_spend_one)
{ {
nano::system system (1); nano::system system (1);
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto block (system.wallet (0)->send_action (nano::test_genesis_key.pub, key1.pub, 500)); auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, 500));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key1.pub, nano::genesis_amount)); ASSERT_EQ (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key1.pub, nano::genesis_amount));
} }
TEST (wallet, spend_all_one) TEST (wallet, spend_all_one)
{ {
nano::system system (1); nano::system system (1);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::block_hash latest1 (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub));
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max ()));
nano::account_info info2; nano::account_info info2;
{ {
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
node1.store.account_get (transaction, nano::test_genesis_key.pub, info2); node1.store.account_get (transaction, nano::dev_genesis_key.pub, info2);
ASSERT_NE (latest1, info2.head); ASSERT_NE (latest1, info2.head);
auto block (node1.store.block_get (transaction, info2.head)); auto block (node1.store.block_get (transaction, info2.head));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
ASSERT_EQ (latest1, block->previous ()); ASSERT_EQ (latest1, block->previous ());
} }
ASSERT_TRUE (info2.balance.is_zero ()); ASSERT_TRUE (info2.balance.is_zero ());
ASSERT_EQ (0, node1.balance (nano::test_genesis_key.pub)); ASSERT_EQ (0, node1.balance (nano::dev_genesis_key.pub));
} }
TEST (wallet, send_async) TEST (wallet, send_async)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
std::thread thread ([&system]() { std::thread thread ([&system]() {
ASSERT_TIMELY (10s, system.nodes[0]->balance (nano::test_genesis_key.pub).is_zero ()); ASSERT_TIMELY (10s, system.nodes[0]->balance (nano::dev_genesis_key.pub).is_zero ());
}); });
std::atomic<bool> success (false); std::atomic<bool> success (false);
system.wallet (0)->send_async (nano::test_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max (), [&success](std::shared_ptr<nano::block> block_a) { ASSERT_NE (nullptr, block_a); success = true; }); system.wallet (0)->send_async (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max (), [&success](std::shared_ptr<nano::block> block_a) { ASSERT_NE (nullptr, block_a); success = true; });
thread.join (); thread.join ();
ASSERT_TIMELY (2s, success); ASSERT_TIMELY (2s, success);
} }
@ -211,34 +211,34 @@ TEST (wallet, spend)
{ {
nano::system system (1); nano::system system (1);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
nano::block_hash latest1 (node1.latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (node1.latest (nano::dev_genesis_key.pub));
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
// Sending from empty accounts should always be an error. Accounts need to be opened with an open block, not a send block. // Sending from empty accounts should always be an error. Accounts need to be opened with an open block, not a send block.
ASSERT_EQ (nullptr, system.wallet (0)->send_action (0, key2.pub, 0)); ASSERT_EQ (nullptr, system.wallet (0)->send_action (0, key2.pub, 0));
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max ())); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max ()));
nano::account_info info2; nano::account_info info2;
{ {
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
node1.store.account_get (transaction, nano::test_genesis_key.pub, info2); node1.store.account_get (transaction, nano::dev_genesis_key.pub, info2);
ASSERT_NE (latest1, info2.head); ASSERT_NE (latest1, info2.head);
auto block (node1.store.block_get (transaction, info2.head)); auto block (node1.store.block_get (transaction, info2.head));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
ASSERT_EQ (latest1, block->previous ()); ASSERT_EQ (latest1, block->previous ());
} }
ASSERT_TRUE (info2.balance.is_zero ()); ASSERT_TRUE (info2.balance.is_zero ());
ASSERT_EQ (0, node1.balance (nano::test_genesis_key.pub)); ASSERT_EQ (0, node1.balance (nano::dev_genesis_key.pub));
} }
TEST (wallet, change) TEST (wallet, change)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
auto block1 (system.nodes[0]->rep_block (nano::test_genesis_key.pub)); auto block1 (system.nodes[0]->rep_block (nano::dev_genesis_key.pub));
ASSERT_FALSE (block1.is_zero ()); ASSERT_FALSE (block1.is_zero ());
ASSERT_NE (nullptr, system.wallet (0)->change_action (nano::test_genesis_key.pub, key2.pub)); ASSERT_NE (nullptr, system.wallet (0)->change_action (nano::dev_genesis_key.pub, key2.pub));
auto block2 (system.nodes[0]->rep_block (nano::test_genesis_key.pub)); auto block2 (system.nodes[0]->rep_block (nano::dev_genesis_key.pub));
ASSERT_FALSE (block2.is_zero ()); ASSERT_FALSE (block2.is_zero ());
ASSERT_NE (block1, block2); ASSERT_NE (block1, block2);
} }
@ -246,20 +246,20 @@ TEST (wallet, change)
TEST (wallet, partial_spend) TEST (wallet, partial_spend)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, 500)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 500));
ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - 500, system.nodes[0]->balance (nano::test_genesis_key.pub)); ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - 500, system.nodes[0]->balance (nano::dev_genesis_key.pub));
} }
TEST (wallet, spend_no_previous) TEST (wallet, spend_no_previous)
{ {
nano::system system (1); nano::system system (1);
{ {
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto transaction (system.nodes[0]->store.tx_begin_read ()); auto transaction (system.nodes[0]->store.tx_begin_read ());
nano::account_info info1; nano::account_info info1;
ASSERT_FALSE (system.nodes[0]->store.account_get (transaction, nano::test_genesis_key.pub, info1)); ASSERT_FALSE (system.nodes[0]->store.account_get (transaction, nano::dev_genesis_key.pub, info1));
for (auto i (0); i < 50; ++i) for (auto i (0); i < 50; ++i)
{ {
nano::keypair key; nano::keypair key;
@ -267,8 +267,8 @@ TEST (wallet, spend_no_previous)
} }
} }
nano::keypair key2; nano::keypair key2;
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, 500)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, 500));
ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - 500, system.nodes[0]->balance (nano::test_genesis_key.pub)); ASSERT_EQ (std::numeric_limits<nano::uint128_t>::max () - 500, system.nodes[0]->balance (nano::dev_genesis_key.pub));
} }
TEST (wallet, find_none) TEST (wallet, find_none)
@ -635,7 +635,7 @@ TEST (wallet, work)
{ {
nano::system system (1); nano::system system (1);
auto wallet (system.wallet (0)); auto wallet (system.wallet (0));
wallet->insert_adhoc (nano::test_genesis_key.prv); wallet->insert_adhoc (nano::dev_genesis_key.prv);
nano::genesis genesis; nano::genesis genesis;
auto done (false); auto done (false);
system.deadline_set (20s); system.deadline_set (20s);
@ -643,7 +643,7 @@ TEST (wallet, work)
{ {
auto transaction (system.wallet (0)->wallets.tx_begin_read ()); auto transaction (system.wallet (0)->wallets.tx_begin_read ());
uint64_t work (0); uint64_t work (0);
if (!wallet->store.work_get (transaction, nano::test_genesis_key.pub, work)) if (!wallet->store.work_get (transaction, nano::dev_genesis_key.pub, work))
{ {
done = nano::work_difficulty (genesis.open->work_version (), genesis.hash (), work) >= system.nodes[0]->default_difficulty (genesis.open->work_version ()); done = nano::work_difficulty (genesis.open->work_version (), genesis.hash (), work) >= system.nodes[0]->default_difficulty (genesis.open->work_version ());
} }
@ -656,18 +656,18 @@ TEST (wallet, work_generate)
nano::system system (1); nano::system system (1);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
auto wallet (system.wallet (0)); auto wallet (system.wallet (0));
nano::uint128_t amount1 (node1.balance (nano::test_genesis_key.pub)); nano::uint128_t amount1 (node1.balance (nano::dev_genesis_key.pub));
uint64_t work1; uint64_t work1;
wallet->insert_adhoc (nano::test_genesis_key.prv); wallet->insert_adhoc (nano::dev_genesis_key.prv);
nano::account account1; nano::account account1;
{ {
auto transaction (node1.wallets.tx_begin_read ()); auto transaction (node1.wallets.tx_begin_read ());
account1 = system.account (transaction, 0); account1 = system.account (transaction, 0);
} }
nano::keypair key; nano::keypair key;
auto block (wallet->send_action (nano::test_genesis_key.pub, key.pub, 100)); auto block (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100));
auto transaction (node1.store.tx_begin_read ()); auto transaction (node1.store.tx_begin_read ());
ASSERT_TIMELY (10s, node1.ledger.account_balance (transaction, nano::test_genesis_key.pub) != amount1); ASSERT_TIMELY (10s, node1.ledger.account_balance (transaction, nano::dev_genesis_key.pub) != amount1);
system.deadline_set (10s); system.deadline_set (10s);
auto again (true); auto again (true);
while (again) while (again)
@ -685,18 +685,18 @@ TEST (wallet, work_cache_delayed)
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
auto wallet (system.wallet (0)); auto wallet (system.wallet (0));
uint64_t work1; uint64_t work1;
wallet->insert_adhoc (nano::test_genesis_key.prv); wallet->insert_adhoc (nano::dev_genesis_key.prv);
nano::account account1; nano::account account1;
{ {
auto transaction (node1.wallets.tx_begin_read ()); auto transaction (node1.wallets.tx_begin_read ());
account1 = system.account (transaction, 0); account1 = system.account (transaction, 0);
} }
nano::keypair key; nano::keypair key;
auto block1 (wallet->send_action (nano::test_genesis_key.pub, key.pub, 100)); auto block1 (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_EQ (block1->hash (), node1.latest (nano::test_genesis_key.pub)); ASSERT_EQ (block1->hash (), node1.latest (nano::dev_genesis_key.pub));
auto block2 (wallet->send_action (nano::test_genesis_key.pub, key.pub, 100)); auto block2 (wallet->send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_EQ (block2->hash (), node1.latest (nano::test_genesis_key.pub)); ASSERT_EQ (block2->hash (), node1.latest (nano::dev_genesis_key.pub));
ASSERT_EQ (block2->hash (), node1.wallets.delayed_work->operator[] (nano::test_genesis_key.pub)); ASSERT_EQ (block2->hash (), node1.wallets.delayed_work->operator[] (nano::dev_genesis_key.pub));
auto threshold (node1.default_difficulty (nano::work_version::work_1)); auto threshold (node1.default_difficulty (nano::work_version::work_1));
auto again (true); auto again (true);
system.deadline_set (10s); system.deadline_set (10s);
@ -817,27 +817,27 @@ TEST (wallet, insert_deterministic_locked)
TEST (wallet, no_work) TEST (wallet, no_work)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv, false); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv, false);
nano::keypair key2; nano::keypair key2;
auto block (system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max (), false)); auto block (system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, std::numeric_limits<nano::uint128_t>::max (), false));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
ASSERT_NE (0, block->block_work ()); ASSERT_NE (0, block->block_work ());
ASSERT_GE (block->difficulty (), nano::work_threshold (block->work_version (), block->sideband ().details)); ASSERT_GE (block->difficulty (), nano::work_threshold (block->work_version (), block->sideband ().details));
auto transaction (system.wallet (0)->wallets.tx_begin_read ()); auto transaction (system.wallet (0)->wallets.tx_begin_read ());
uint64_t cached_work (0); uint64_t cached_work (0);
system.wallet (0)->store.work_get (transaction, nano::test_genesis_key.pub, cached_work); system.wallet (0)->store.work_get (transaction, nano::dev_genesis_key.pub, cached_work);
ASSERT_EQ (0, cached_work); ASSERT_EQ (0, cached_work);
} }
TEST (wallet, send_race) TEST (wallet, send_race)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key2; nano::keypair key2;
for (auto i (1); i < 60; ++i) for (auto i (1); i < 60; ++i)
{ {
ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::test_genesis_key.pub, key2.pub, nano::Gxrb_ratio)); ASSERT_NE (nullptr, system.wallet (0)->send_action (nano::dev_genesis_key.pub, key2.pub, nano::Gxrb_ratio));
ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::test_genesis_key.pub)); ASSERT_EQ (nano::genesis_amount - nano::Gxrb_ratio * i, system.nodes[0]->balance (nano::dev_genesis_key.pub));
} }
} }
@ -950,8 +950,8 @@ TEST (wallet, change_seed)
uint32_t index (4); uint32_t index (4);
auto prv = nano::deterministic_key (seed1, index); auto prv = nano::deterministic_key (seed1, index);
pub = nano::pub_key (prv); pub = nano::pub_key (prv);
wallet->insert_adhoc (nano::test_genesis_key.prv, false); wallet->insert_adhoc (nano::dev_genesis_key.prv, false);
auto block (wallet->send_action (nano::test_genesis_key.pub, pub, 100)); auto block (wallet->send_action (nano::dev_genesis_key.pub, pub, 100));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
system.nodes[0]->block_processor.flush (); system.nodes[0]->block_processor.flush ();
{ {
@ -984,8 +984,8 @@ TEST (wallet, deterministic_restore)
auto prv = nano::deterministic_key (seed1, index); auto prv = nano::deterministic_key (seed1, index);
pub = nano::pub_key (prv); pub = nano::pub_key (prv);
} }
wallet->insert_adhoc (nano::test_genesis_key.prv, false); wallet->insert_adhoc (nano::dev_genesis_key.prv, false);
auto block (wallet->send_action (nano::test_genesis_key.pub, pub, 100)); auto block (wallet->send_action (nano::dev_genesis_key.pub, pub, 100));
ASSERT_NE (nullptr, block); ASSERT_NE (nullptr, block);
system.nodes[0]->block_processor.flush (); system.nodes[0]->block_processor.flush ();
{ {
@ -1007,12 +1007,12 @@ TEST (work_watcher, update)
node_flags.disable_request_loop = true; node_flags.disable_request_loop = true;
auto & node = *system.add_node (node_config, node_flags); auto & node = *system.add_node (node_config, node_flags);
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key; nano::keypair key;
auto const block1 (wallet.send_action (nano::test_genesis_key.pub, key.pub, 100)); auto const block1 (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 100));
auto difficulty1 (block1->difficulty ()); auto difficulty1 (block1->difficulty ());
auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (block1->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node.network_params.network.publish_thresholds.epoch_1)); auto multiplier1 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty1, nano::work_threshold (block1->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node.network_params.network.publish_thresholds.epoch_1));
auto const block2 (wallet.send_action (nano::test_genesis_key.pub, key.pub, 200)); auto const block2 (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 200));
auto difficulty2 (block2->difficulty ()); auto difficulty2 (block2->difficulty ());
auto multiplier2 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty2, nano::work_threshold (block2->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node.network_params.network.publish_thresholds.epoch_1)); auto multiplier2 (nano::normalized_multiplier (nano::difficulty::to_multiplier (difficulty2, nano::work_threshold (block2->work_version (), nano::block_details (nano::epoch::epoch_0, true, false, false))), node.network_params.network.publish_thresholds.epoch_1));
double updated_multiplier1{ multiplier1 }, updated_multiplier2{ multiplier2 }, target_multiplier{ std::max (multiplier1, multiplier2) + 1e-6 }; double updated_multiplier1{ multiplier1 }, updated_multiplier2{ multiplier2 }, target_multiplier{ std::max (multiplier1, multiplier2) + 1e-6 };
@ -1055,11 +1055,11 @@ TEST (work_watcher, propagate)
node_flags.disable_request_loop = true; node_flags.disable_request_loop = true;
auto & node = *system.add_node (node_config, node_flags); auto & node = *system.add_node (node_config, node_flags);
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
node_config.peering_port = nano::get_available_port (); node_config.peering_port = nano::get_available_port ();
auto & node_passive = *system.add_node (node_config); auto & node_passive = *system.add_node (node_config);
nano::keypair key; nano::keypair key;
auto const block (wallet.send_action (nano::test_genesis_key.pub, key.pub, 100)); auto const block (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_TIMELY (5s, node_passive.ledger.block_exists (block->hash ())); ASSERT_TIMELY (5s, node_passive.ledger.block_exists (block->hash ()));
auto const multiplier (nano::normalized_multiplier (nano::difficulty::to_multiplier (block->difficulty (), nano::work_threshold (block->work_version (), nano::block_details (nano::epoch::epoch_0, false, false, false))), node.network_params.network.publish_thresholds.epoch_1)); auto const multiplier (nano::normalized_multiplier (nano::difficulty::to_multiplier (block->difficulty (), nano::work_threshold (block->work_version (), nano::block_details (nano::epoch::epoch_0, false, false, false))), node.network_params.network.publish_thresholds.epoch_1));
auto updated_multiplier{ multiplier }; auto updated_multiplier{ multiplier };
@ -1102,10 +1102,10 @@ TEST (work_watcher, removed_after_win)
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key; nano::keypair key;
ASSERT_EQ (0, wallet.wallets.watcher->size ()); ASSERT_EQ (0, wallet.wallets.watcher->size ());
auto const block1 (wallet.send_action (nano::test_genesis_key.pub, key.pub, 100)); auto const block1 (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_EQ (1, wallet.wallets.watcher->size ()); ASSERT_EQ (1, wallet.wallets.watcher->size ());
ASSERT_TIMELY (5s, !node.wallets.watcher->is_watched (block1->qualified_root ())); ASSERT_TIMELY (5s, !node.wallets.watcher->is_watched (block1->qualified_root ()));
ASSERT_EQ (0, node.wallets.watcher->size ()); ASSERT_EQ (0, node.wallets.watcher->size ());
@ -1119,15 +1119,15 @@ TEST (work_watcher, removed_after_lose)
node_config.work_watcher_period = 1s; node_config.work_watcher_period = 1s;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv); wallet.insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key; nano::keypair key;
auto const block1 (wallet.send_action (nano::test_genesis_key.pub, key.pub, 100)); auto const block1 (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 100));
ASSERT_TRUE (node.wallets.watcher->is_watched (block1->qualified_root ())); ASSERT_TRUE (node.wallets.watcher->is_watched (block1->qualified_root ()));
nano::genesis genesis; nano::genesis genesis;
auto fork1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::xrb_ratio, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto fork1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::xrb_ratio, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
node.process_active (fork1); node.process_active (fork1);
node.block_processor.flush (); node.block_processor.flush ();
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, fork1)); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, fork1));
nano::confirm_ack message (vote); nano::confirm_ack message (vote);
node.network.process_message (message, nullptr); node.network.process_message (message, nullptr);
ASSERT_TIMELY (5s, !node.wallets.watcher->is_watched (block1->qualified_root ())); ASSERT_TIMELY (5s, !node.wallets.watcher->is_watched (block1->qualified_root ()));
@ -1148,7 +1148,7 @@ TEST (work_watcher, generation_disabled)
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::genesis genesis; nano::genesis genesis;
nano::keypair key; nano::keypair key;
auto block (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ()))); auto block (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ())));
auto difficulty (block->difficulty ()); auto difficulty (block->difficulty ());
node.wallets.watcher->add (block); node.wallets.watcher->add (block);
ASSERT_FALSE (node.process_local (block).code != nano::process_result::progress); ASSERT_FALSE (node.process_local (block).code != nano::process_result::progress);
@ -1180,10 +1180,10 @@ TEST (work_watcher, cancel)
node_config.enable_voting = false; node_config.enable_voting = false;
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
auto & wallet (*system.wallet (0)); auto & wallet (*system.wallet (0));
wallet.insert_adhoc (nano::test_genesis_key.prv, false); wallet.insert_adhoc (nano::dev_genesis_key.prv, false);
nano::keypair key; nano::keypair key;
auto work1 (node.work_generate_blocking (nano::test_genesis_key.pub)); auto work1 (node.work_generate_blocking (nano::dev_genesis_key.pub));
auto const block1 (wallet.send_action (nano::test_genesis_key.pub, key.pub, 100, *work1, false)); auto const block1 (wallet.send_action (nano::dev_genesis_key.pub, key.pub, 100, *work1, false));
{ {
nano::unique_lock<std::mutex> lock (node.active.mutex); nano::unique_lock<std::mutex> lock (node.active.mutex);
// Prevent active difficulty repopulating multipliers // Prevent active difficulty repopulating multipliers
@ -1230,15 +1230,15 @@ TEST (wallet, limited_difficulty)
// Upgrade the genesis account to epoch 2 // Upgrade the genesis account to epoch 2
ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_1));
ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_2)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_2));
ASSERT_EQ (nano::epoch::epoch_2, node.store.block_version (node.store.tx_begin_read (), node.latest (nano::test_genesis_key.pub))); ASSERT_EQ (nano::epoch::epoch_2, node.store.block_version (node.store.tx_begin_read (), node.latest (nano::dev_genesis_key.pub)));
wallet.insert_adhoc (nano::test_genesis_key.prv, false); wallet.insert_adhoc (nano::dev_genesis_key.prv, false);
{ {
// Force active difficulty to an impossibly high value // Force active difficulty to an impossibly high value
nano::lock_guard<std::mutex> guard (node.active.mutex); nano::lock_guard<std::mutex> guard (node.active.mutex);
node.active.trended_active_multiplier = 1024 * 1024 * 1024; node.active.trended_active_multiplier = 1024 * 1024 * 1024;
} }
ASSERT_EQ (node.max_work_generate_difficulty (nano::work_version::work_1), node.active.limited_active_difficulty (*genesis.open)); ASSERT_EQ (node.max_work_generate_difficulty (nano::work_version::work_1), node.active.limited_active_difficulty (*genesis.open));
auto send = wallet.send_action (nano::test_genesis_key.pub, nano::keypair ().pub, 1, 1); auto send = wallet.send_action (nano::dev_genesis_key.pub, nano::keypair ().pub, 1, 1);
ASSERT_NE (nullptr, send); ASSERT_NE (nullptr, send);
ASSERT_EQ (nano::epoch::epoch_2, send->sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_2, send->sideband ().details.epoch);
ASSERT_EQ (nano::epoch::epoch_0, send->sideband ().source_epoch); // Not used for send state blocks ASSERT_EQ (nano::epoch::epoch_0, send->sideband ().source_epoch); // Not used for send state blocks
@ -1254,7 +1254,7 @@ TEST (wallet, epoch_2_validation)
ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_1)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_1));
ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_2)); ASSERT_NE (nullptr, system.upgrade_genesis_epoch (node, nano::epoch::epoch_2));
wallet.insert_adhoc (nano::test_genesis_key.prv, false); wallet.insert_adhoc (nano::dev_genesis_key.prv, false);
// Test send and receive blocks // Test send and receive blocks
// An epoch 2 receive block should be generated with lower difficulty with high probability // An epoch 2 receive block should be generated with lower difficulty with high probability
@ -1263,12 +1263,12 @@ TEST (wallet, epoch_2_validation)
auto amount = node.config.receive_minimum.number (); auto amount = node.config.receive_minimum.number ();
while (++tries < max_tries) while (++tries < max_tries)
{ {
auto send = wallet.send_action (nano::test_genesis_key.pub, nano::test_genesis_key.pub, amount, 1); auto send = wallet.send_action (nano::dev_genesis_key.pub, nano::dev_genesis_key.pub, amount, 1);
ASSERT_NE (nullptr, send); ASSERT_NE (nullptr, send);
ASSERT_EQ (nano::epoch::epoch_2, send->sideband ().details.epoch); ASSERT_EQ (nano::epoch::epoch_2, send->sideband ().details.epoch);
ASSERT_EQ (nano::epoch::epoch_0, send->sideband ().source_epoch); // Not used for send state blocks ASSERT_EQ (nano::epoch::epoch_0, send->sideband ().source_epoch); // Not used for send state blocks
auto receive = wallet.receive_action (*send, nano::test_genesis_key.pub, amount, 1); auto receive = wallet.receive_action (*send, nano::dev_genesis_key.pub, amount, 1);
ASSERT_NE (nullptr, receive); ASSERT_NE (nullptr, receive);
if (receive->difficulty () < node.network_params.network.publish_thresholds.base) if (receive->difficulty () < node.network_params.network.publish_thresholds.base)
{ {
@ -1281,7 +1281,7 @@ TEST (wallet, epoch_2_validation)
ASSERT_LT (tries, max_tries); ASSERT_LT (tries, max_tries);
// Test a change block // Test a change block
ASSERT_NE (nullptr, wallet.change_action (nano::test_genesis_key.pub, nano::keypair ().pub, 1)); ASSERT_NE (nullptr, wallet.change_action (nano::dev_genesis_key.pub, nano::keypair ().pub, 1));
} }
// Receiving from an upgraded account uses the lower threshold and upgrades the receiving account // Receiving from an upgraded account uses the lower threshold and upgrades the receiving account
@ -1305,19 +1305,19 @@ TEST (wallet, epoch_2_receive_propagation)
nano::state_block_builder builder; nano::state_block_builder builder;
// Send and open the account // Send and open the account
wallet.insert_adhoc (nano::test_genesis_key.prv, false); wallet.insert_adhoc (nano::dev_genesis_key.prv, false);
wallet.insert_adhoc (key.prv, false); wallet.insert_adhoc (key.prv, false);
auto amount = node.config.receive_minimum.number (); auto amount = node.config.receive_minimum.number ();
auto send1 = wallet.send_action (nano::test_genesis_key.pub, key.pub, amount, 1); auto send1 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1);
ASSERT_NE (nullptr, send1); ASSERT_NE (nullptr, send1);
ASSERT_NE (nullptr, wallet.receive_action (*send1, nano::test_genesis_key.pub, amount, 1)); ASSERT_NE (nullptr, wallet.receive_action (*send1, nano::dev_genesis_key.pub, amount, 1));
// Upgrade the genesis account to epoch 2 // Upgrade the genesis account to epoch 2
auto epoch2 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_2); auto epoch2 = system.upgrade_genesis_epoch (node, nano::epoch::epoch_2);
ASSERT_NE (nullptr, epoch2); ASSERT_NE (nullptr, epoch2);
// Send a block // Send a block
auto send2 = wallet.send_action (nano::test_genesis_key.pub, key.pub, amount, 1); auto send2 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1);
ASSERT_NE (nullptr, send2); ASSERT_NE (nullptr, send2);
// Receiving should use the lower difficulty // Receiving should use the lower difficulty
@ -1360,12 +1360,12 @@ TEST (wallet, epoch_2_receive_unopened)
nano::state_block_builder builder; nano::state_block_builder builder;
// Send // Send
wallet.insert_adhoc (nano::test_genesis_key.prv, false); wallet.insert_adhoc (nano::dev_genesis_key.prv, false);
auto amount = node.config.receive_minimum.number (); auto amount = node.config.receive_minimum.number ();
auto send1 = wallet.send_action (nano::test_genesis_key.pub, key.pub, amount, 1); auto send1 = wallet.send_action (nano::dev_genesis_key.pub, key.pub, amount, 1);
// Upgrade unopened account to epoch_2 // Upgrade unopened account to epoch_2
auto epoch2_unopened = nano::state_block (key.pub, 0, 0, 0, node.network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (key.pub, node.network_params.network.publish_thresholds.epoch_2)); auto epoch2_unopened = nano::state_block (key.pub, 0, 0, 0, node.network_params.ledger.epochs.link (nano::epoch::epoch_2), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (key.pub, node.network_params.network.publish_thresholds.epoch_2));
ASSERT_EQ (nano::process_result::progress, node.process (epoch2_unopened).code); ASSERT_EQ (nano::process_result::progress, node.process (epoch2_unopened).code);
wallet.insert_adhoc (key.prv, false); wallet.insert_adhoc (key.prv, false);
@ -1392,7 +1392,7 @@ TEST (wallet, foreach_representative_deadlock)
{ {
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node.wallets.compute_reps (); node.wallets.compute_reps ();
ASSERT_EQ (1, node.wallets.reps ().voting); ASSERT_EQ (1, node.wallets.reps ().voting);
node.wallets.foreach_representative ([&node](nano::public_key const & pub, nano::raw_key const & prv) { node.wallets.foreach_representative ([&node](nano::public_key const & pub, nano::raw_key const & prv) {

6
nano/core_test/wallets.cpp
View file

@ -122,18 +122,18 @@ TEST (wallets, vote_minimum)
nano::keypair key1; nano::keypair key1;
nano::keypair key2; nano::keypair key2;
nano::genesis genesis; nano::genesis genesis;
nano::state_block send1 (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - node1.config.vote_minimum.number (), key1.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ())); nano::state_block send1 (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - node1.config.vote_minimum.number (), key1.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()));
ASSERT_EQ (nano::process_result::progress, node1.process (send1).code); ASSERT_EQ (nano::process_result::progress, node1.process (send1).code);
nano::state_block open1 (key1.pub, 0, key1.pub, node1.config.vote_minimum.number (), send1.hash (), key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::state_block open1 (key1.pub, 0, key1.pub, node1.config.vote_minimum.number (), send1.hash (), key1.prv, key1.pub, *system.work.generate (key1.pub));
ASSERT_EQ (nano::process_result::progress, node1.process (open1).code); ASSERT_EQ (nano::process_result::progress, node1.process (open1).code);
// send2 with amount vote_minimum - 1 (not voting representative) // send2 with amount vote_minimum - 1 (not voting representative)
nano::state_block send2 (nano::test_genesis_key.pub, send1.hash (), nano::test_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 2 * node1.config.vote_minimum.number () + 1, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send1.hash ())); nano::state_block send2 (nano::dev_genesis_key.pub, send1.hash (), nano::dev_genesis_key.pub, std::numeric_limits<nano::uint128_t>::max () - 2 * node1.config.vote_minimum.number () + 1, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send1.hash ()));
ASSERT_EQ (nano::process_result::progress, node1.process (send2).code); ASSERT_EQ (nano::process_result::progress, node1.process (send2).code);
nano::state_block open2 (key2.pub, 0, key2.pub, node1.config.vote_minimum.number () - 1, send2.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub)); nano::state_block open2 (key2.pub, 0, key2.pub, node1.config.vote_minimum.number () - 1, send2.hash (), key2.prv, key2.pub, *system.work.generate (key2.pub));
ASSERT_EQ (nano::process_result::progress, node1.process (open2).code); ASSERT_EQ (nano::process_result::progress, node1.process (open2).code);
auto wallet (node1.wallets.items.begin ()->second); auto wallet (node1.wallets.items.begin ()->second);
ASSERT_EQ (0, wallet->representatives.size ()); ASSERT_EQ (0, wallet->representatives.size ());
wallet->insert_adhoc (nano::test_genesis_key.prv); wallet->insert_adhoc (nano::dev_genesis_key.prv);
wallet->insert_adhoc (key1.prv); wallet->insert_adhoc (key1.prv);
wallet->insert_adhoc (key2.prv); wallet->insert_adhoc (key2.prv);
node1.wallets.compute_reps (); node1.wallets.compute_reps ();

54
nano/core_test/websocket.cpp
View file

@ -144,14 +144,14 @@ TEST (websocket, confirmation)
ASSERT_TIMELY (5s, ack_ready); ASSERT_TIMELY (5s, ack_ready);
nano::keypair key; nano::keypair key;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto balance = nano::genesis_amount; auto balance = nano::genesis_amount;
auto send_amount = node1->config.online_weight_minimum.number () + 1; auto send_amount = node1->config.online_weight_minimum.number () + 1;
// Quick-confirm a block, legacy blocks should work without filtering // Quick-confirm a block, legacy blocks should work without filtering
{ {
nano::block_hash previous (node1->latest (nano::test_genesis_key.pub)); nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub));
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::send_block> (previous, key.pub, balance, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::send_block> (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
} }
@ -159,9 +159,9 @@ TEST (websocket, confirmation)
// Quick confirm a state block // Quick confirm a state block
{ {
nano::block_hash previous (node1->latest (nano::test_genesis_key.pub)); nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub));
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, balance, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, balance, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
} }
@ -193,7 +193,7 @@ TEST (websocket, stopped_election)
// Create election, then erase it, causing a websocket message to be emitted // Create election, then erase it, causing a websocket message to be emitted
nano::keypair key1; nano::keypair key1;
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::send_block> (genesis.hash (), key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
nano::publish publish1 (send1); nano::publish publish1 (send1);
auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ())); auto channel1 (node1->network.udp_channels.create (node1->network.endpoint ()));
node1->network.process_message (publish1, channel1); node1->network.process_message (publish1, channel1);
@ -235,14 +235,14 @@ TEST (websocket, confirmation_options)
ASSERT_TIMELY (5s, ack_ready); ASSERT_TIMELY (5s, ack_ready);
// Confirm a state block for an in-wallet account // Confirm a state block for an in-wallet account
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key; nano::keypair key;
auto balance = nano::genesis_amount; auto balance = nano::genesis_amount;
auto send_amount = node1->config.online_weight_minimum.number () + 1; auto send_amount = node1->config.online_weight_minimum.number () + 1;
nano::block_hash previous (node1->latest (nano::test_genesis_key.pub)); nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub));
{ {
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, balance, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, balance, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
previous = send->hash (); previous = send->hash ();
} }
@ -265,7 +265,7 @@ TEST (websocket, confirmation_options)
// Quick-confirm another block // Quick-confirm another block
{ {
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, balance, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, balance, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
previous = send->hash (); previous = send->hash ();
} }
@ -284,7 +284,7 @@ TEST (websocket, confirmation_options)
boost::property_tree::ptree election_info = event.get_child ("message.election_info"); boost::property_tree::ptree election_info = event.get_child ("message.election_info");
auto tally (election_info.get<std::string> ("tally")); auto tally (election_info.get<std::string> ("tally"));
auto time (election_info.get<std::string> ("time")); auto time (election_info.get<std::string> ("time"));
// Duration and request count may be zero on testnet, so we only check that they're present // Duration and request count may be zero on devnet, so we only check that they're present
ASSERT_EQ (1, election_info.count ("duration")); ASSERT_EQ (1, election_info.count ("duration"));
ASSERT_EQ (1, election_info.count ("request_count")); ASSERT_EQ (1, election_info.count ("request_count"));
ASSERT_EQ (1, election_info.count ("voters")); ASSERT_EQ (1, election_info.count ("voters"));
@ -316,7 +316,7 @@ TEST (websocket, confirmation_options)
// When filtering options are enabled, legacy blocks are always filtered // When filtering options are enabled, legacy blocks are always filtered
{ {
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::send_block> (previous, key.pub, balance, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::send_block> (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
previous = send->hash (); previous = send->hash ();
} }
@ -342,14 +342,14 @@ TEST (websocket, confirmation_options_update)
client.await_ack (); client.await_ack ();
EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation));
// Now update filter with an account and wait for a response // Now update filter with an account and wait for a response
std::string add_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_add": ["%1%"]}})json") % nano::test_genesis_key.pub.to_account ()); std::string add_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_add": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ());
client.send_message (add_message); client.send_message (add_message);
client.await_ack (); client.await_ack ();
EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation));
added = true; added = true;
EXPECT_TRUE (client.get_response ()); EXPECT_TRUE (client.get_response ());
// Update the filter again, removing the account // Update the filter again, removing the account
std::string delete_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_del": ["%1%"]}})json") % nano::test_genesis_key.pub.to_account ()); std::string delete_message = boost::str (boost::format (R"json({"action": "update", "topic": "confirmation", "ack": "true", "options": {"accounts_del": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ());
client.send_message (delete_message); client.send_message (delete_message);
client.await_ack (); client.await_ack ();
EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation)); EXPECT_EQ (1, node1->websocket_server->subscriber_count (nano::websocket::topic::confirmation));
@ -362,11 +362,11 @@ TEST (websocket, confirmation_options_update)
ASSERT_TIMELY (5s, added); ASSERT_TIMELY (5s, added);
// Confirm a block // Confirm a block
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key; nano::keypair key;
auto previous (node1->latest (nano::test_genesis_key.pub)); auto previous (node1->latest (nano::dev_genesis_key.pub));
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, nano::genesis_amount - nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
// Wait for delete acknowledgement // Wait for delete acknowledgement
@ -374,7 +374,7 @@ TEST (websocket, confirmation_options_update)
// Confirm another block // Confirm another block
previous = send->hash (); previous = send->hash ();
auto send2 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send2 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, nano::genesis_amount - 2 * nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send2); node1->process_active (send2);
ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready); ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready);
@ -404,9 +404,9 @@ TEST (websocket, vote)
// Quick-confirm a block // Quick-confirm a block
nano::keypair key; nano::keypair key;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash previous (node1->latest (nano::test_genesis_key.pub)); nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub));
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, nano::genesis_amount - (node1->config.online_weight_minimum.number () + 1), key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, nano::genesis_amount - (node1->config.online_weight_minimum.number () + 1), key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready); ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready);
@ -444,7 +444,7 @@ TEST (websocket, vote_options_type)
// Custom made votes for simplicity // Custom made votes for simplicity
nano::genesis genesis; nano::genesis genesis;
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, 0, genesis.open)); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, 0, genesis.open));
nano::websocket::message_builder builder; nano::websocket::message_builder builder;
auto msg (builder.vote_received (vote, nano::vote_code::replay)); auto msg (builder.vote_received (vote, nano::vote_code::replay));
node1->websocket_server->broadcast (msg); node1->websocket_server->broadcast (msg);
@ -474,7 +474,7 @@ TEST (websocket, vote_options_representatives)
std::atomic<bool> ack_ready{ false }; std::atomic<bool> ack_ready{ false };
auto task1 = ([&ack_ready, config, &node1]() { auto task1 = ([&ack_ready, config, &node1]() {
fake_websocket_client client (config.websocket_config.port); fake_websocket_client client (config.websocket_config.port);
std::string message = boost::str (boost::format (R"json({"action": "subscribe", "topic": "vote", "ack": "true", "options": {"representatives": ["%1%"]}})json") % nano::test_genesis_key.pub.to_account ()); std::string message = boost::str (boost::format (R"json({"action": "subscribe", "topic": "vote", "ack": "true", "options": {"representatives": ["%1%"]}})json") % nano::dev_genesis_key.pub.to_account ());
client.send_message (message); client.send_message (message);
client.await_ack (); client.await_ack ();
ack_ready = true; ack_ready = true;
@ -494,12 +494,12 @@ TEST (websocket, vote_options_representatives)
// Quick-confirm a block // Quick-confirm a block
nano::keypair key; nano::keypair key;
auto balance = nano::genesis_amount; auto balance = nano::genesis_amount;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto send_amount = node1->config.online_weight_minimum.number () + 1; auto send_amount = node1->config.online_weight_minimum.number () + 1;
auto confirm_block = [&]() { auto confirm_block = [&]() {
nano::block_hash previous (node1->latest (nano::test_genesis_key.pub)); nano::block_hash previous (node1->latest (nano::dev_genesis_key.pub));
balance -= send_amount; balance -= send_amount;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, balance, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, balance, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
node1->process_active (send); node1->process_active (send);
}; };
confirm_block (); confirm_block ();
@ -815,7 +815,7 @@ TEST (websocket, new_unconfirmed_block)
// Process a new block // Process a new block
nano::genesis genesis; nano::genesis genesis;
auto send1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - 1, nano::test_genesis_key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ()))); auto send1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - 1, nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ())));
ASSERT_EQ (nano::process_result::progress, node1->process_local (send1).code); ASSERT_EQ (nano::process_result::progress, node1->process_local (send1).code);
ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready); ASSERT_TIMELY (5s, future.wait_for (0s) == std::future_status::ready);

4
nano/fuzzer_test/fuzz_buffer.cpp
View file

@ -10,7 +10,7 @@
namespace nano namespace nano
{ {
void force_nano_test_network (); void force_nano_dev_network ();
} }
namespace namespace
{ {
@ -62,7 +62,7 @@ void fuzz_message_parser (const uint8_t * Data, size_t Size)
static bool initialized = false; static bool initialized = false;
if (!initialized) if (!initialized)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
initialized = true; initialized = true;
system0 = std::make_shared<nano::system> (1); system0 = std::make_shared<nano::system> (1);
node0 = system0->nodes[0]; node0 = system0->nodes[0];

8
nano/lib/config.cpp
View file

@ -19,13 +19,13 @@ work_thresholds const network_constants::publish_beta (
0xffffe00000000000 // 2x lower than epoch_1 0xffffe00000000000 // 2x lower than epoch_1
); );
work_thresholds const network_constants::publish_test ( work_thresholds const network_constants::publish_dev (
0xfe00000000000000, // Very low for tests 0xfe00000000000000, // Very low for tests
0xffc0000000000000, // 8x higher than epoch_1 0xffc0000000000000, // 8x higher than epoch_1
0xf000000000000000 // 8x lower than epoch_1 0xf000000000000000 // 8x lower than epoch_1
); );
const char * network_constants::active_network_err_msg = "Invalid network. Valid values are live, beta and test."; const char * network_constants::active_network_err_msg = "Invalid network. Valid values are live, test, beta and dev.";
uint8_t get_major_node_version () uint8_t get_major_node_version ()
{ {
@ -44,9 +44,9 @@ uint8_t get_pre_release_node_version ()
return boost::numeric_cast<uint8_t> (boost::lexical_cast<int> (NANO_PRE_RELEASE_VERSION_STRING)); return boost::numeric_cast<uint8_t> (boost::lexical_cast<int> (NANO_PRE_RELEASE_VERSION_STRING));
} }
void force_nano_test_network () void force_nano_dev_network ()
{ {
nano::network_constants::set_active_network (nano::nano_networks::nano_test_network); nano::network_constants::set_active_network (nano::nano_networks::nano_dev_network);
} }
bool running_within_valgrind () bool running_within_valgrind ()

45
nano/lib/config.hpp
View file

@ -28,7 +28,7 @@ const char * const NANO_PRE_RELEASE_VERSION_STRING = xstr (PRE_RELEASE_VERSION_S
const char * const BUILD_INFO = xstr (GIT_COMMIT_HASH BOOST_COMPILER) " \"BOOST " xstr (BOOST_VERSION) "\" BUILT " xstr (__DATE__); const char * const BUILD_INFO = xstr (GIT_COMMIT_HASH BOOST_COMPILER) " \"BOOST " xstr (BOOST_VERSION) "\" BUILT " xstr (__DATE__);
/** Is TSAN/ASAN test build */ /** Is TSAN/ASAN dev build */
#if defined(__has_feature) #if defined(__has_feature)
#if __has_feature(thread_sanitizer) || __has_feature(address_sanitizer) #if __has_feature(thread_sanitizer) || __has_feature(address_sanitizer)
const bool is_sanitizer_build = true; const bool is_sanitizer_build = true;
@ -55,15 +55,18 @@ uint8_t get_pre_release_node_version ();
*/ */
enum class nano_networks enum class nano_networks
{ {
// Low work parameters, publicly known genesis key, test IP ports // Low work parameters, publicly known genesis key, dev IP ports
nano_test_network = 0, nano_dev_network = 0,
rai_test_network = 0, rai_dev_network = 0,
// Normal work parameters, secret beta genesis key, beta IP ports // Normal work parameters, secret beta genesis key, beta IP ports
nano_beta_network = 1, nano_beta_network = 1,
rai_beta_network = 1, rai_beta_network = 1,
// Normal work parameters, secret live key, live IP ports // Normal work parameters, secret live key, live IP ports
nano_live_network = 2, nano_live_network = 2,
rai_live_network = 2, rai_live_network = 2,
// Normal work parameters, secret test genesis key, test IP ports
nano_test_network = 3,
rai_test_network = 3,
}; };
struct work_thresholds struct work_thresholds
@ -101,22 +104,22 @@ public:
network_constants (nano_networks network_a) : network_constants (nano_networks network_a) :
current_network (network_a), current_network (network_a),
publish_thresholds (is_live_network () ? publish_full : is_beta_network () ? publish_beta : publish_test) publish_thresholds ((is_live_network () || is_test_network ()) ? publish_full : is_beta_network () ? publish_beta : publish_dev)
{ {
// A representative is classified as principal based on its weight and this factor // A representative is classified as principal based on its weight and this factor
principal_weight_factor = 1000; // 0.1% principal_weight_factor = 1000; // 0.1%
default_node_port = is_live_network () ? 7075 : is_beta_network () ? 54000 : 44000; default_node_port = is_live_network () ? 7075 : is_beta_network () ? 54000 : is_test_network () ? 17075 : 44000;
default_rpc_port = is_live_network () ? 7076 : is_beta_network () ? 55000 : 45000; default_rpc_port = is_live_network () ? 7076 : is_beta_network () ? 55000 : is_test_network () ? 17076 : 45000;
default_ipc_port = is_live_network () ? 7077 : is_beta_network () ? 56000 : 46000; default_ipc_port = is_live_network () ? 7077 : is_beta_network () ? 56000 : is_test_network () ? 17077 : 46000;
default_websocket_port = is_live_network () ? 7078 : is_beta_network () ? 57000 : 47000; default_websocket_port = is_live_network () ? 7078 : is_beta_network () ? 57000 : is_test_network () ? 17078 : 47000;
request_interval_ms = is_test_network () ? 20 : 500; request_interval_ms = is_dev_network () ? 20 : 500;
} }
/** Network work thresholds. Define these inline as constexpr when moving to cpp17. */ /** Network work thresholds. Define these inline as constexpr when moving to cpp17. */
static const nano::work_thresholds publish_full; static const nano::work_thresholds publish_full;
static const nano::work_thresholds publish_beta; static const nano::work_thresholds publish_beta;
static const nano::work_thresholds publish_test; static const nano::work_thresholds publish_dev;
/** Error message when an invalid network is specified */ /** Error message when an invalid network is specified */
static const char * active_network_err_msg; static const char * active_network_err_msg;
@ -151,7 +154,7 @@ public:
/** /**
* Optionally called on startup to override the global active network. * Optionally called on startup to override the global active network.
* If not called, the compile-time option will be used. * If not called, the compile-time option will be used.
* @param network_a The new active network. Valid values are "live", "beta" and "test" * @param network_a The new active network. Valid values are "live", "beta" and "dev"
*/ */
static bool set_active_network (std::string network_a) static bool set_active_network (std::string network_a)
{ {
@ -164,6 +167,10 @@ public:
{ {
active_network = nano::nano_networks::nano_beta_network; active_network = nano::nano_networks::nano_beta_network;
} }
else if (network_a == "dev")
{
active_network = nano::nano_networks::nano_dev_network;
}
else if (network_a == "test") else if (network_a == "test")
{ {
active_network = nano::nano_networks::nano_test_network; active_network = nano::nano_networks::nano_test_network;
@ -177,7 +184,7 @@ public:
const char * get_current_network_as_string () const const char * get_current_network_as_string () const
{ {
return is_live_network () ? "live" : is_beta_network () ? "beta" : "test"; return is_live_network () ? "live" : is_beta_network () ? "beta" : is_test_network () ? "test" : "dev";
} }
bool is_live_network () const bool is_live_network () const
@ -188,6 +195,10 @@ public:
{ {
return current_network == nano_networks::nano_beta_network; return current_network == nano_networks::nano_beta_network;
} }
bool is_dev_network () const
{
return current_network == nano_networks::nano_dev_network;
}
bool is_test_network () const bool is_test_network () const
{ {
return current_network == nano_networks::nano_test_network; return current_network == nano_networks::nano_test_network;
@ -204,12 +215,12 @@ std::string get_rpc_toml_config_path (boost::filesystem::path const & data_path)
std::string get_access_toml_config_path (boost::filesystem::path const & data_path); std::string get_access_toml_config_path (boost::filesystem::path const & data_path);
std::string get_qtwallet_toml_config_path (boost::filesystem::path const & data_path); std::string get_qtwallet_toml_config_path (boost::filesystem::path const & data_path);
/** Called by gtest_main to enforce test network */ /** Called by gtest_main to enforce dev network */
void force_nano_test_network (); void force_nano_dev_network ();
/** Checks if we are running inside a valgrind instance */ /** Checks if we are running inside a valgrind instance */
bool running_within_valgrind (); bool running_within_valgrind ();
/** Set the active network to the test network */ /** Set the active network to the dev network */
void force_nano_test_network (); void force_nano_dev_network ();
} }

2
nano/lib/lmdbconfig.cpp
View file

@ -37,7 +37,7 @@ nano::error nano::lmdb_config::deserialize_toml (nano::tomlconfig & toml, bool i
toml.get_optional<size_t> ("map_size", map_size); toml.get_optional<size_t> ("map_size", map_size);
// For now we accept either setting, but not both // For now we accept either setting, but not both
if (!params.network.is_test_network () && is_deprecated_lmdb_dbs_used && default_max_databases != max_databases) if (!params.network.is_dev_network () && is_deprecated_lmdb_dbs_used && default_max_databases != max_databases)
{ {
toml.get_error ().set ("Both the deprecated node.lmdb_max_dbs and the new node.lmdb.max_databases setting are used. Please use max_databases only."); toml.get_error ().set ("Both the deprecated node.lmdb_max_dbs and the new node.lmdb.max_databases setting are used. Please use max_databases only.");
} }

2
nano/lib/rpcconfig.hpp
View file

@ -53,7 +53,7 @@ public:
unsigned io_threads{ (4 < std::thread::hardware_concurrency ()) ? std::thread::hardware_concurrency () : 4 }; unsigned io_threads{ (4 < std::thread::hardware_concurrency ()) ? std::thread::hardware_concurrency () : 4 };
std::string ipc_address; std::string ipc_address;
uint16_t ipc_port{ network_constants.default_ipc_port }; uint16_t ipc_port{ network_constants.default_ipc_port };
unsigned num_ipc_connections{ network_constants.is_live_network () ? 8u : network_constants.is_beta_network () ? 4u : 1u }; unsigned num_ipc_connections{ (network_constants.is_live_network () || network_constants.is_test_network ()) ? 8u : network_constants.is_beta_network () ? 4u : 1u };
static unsigned json_version () static unsigned json_version ()
{ {
return 1; return 1;

8
nano/lib/work.cpp
View file

@ -136,7 +136,7 @@ uint64_t nano::work_v1::value (nano::root const & root_a, uint64_t work_a)
uint64_t nano::work_v1::value (nano::root const & root_a, uint64_t work_a) uint64_t nano::work_v1::value (nano::root const & root_a, uint64_t work_a)
{ {
static nano::network_constants network_constants; static nano::network_constants network_constants;
if (!network_constants.is_test_network ()) if (!network_constants.is_dev_network ())
{ {
debug_assert (false); debug_assert (false);
std::exit (1); std::exit (1);
@ -199,7 +199,7 @@ opencl (opencl_a)
static_assert (ATOMIC_INT_LOCK_FREE == 2, "Atomic int needed"); static_assert (ATOMIC_INT_LOCK_FREE == 2, "Atomic int needed");
boost::thread::attributes attrs; boost::thread::attributes attrs;
nano::thread_attributes::set (attrs); nano::thread_attributes::set (attrs);
auto count (network_constants.is_test_network () ? std::min (max_threads_a, 1u) : std::min (max_threads_a, std::max (1u, boost::thread::hardware_concurrency ()))); auto count (network_constants.is_dev_network () ? std::min (max_threads_a, 1u) : std::min (max_threads_a, std::max (1u, boost::thread::hardware_concurrency ())));
if (opencl) if (opencl)
{ {
// One thread to handle OpenCL // One thread to handle OpenCL
@ -368,14 +368,14 @@ void nano::work_pool::generate (nano::work_version const version_a, nano::root c
boost::optional<uint64_t> nano::work_pool::generate (nano::root const & root_a) boost::optional<uint64_t> nano::work_pool::generate (nano::root const & root_a)
{ {
static nano::network_constants network_constants; static nano::network_constants network_constants;
debug_assert (network_constants.is_test_network ()); debug_assert (network_constants.is_dev_network ());
return generate (nano::work_version::work_1, root_a, network_constants.publish_thresholds.base); return generate (nano::work_version::work_1, root_a, network_constants.publish_thresholds.base);
} }
boost::optional<uint64_t> nano::work_pool::generate (nano::root const & root_a, uint64_t difficulty_a) boost::optional<uint64_t> nano::work_pool::generate (nano::root const & root_a, uint64_t difficulty_a)
{ {
static nano::network_constants network_constants; static nano::network_constants network_constants;
debug_assert (network_constants.is_test_network ()); debug_assert (network_constants.is_dev_network ());
return generate (nano::work_version::work_1, root_a, difficulty_a); return generate (nano::work_version::work_1, root_a, difficulty_a);
} }

6
nano/load_test/entry.cpp
View file

@ -29,7 +29,7 @@ using socket_type = boost::asio::basic_stream_socket<boost::asio::ip::tcp, boost
namespace nano namespace nano
{ {
void force_nano_test_network (); void force_nano_dev_network ();
} }
namespace beast = boost::beast; namespace beast = boost::beast;
@ -419,7 +419,7 @@ account_info account_info_rpc (boost::asio::io_context & ioc, tcp::resolver::res
/** This launches a node and fires a lot of send/recieve RPC requests at it (configurable), then other nodes are tested to make sure they observe these blocks as well. */ /** This launches a node and fires a lot of send/recieve RPC requests at it (configurable), then other nodes are tested to make sure they observe these blocks as well. */
int main (int argc, char * const * argv) int main (int argc, char * const * argv)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
boost::program_options::options_description description ("Command line options"); boost::program_options::options_description description ("Command line options");
@ -572,7 +572,7 @@ int main (int argc, char * const * argv)
std::string wallet = wallet_create_rpc (ioc, primary_node_results); std::string wallet = wallet_create_rpc (ioc, primary_node_results);
// Add genesis account to it // Add genesis account to it
wallet_add_rpc (ioc, primary_node_results, wallet, nano::test_genesis_key.prv.data.to_string ()); wallet_add_rpc (ioc, primary_node_results, wallet, nano::dev_genesis_key.prv.data.to_string ());
// Add destination accounts // Add destination accounts
for (auto & account : destination_accounts) for (auto & account : destination_accounts)

56
nano/nano_node/entry.cpp
View file

@ -89,9 +89,9 @@ int main (int argc, char * const * argv)
("debug_verify_profile_batch", "Profile batch signature verification") ("debug_verify_profile_batch", "Profile batch signature verification")
("debug_profile_bootstrap", "Profile bootstrap style blocks processing (at least 10GB of free storage space required)") ("debug_profile_bootstrap", "Profile bootstrap style blocks processing (at least 10GB of free storage space required)")
("debug_profile_sign", "Profile signature generation") ("debug_profile_sign", "Profile signature generation")
("debug_profile_process", "Profile active blocks processing (only for nano_test_network)") ("debug_profile_process", "Profile active blocks processing (only for nano_dev_network)")
("debug_profile_votes", "Profile votes processing (only for nano_test_network)") ("debug_profile_votes", "Profile votes processing (only for nano_dev_network)")
("debug_profile_frontiers_confirmation", "Profile frontiers confirmation speed (only for nano_test_network)") ("debug_profile_frontiers_confirmation", "Profile frontiers confirmation speed (only for nano_dev_network)")
("debug_random_feed", "Generates output to RNG test suites") ("debug_random_feed", "Generates output to RNG test suites")
("debug_rpc", "Read an RPC command from stdin and invoke it. Network operations will have no effect.") ("debug_rpc", "Read an RPC command from stdin and invoke it. Network operations will have no effect.")
("debug_peers", "Display peer IPv6:port connections") ("debug_peers", "Display peer IPv6:port connections")
@ -165,7 +165,7 @@ int main (int argc, char * const * argv)
} }
else if (vm.count ("compare_rep_weights")) else if (vm.count ("compare_rep_weights"))
{ {
if (!nano::network_constants ().is_test_network ()) if (!nano::network_constants ().is_dev_network ())
{ {
auto node_flags = nano::inactive_node_flag_defaults (); auto node_flags = nano::inactive_node_flag_defaults ();
nano::update_flags (node_flags, vm); nano::update_flags (node_flags, vm);
@ -901,8 +901,8 @@ int main (int argc, char * const * argv)
} }
else if (vm.count ("debug_profile_process")) else if (vm.count ("debug_profile_process"))
{ {
nano::network_constants::set_active_network (nano::nano_networks::nano_test_network); nano::network_constants::set_active_network (nano::nano_networks::nano_dev_network);
nano::network_params test_params; nano::network_params dev_params;
nano::block_builder builder; nano::block_builder builder;
size_t num_accounts (100000); size_t num_accounts (100000);
size_t num_iterations (5); // 100,000 * 5 * 2 = 1,000,000 blocks size_t num_iterations (5); // 100,000 * 5 * 2 = 1,000,000 blocks
@ -917,7 +917,7 @@ int main (int argc, char * const * argv)
nano::node_flags node_flags; nano::node_flags node_flags;
nano::update_flags (node_flags, vm); nano::update_flags (node_flags, vm);
auto node (std::make_shared<nano::node> (io_ctx, 24001, path, alarm, logging, work, node_flags)); auto node (std::make_shared<nano::node> (io_ctx, 24001, path, alarm, logging, work, node_flags));
nano::block_hash genesis_latest (node->latest (test_params.ledger.test_genesis_key.pub)); nano::block_hash genesis_latest (node->latest (dev_params.ledger.dev_genesis_key.pub));
nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ()); nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ());
// Generating keys // Generating keys
std::vector<nano::keypair> keys (num_accounts); std::vector<nano::keypair> keys (num_accounts);
@ -930,12 +930,12 @@ int main (int argc, char * const * argv)
genesis_balance = genesis_balance - 1000000000; genesis_balance = genesis_balance - 1000000000;
auto send = builder.state () auto send = builder.state ()
.account (test_params.ledger.test_genesis_key.pub) .account (dev_params.ledger.dev_genesis_key.pub)
.previous (genesis_latest) .previous (genesis_latest)
.representative (test_params.ledger.test_genesis_key.pub) .representative (dev_params.ledger.dev_genesis_key.pub)
.balance (genesis_balance) .balance (genesis_balance)
.link (keys[i].pub) .link (keys[i].pub)
.sign (test_params.ledger.test_genesis_key.prv, test_params.ledger.test_genesis_key.pub) .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub)
.work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1))
.build (); .build ();
@ -1027,8 +1027,8 @@ int main (int argc, char * const * argv)
} }
else if (vm.count ("debug_profile_votes")) else if (vm.count ("debug_profile_votes"))
{ {
nano::network_constants::set_active_network (nano::nano_networks::nano_test_network); nano::network_constants::set_active_network (nano::nano_networks::nano_dev_network);
nano::network_params test_params; nano::network_params dev_params;
nano::block_builder builder; nano::block_builder builder;
size_t num_elections (40000); size_t num_elections (40000);
size_t num_representatives (25); size_t num_representatives (25);
@ -1041,7 +1041,7 @@ int main (int argc, char * const * argv)
auto path (nano::unique_path ()); auto path (nano::unique_path ());
logging.init (path); logging.init (path);
auto node (std::make_shared<nano::node> (io_ctx, 24001, path, alarm, logging, work)); auto node (std::make_shared<nano::node> (io_ctx, 24001, path, alarm, logging, work));
nano::block_hash genesis_latest (node->latest (test_params.ledger.test_genesis_key.pub)); nano::block_hash genesis_latest (node->latest (dev_params.ledger.dev_genesis_key.pub));
nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ()); nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ());
// Generating keys // Generating keys
std::vector<nano::keypair> keys (num_representatives); std::vector<nano::keypair> keys (num_representatives);
@ -1052,12 +1052,12 @@ int main (int argc, char * const * argv)
genesis_balance = genesis_balance - balance; genesis_balance = genesis_balance - balance;
auto send = builder.state () auto send = builder.state ()
.account (test_params.ledger.test_genesis_key.pub) .account (dev_params.ledger.dev_genesis_key.pub)
.previous (genesis_latest) .previous (genesis_latest)
.representative (test_params.ledger.test_genesis_key.pub) .representative (dev_params.ledger.dev_genesis_key.pub)
.balance (genesis_balance) .balance (genesis_balance)
.link (keys[i].pub) .link (keys[i].pub)
.sign (test_params.ledger.test_genesis_key.prv, test_params.ledger.test_genesis_key.pub) .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub)
.work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1))
.build (); .build ();
@ -1084,12 +1084,12 @@ int main (int argc, char * const * argv)
nano::keypair destination; nano::keypair destination;
auto send = builder.state () auto send = builder.state ()
.account (test_params.ledger.test_genesis_key.pub) .account (dev_params.ledger.dev_genesis_key.pub)
.previous (genesis_latest) .previous (genesis_latest)
.representative (test_params.ledger.test_genesis_key.pub) .representative (dev_params.ledger.dev_genesis_key.pub)
.balance (genesis_balance) .balance (genesis_balance)
.link (destination.pub) .link (destination.pub)
.sign (test_params.ledger.test_genesis_key.prv, test_params.ledger.test_genesis_key.pub) .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub)
.work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1)) .work (*work.generate (nano::work_version::work_1, genesis_latest, node->network_params.network.publish_thresholds.epoch_1))
.build (); .build ();
@ -1137,8 +1137,8 @@ int main (int argc, char * const * argv)
} }
else if (vm.count ("debug_profile_frontiers_confirmation")) else if (vm.count ("debug_profile_frontiers_confirmation"))
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::network_params test_params; nano::network_params dev_params;
nano::block_builder builder; nano::block_builder builder;
size_t count (32 * 1024); size_t count (32 * 1024);
auto count_it = vm.find ("count"); auto count_it = vm.find ("count");
@ -1171,7 +1171,7 @@ int main (int argc, char * const * argv)
flags.disable_wallet_bootstrap = true; flags.disable_wallet_bootstrap = true;
flags.disable_bootstrap_listener = true; flags.disable_bootstrap_listener = true;
auto node1 (std::make_shared<nano::node> (io_ctx1, path1, alarm1, config1, work, flags, 0)); auto node1 (std::make_shared<nano::node> (io_ctx1, path1, alarm1, config1, work, flags, 0));
nano::block_hash genesis_latest (node1->latest (test_params.ledger.test_genesis_key.pub)); nano::block_hash genesis_latest (node1->latest (dev_params.ledger.dev_genesis_key.pub));
nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ()); nano::uint128_t genesis_balance (std::numeric_limits<nano::uint128_t>::max ());
// Generating blocks // Generating blocks
std::deque<std::shared_ptr<nano::block>> blocks; std::deque<std::shared_ptr<nano::block>> blocks;
@ -1181,13 +1181,13 @@ int main (int argc, char * const * argv)
genesis_balance = genesis_balance - 1; genesis_balance = genesis_balance - 1;
auto send = builder.state () auto send = builder.state ()
.account (test_params.ledger.test_genesis_key.pub) .account (dev_params.ledger.dev_genesis_key.pub)
.previous (genesis_latest) .previous (genesis_latest)
.representative (test_params.ledger.test_genesis_key.pub) .representative (dev_params.ledger.dev_genesis_key.pub)
.balance (genesis_balance) .balance (genesis_balance)
.link (key.pub) .link (key.pub)
.sign (test_params.ledger.test_genesis_key.prv, test_params.ledger.test_genesis_key.pub) .sign (dev_params.ledger.dev_genesis_key.prv, dev_params.ledger.dev_genesis_key.pub)
.work (*work.generate (nano::work_version::work_1, genesis_latest, test_params.network.publish_thresholds.epoch_1)) .work (*work.generate (nano::work_version::work_1, genesis_latest, dev_params.network.publish_thresholds.epoch_1))
.build (); .build ();
genesis_latest = send->hash (); genesis_latest = send->hash ();
@ -1199,7 +1199,7 @@ int main (int argc, char * const * argv)
.balance (1) .balance (1)
.link (genesis_latest) .link (genesis_latest)
.sign (key.prv, key.pub) .sign (key.prv, key.pub)
.work (*work.generate (nano::work_version::work_1, key.pub, test_params.network.publish_thresholds.epoch_1)) .work (*work.generate (nano::work_version::work_1, key.pub, dev_params.network.publish_thresholds.epoch_1))
.build (); .build ();
blocks.push_back (std::move (send)); blocks.push_back (std::move (send));
@ -1290,7 +1290,7 @@ int main (int argc, char * const * argv)
// Insert representative // Insert representative
std::cout << "Initializing representative\n"; std::cout << "Initializing representative\n";
auto wallet (node1->wallets.create (nano::random_wallet_id ())); auto wallet (node1->wallets.create (nano::random_wallet_id ()));
wallet->insert_adhoc (test_params.ledger.test_genesis_key.prv); wallet->insert_adhoc (dev_params.ledger.dev_genesis_key.prv);
node2->network.merge_peer (node1->network.endpoint ()); node2->network.merge_peer (node1->network.endpoint ());
while (node2->rep_crawler.representative_count () == 0) while (node2->rep_crawler.representative_count () == 0)
{ {

2
nano/nano_rpc/entry.cpp
View file

@ -94,7 +94,7 @@ int main (int argc, char * const * argv)
("config", boost::program_options::value<std::vector<nano::config_key_value_pair>>()->multitoken(), "Pass RPC configuration values. This takes precedence over any values in the configuration file. This option can be repeated multiple times.") ("config", boost::program_options::value<std::vector<nano::config_key_value_pair>>()->multitoken(), "Pass RPC configuration values. This takes precedence over any values in the configuration file. This option can be repeated multiple times.")
("daemon", "Start RPC daemon") ("daemon", "Start RPC daemon")
("data_path", boost::program_options::value<std::string> (), "Use the supplied path as the data directory") ("data_path", boost::program_options::value<std::string> (), "Use the supplied path as the data directory")
("network", boost::program_options::value<std::string> (), "Use the supplied network (live, beta or test)") ("network", boost::program_options::value<std::string> (), "Use the supplied network (live, test, beta or dev)")
("version", "Prints out version"); ("version", "Prints out version");
// clang-format on // clang-format on

20
nano/node/active_transactions.cpp
View file

@ -21,8 +21,8 @@ node (node_a),
multipliers_cb (20, 1.), multipliers_cb (20, 1.),
trended_active_multiplier (1.0), trended_active_multiplier (1.0),
generator (node_a.config, node_a.ledger, node_a.wallets, node_a.vote_processor, node_a.history, node_a.network), generator (node_a.config, node_a.ledger, node_a.wallets, node_a.vote_processor, node_a.history, node_a.network),
check_all_elections_period (node_a.network_params.network.is_test_network () ? 10ms : 5s), check_all_elections_period (node_a.network_params.network.is_dev_network () ? 10ms : 5s),
election_time_to_live (node_a.network_params.network.is_test_network () ? 0s : 2s), election_time_to_live (node_a.network_params.network.is_dev_network () ? 0s : 2s),
prioritized_cutoff (std::max<size_t> (1, node_a.config.active_elections_size / 10)), prioritized_cutoff (std::max<size_t> (1, node_a.config.active_elections_size / 10)),
thread ([this]() { thread ([this]() {
nano::thread_role::set (nano::thread_role::name::request_loop); nano::thread_role::set (nano::thread_role::name::request_loop);
@ -56,7 +56,7 @@ void nano::active_transactions::confirm_prioritized_frontiers (nano::transaction
bool half_princpal_representative (representative && rep_counts.half_principal > 0); bool half_princpal_representative (representative && rep_counts.half_principal > 0);
/* Check less frequently for regular nodes in auto mode */ /* Check less frequently for regular nodes in auto mode */
bool agressive_mode (half_princpal_representative || node.config.frontiers_confirmation == nano::frontiers_confirmation_mode::always); bool agressive_mode (half_princpal_representative || node.config.frontiers_confirmation == nano::frontiers_confirmation_mode::always);
auto is_test_network = node.network_params.network.is_test_network (); auto is_dev_network = node.network_params.network.is_dev_network ();
auto roots_size = size (); auto roots_size = size ();
auto check_time_exceeded = std::chrono::steady_clock::now () >= next_frontier_check; auto check_time_exceeded = std::chrono::steady_clock::now () >= next_frontier_check;
auto max_elections = 1000ull; auto max_elections = 1000ull;
@ -64,7 +64,7 @@ void nano::active_transactions::confirm_prioritized_frontiers (nano::transaction
bool wallets_check_required = (!skip_wallets || !priority_wallet_cementable_frontiers.empty ()) && !agressive_mode; bool wallets_check_required = (!skip_wallets || !priority_wallet_cementable_frontiers.empty ()) && !agressive_mode;
// Minimise dropping real-time transactions, set the number of frontiers added to a factor of the maximum number of possible active elections // Minimise dropping real-time transactions, set the number of frontiers added to a factor of the maximum number of possible active elections
auto max_active = node.config.active_elections_size / 20; auto max_active = node.config.active_elections_size / 20;
if (roots_size <= max_active && (check_time_exceeded || wallets_check_required || (!is_test_network && low_active_elections && agressive_mode))) if (roots_size <= max_active && (check_time_exceeded || wallets_check_required || (!is_dev_network && low_active_elections && agressive_mode)))
{ {
// When the number of active elections is low increase max number of elections for setting confirmation height. // When the number of active elections is low increase max number of elections for setting confirmation height.
if (max_active > roots_size + max_elections) if (max_active > roots_size + max_elections)
@ -112,10 +112,10 @@ void nano::active_transactions::confirm_prioritized_frontiers (nano::transaction
auto request_interval (std::chrono::milliseconds (node.network_params.network.request_interval_ms)); auto request_interval (std::chrono::milliseconds (node.network_params.network.request_interval_ms));
auto rel_time_next_frontier_check = request_interval * (agressive_mode ? 20 : 60); auto rel_time_next_frontier_check = request_interval * (agressive_mode ? 20 : 60);
// Decrease check time for test network // Decrease check time for dev network
int test_network_factor = is_test_network ? 1000 : 1; int dev_network_factor = is_dev_network ? 1000 : 1;
next_frontier_check = steady_clock::now () + (rel_time_next_frontier_check / test_network_factor); next_frontier_check = steady_clock::now () + (rel_time_next_frontier_check / dev_network_factor);
} }
} }
@ -301,7 +301,7 @@ void nano::active_transactions::frontiers_confirmation (nano::unique_lock<std::m
auto time_spent_prioritizing_wallet_accounts = request_interval / 250; auto time_spent_prioritizing_wallet_accounts = request_interval / 250;
lock_a.unlock (); lock_a.unlock ();
auto transaction = node.store.tx_begin_read (); auto transaction = node.store.tx_begin_read ();
prioritize_frontiers_for_confirmation (transaction, node.network_params.network.is_test_network () ? std::chrono::milliseconds (50) : time_spent_prioritizing_ledger_accounts, time_spent_prioritizing_wallet_accounts); prioritize_frontiers_for_confirmation (transaction, node.network_params.network.is_dev_network () ? std::chrono::milliseconds (50) : time_spent_prioritizing_ledger_accounts, time_spent_prioritizing_wallet_accounts);
confirm_prioritized_frontiers (transaction); confirm_prioritized_frontiers (transaction);
lock_a.lock (); lock_a.lock ();
} }
@ -1015,7 +1015,7 @@ void nano::active_transactions::update_active_multiplier (nano::unique_lock<std:
last_prioritized_multiplier.reset (); last_prioritized_multiplier.reset ();
double multiplier (1.); double multiplier (1.);
// Heurestic to filter out non-saturated network and frontier confirmation // Heurestic to filter out non-saturated network and frontier confirmation
if (roots.size () >= prioritized_cutoff || (node.network_params.network.is_test_network () && !roots.empty ())) if (roots.size () >= prioritized_cutoff || (node.network_params.network.is_dev_network () && !roots.empty ()))
{ {
auto & sorted_roots = roots.get<tag_difficulty> (); auto & sorted_roots = roots.get<tag_difficulty> ();
std::vector<double> prioritized; std::vector<double> prioritized;
@ -1027,7 +1027,7 @@ void nano::active_transactions::update_active_multiplier (nano::unique_lock<std:
prioritized.push_back (it->adjusted_multiplier); prioritized.push_back (it->adjusted_multiplier);
} }
} }
if (prioritized.size () > 10 || (node.network_params.network.is_test_network () && !prioritized.empty ())) if (prioritized.size () > 10 || (node.network_params.network.is_dev_network () && !prioritized.empty ()))
{ {
multiplier = prioritized[prioritized.size () / 2]; multiplier = prioritized[prioritized.size () / 2];
} }

2
nano/node/active_transactions.hpp
View file

@ -272,7 +272,7 @@ private:
friend std::unique_ptr<container_info_component> collect_container_info (active_transactions &, const std::string &); friend std::unique_ptr<container_info_component> collect_container_info (active_transactions &, const std::string &);
friend class active_transactions_activate_dependencies_invalid_Test; friend class active_transactions_activate_dependencies_invalid_Test;
friend class active_transactions_dropped_cleanup_Test; friend class active_transactions_dropped_cleanup_dev;
friend class active_transactions_vote_replays_Test; friend class active_transactions_vote_replays_Test;
friend class confirmation_height_prioritize_frontiers_Test; friend class confirmation_height_prioritize_frontiers_Test;
friend class confirmation_height_prioritize_frontiers_overwrite_Test; friend class confirmation_height_prioritize_frontiers_overwrite_Test;

2
nano/node/bootstrap/bootstrap.hpp
View file

@ -132,7 +132,7 @@ public:
static constexpr double required_frontier_confirmation_ratio = 0.8; static constexpr double required_frontier_confirmation_ratio = 0.8;
static constexpr unsigned frontier_confirmation_blocks_limit = 128 * 1024; static constexpr unsigned frontier_confirmation_blocks_limit = 128 * 1024;
static constexpr unsigned requeued_pulls_limit = 256; static constexpr unsigned requeued_pulls_limit = 256;
static constexpr unsigned requeued_pulls_limit_test = 2; static constexpr unsigned requeued_pulls_limit_dev = 2;
static constexpr unsigned requeued_pulls_processed_blocks_factor = 4096; static constexpr unsigned requeued_pulls_processed_blocks_factor = 4096;
static constexpr unsigned bulk_push_cost_limit = 200; static constexpr unsigned bulk_push_cost_limit = 200;
static constexpr std::chrono::seconds lazy_flush_delay_sec = std::chrono::seconds (5); static constexpr std::chrono::seconds lazy_flush_delay_sec = std::chrono::seconds (5);

6
nano/node/bootstrap/bootstrap_attempt.cpp
View file

@ -16,7 +16,7 @@ constexpr size_t nano::bootstrap_limits::bootstrap_max_confirm_frontiers;
constexpr double nano::bootstrap_limits::required_frontier_confirmation_ratio; constexpr double nano::bootstrap_limits::required_frontier_confirmation_ratio;
constexpr unsigned nano::bootstrap_limits::frontier_confirmation_blocks_limit; constexpr unsigned nano::bootstrap_limits::frontier_confirmation_blocks_limit;
constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit; constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit;
constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit_test; constexpr unsigned nano::bootstrap_limits::requeued_pulls_limit_dev;
nano::bootstrap_attempt::bootstrap_attempt (std::shared_ptr<nano::node> node_a, nano::bootstrap_mode mode_a, uint64_t incremental_id_a, std::string id_a) : nano::bootstrap_attempt::bootstrap_attempt (std::shared_ptr<nano::node> node_a, nano::bootstrap_mode mode_a, uint64_t incremental_id_a, std::string id_a) :
node (node_a), node (node_a),
@ -320,7 +320,7 @@ void nano::bootstrap_attempt_legacy::restart_condition ()
- not completed frontiers confirmation - not completed frontiers confirmation
- more than 256 pull retries usually indicating issues with requested pulls - more than 256 pull retries usually indicating issues with requested pulls
- or 128k processed blocks indicating large bootstrap */ - or 128k processed blocks indicating large bootstrap */
if (!frontiers_confirmation_pending && !frontiers_confirmed && (requeued_pulls > (!node->network_params.network.is_test_network () ? nano::bootstrap_limits::requeued_pulls_limit : nano::bootstrap_limits::requeued_pulls_limit_test) || total_blocks > nano::bootstrap_limits::frontier_confirmation_blocks_limit)) if (!frontiers_confirmation_pending && !frontiers_confirmed && (requeued_pulls > (!node->network_params.network.is_dev_network () ? nano::bootstrap_limits::requeued_pulls_limit : nano::bootstrap_limits::requeued_pulls_limit_dev) || total_blocks > nano::bootstrap_limits::frontier_confirmation_blocks_limit))
{ {
frontiers_confirmation_pending = true; frontiers_confirmation_pending = true;
} }
@ -485,7 +485,7 @@ bool nano::bootstrap_attempt_legacy::confirm_frontiers (nano::unique_lock<std::m
else if (i < max_requests) else if (i < max_requests)
{ {
node->network.broadcast_confirm_req_batched_many (batched_confirm_req_bundle); node->network.broadcast_confirm_req_batched_many (batched_confirm_req_bundle);
std::this_thread::sleep_for (std::chrono::milliseconds (!node->network_params.network.is_test_network () ? 500 : 5)); std::this_thread::sleep_for (std::chrono::milliseconds (!node->network_params.network.is_dev_network () ? 500 : 5));
} }
} }
if (!confirmed) if (!confirmed)

2
nano/node/cli.cpp
View file

@ -48,7 +48,7 @@ void nano::add_node_options (boost::program_options::options_description & descr
("vacuum", "Compact database. If data_path is missing, the database in data directory is compacted.") ("vacuum", "Compact database. If data_path is missing, the database in data directory is compacted.")
("snapshot", "Compact database and create snapshot, functions similar to vacuum but does not replace the existing database") ("snapshot", "Compact database and create snapshot, functions similar to vacuum but does not replace the existing database")
("data_path", boost::program_options::value<std::string> (), "Use the supplied path as the data directory") ("data_path", boost::program_options::value<std::string> (), "Use the supplied path as the data directory")
("network", boost::program_options::value<std::string> (), "Use the supplied network (live, beta or test)") ("network", boost::program_options::value<std::string> (), "Use the supplied network (live, test, beta or dev)")
("clear_send_ids", "Remove all send IDs from the database (dangerous: not intended for production use)") ("clear_send_ids", "Remove all send IDs from the database (dangerous: not intended for production use)")
("online_weight_clear", "Clear online weight history records") ("online_weight_clear", "Clear online weight history records")
("peer_clear", "Clear online peers database dump") ("peer_clear", "Clear online peers database dump")

4
nano/node/common.cpp
View file

@ -16,7 +16,7 @@ std::bitset<16> constexpr nano::message_header::block_type_mask;
std::bitset<16> constexpr nano::message_header::count_mask; std::bitset<16> constexpr nano::message_header::count_mask;
std::bitset<16> constexpr nano::message_header::telemetry_size_mask; std::bitset<16> constexpr nano::message_header::telemetry_size_mask;
std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::test; std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::dev;
std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::beta; std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::beta;
std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::live; std::chrono::seconds constexpr nano::telemetry_cache_cutoffs::live;
@ -1536,7 +1536,7 @@ bool nano::parse_tcp_endpoint (std::string const & string, nano::tcp_endpoint &
std::chrono::seconds nano::telemetry_cache_cutoffs::network_to_time (network_constants const & network_constants) std::chrono::seconds nano::telemetry_cache_cutoffs::network_to_time (network_constants const & network_constants)
{ {
return std::chrono::seconds{ network_constants.is_live_network () ? live : network_constants.is_beta_network () ? beta : test }; return std::chrono::seconds{ (network_constants.is_live_network () || network_constants.is_test_network ()) ? live : network_constants.is_beta_network () ? beta : dev };
} }
nano::node_singleton_memory_pool_purge_guard::node_singleton_memory_pool_purge_guard () : nano::node_singleton_memory_pool_purge_guard::node_singleton_memory_pool_purge_guard () :

2
nano/node/common.hpp
View file

@ -475,7 +475,7 @@ public:
class telemetry_cache_cutoffs class telemetry_cache_cutoffs
{ {
public: public:
static std::chrono::seconds constexpr test{ 3 }; static std::chrono::seconds constexpr dev{ 3 };
static std::chrono::seconds constexpr beta{ 15 }; static std::chrono::seconds constexpr beta{ 15 };
static std::chrono::seconds constexpr live{ 60 }; static std::chrono::seconds constexpr live{ 60 };

4
nano/node/confirmation_height_bounded.cpp
View file

@ -442,7 +442,7 @@ void nano::confirmation_height_bounded::cement_blocks (nano::write_guard & scope
logger.always_log (boost::str (boost::format ("Cemented %1% blocks in %2% %3% (bounded processor)") % cemented_blocks.size () % time_spent_cementing % cemented_batch_timer.unit ())); logger.always_log (boost::str (boost::format ("Cemented %1% blocks in %2% %3% (bounded processor)") % cemented_blocks.size () % time_spent_cementing % cemented_batch_timer.unit ()));
// Update the maximum amount of blocks to write next time based on the time it took to cement this batch. // Update the maximum amount of blocks to write next time based on the time it took to cement this batch.
if (!network_params.network.is_test_network ()) if (!network_params.network.is_dev_network ())
{ {
if (time_spent_cementing > maximum_batch_write_time) if (time_spent_cementing > maximum_batch_write_time)
{ {
@ -519,7 +519,7 @@ void nano::confirmation_height_bounded::cement_blocks (nano::write_guard & scope
} }
release_assert (!error); release_assert (!error);
// Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though // Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though
if (!network_params.network.is_test_network ()) if (!network_params.network.is_dev_network ())
{ {
// Bail if there was an error. This indicates that there was a fatal issue with the ledger // Bail if there was an error. This indicates that there was a fatal issue with the ledger
// (the blocks probably got rolled back when they shouldn't have). // (the blocks probably got rolled back when they shouldn't have).

6
nano/node/confirmation_height_unbounded.cpp
View file

@ -358,8 +358,8 @@ void nano::confirmation_height_unbounded::cement_blocks (nano::write_guard & sco
if (!error && pending.height > confirmation_height) if (!error && pending.height > confirmation_height)
{ {
auto block = ledger.store.block_get (transaction, pending.hash); auto block = ledger.store.block_get (transaction, pending.hash);
debug_assert (network_params.network.is_test_network () || block != nullptr); debug_assert (network_params.network.is_dev_network () || block != nullptr);
debug_assert (network_params.network.is_test_network () || block->sideband ().height == pending.height); debug_assert (network_params.network.is_dev_network () || block->sideband ().height == pending.height);
if (!block) if (!block)
{ {
@ -401,7 +401,7 @@ void nano::confirmation_height_unbounded::cement_blocks (nano::write_guard & sco
release_assert (!error); release_assert (!error);
// Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though // Tests should check this already at the end, but not all blocks may have elections (e.g from manual calls to confirmation_height_processor::add), this should catch any inconsistencies on live/beta though
if (!network_params.network.is_test_network ()) if (!network_params.network.is_dev_network ())
{ {
auto blocks_confirmed_stats = ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed); auto blocks_confirmed_stats = ledger.stats.count (nano::stat::type::confirmation_height, nano::stat::detail::blocks_confirmed);
auto observer_stats = ledger.stats.count (nano::stat::type::confirmation_observer, nano::stat::detail::all, nano::stat::dir::out); auto observer_stats = ledger.stats.count (nano::stat::type::confirmation_observer, nano::stat::detail::all, nano::stat::dir::out);

4
nano/node/confirmation_solicitor.cpp
View file

@ -4,8 +4,8 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
nano::confirmation_solicitor::confirmation_solicitor (nano::network & network_a, nano::network_constants const & params_a) : nano::confirmation_solicitor::confirmation_solicitor (nano::network & network_a, nano::network_constants const & params_a) :
max_confirm_req_batches (params_a.is_test_network () ? 1 : 20), max_confirm_req_batches (params_a.is_dev_network () ? 1 : 20),
max_block_broadcasts (params_a.is_test_network () ? 4 : 30), max_block_broadcasts (params_a.is_dev_network () ? 4 : 30),
max_election_requests (30), max_election_requests (30),
max_election_broadcasts (std::max<size_t> (network_a.fanout () / 2, 1)), max_election_broadcasts (std::max<size_t> (network_a.fanout () / 2, 1)),
network (network_a) network (network_a)

4
nano/node/election.cpp
View file

@ -14,7 +14,7 @@ int constexpr nano::election::confirmed_duration_factor;
std::chrono::milliseconds nano::election::base_latency () const std::chrono::milliseconds nano::election::base_latency () const
{ {
return node.network_params.network.is_test_network () ? 25ms : 1000ms; return node.network_params.network.is_dev_network () ? 25ms : 1000ms;
} }
nano::election_vote_result::election_vote_result (bool replay_a, bool processed_a) nano::election_vote_result::election_vote_result (bool replay_a, bool processed_a)
@ -378,7 +378,7 @@ nano::election_vote_result nano::election::vote (nano::account rep, uint64_t seq
auto online_stake (node.online_reps.online_stake ()); auto online_stake (node.online_reps.online_stake ());
auto weight (node.ledger.weight (rep)); auto weight (node.ledger.weight (rep));
auto should_process (false); auto should_process (false);
if (node.network_params.network.is_test_network () || weight > node.minimum_principal_weight (online_stake)) if (node.network_params.network.is_dev_network () || weight > node.minimum_principal_weight (online_stake))
{ {
unsigned int cooldown; unsigned int cooldown;
if (weight < online_stake / 100) // 0.1% to 1% if (weight < online_stake / 100) // 0.1% to 1%

2
nano/node/json_handler.cpp
View file

@ -71,7 +71,7 @@ void nano::json_handler::process_request (bool unsafe_a)
// Try the rest of the options // Try the rest of the options
if (action == "wallet_seed") if (action == "wallet_seed")
{ {
if (unsafe_a || node.network_params.network.is_test_network ()) if (unsafe_a || node.network_params.network.is_dev_network ())
{ {
wallet_seed (); wallet_seed ();
} }

4
nano/node/lmdb/lmdb.cpp
View file

@ -69,7 +69,7 @@ txn_tracking_enabled (txn_tracking_config_a.enable)
nano::network_constants network_constants; nano::network_constants network_constants;
if (!is_fresh_db) if (!is_fresh_db)
{ {
if (!network_constants.is_test_network ()) if (!network_constants.is_dev_network ())
{ {
std::cout << "Upgrade in progress..." << std::endl; std::cout << "Upgrade in progress..." << std::endl;
} }
@ -88,7 +88,7 @@ txn_tracking_enabled (txn_tracking_config_a.enable)
} }
} }
if (needs_vacuuming && !network_constants.is_test_network ()) if (needs_vacuuming && !network_constants.is_dev_network ())
{ {
logger.always_log ("Preparing vacuum..."); logger.always_log ("Preparing vacuum...");
auto vacuum_success = vacuum_after_upgrade (path_a, lmdb_config_a); auto vacuum_success = vacuum_after_upgrade (path_a, lmdb_config_a);

2
nano/node/logging.cpp
View file

@ -36,7 +36,7 @@ void nano::logging::init (boost::filesystem::path const & application_path_a)
} }
nano::network_constants network_constants; nano::network_constants network_constants;
if (!network_constants.is_test_network ()) if (!network_constants.is_dev_network ())
{ {
#ifdef BOOST_WINDOWS #ifdef BOOST_WINDOWS
if (nano::event_log_reg_entry_exists () || nano::is_windows_elevated ()) if (nano::event_log_reg_entry_exists () || nano::is_windows_elevated ())

8
nano/node/node.cpp
View file

@ -1062,19 +1062,19 @@ boost::optional<uint64_t> nano::node::work_generate_blocking (nano::work_version
boost::optional<uint64_t> nano::node::work_generate_blocking (nano::block & block_a) boost::optional<uint64_t> nano::node::work_generate_blocking (nano::block & block_a)
{ {
debug_assert (network_params.network.is_test_network ()); debug_assert (network_params.network.is_dev_network ());
return work_generate_blocking (block_a, default_difficulty (nano::work_version::work_1)); return work_generate_blocking (block_a, default_difficulty (nano::work_version::work_1));
} }
boost::optional<uint64_t> nano::node::work_generate_blocking (nano::root const & root_a) boost::optional<uint64_t> nano::node::work_generate_blocking (nano::root const & root_a)
{ {
debug_assert (network_params.network.is_test_network ()); debug_assert (network_params.network.is_dev_network ());
return work_generate_blocking (root_a, default_difficulty (nano::work_version::work_1)); return work_generate_blocking (root_a, default_difficulty (nano::work_version::work_1));
} }
boost::optional<uint64_t> nano::node::work_generate_blocking (nano::root const & root_a, uint64_t difficulty_a) boost::optional<uint64_t> nano::node::work_generate_blocking (nano::root const & root_a, uint64_t difficulty_a)
{ {
debug_assert (network_params.network.is_test_network ()); debug_assert (network_params.network.is_dev_network ());
return work_generate_blocking (nano::work_version::work_1, root_a, difficulty_a); return work_generate_blocking (nano::work_version::work_1, root_a, difficulty_a);
} }
@ -1720,7 +1720,7 @@ std::unique_ptr<nano::block_store> nano::make_store (nano::logger_mt & logger, b
/** To use RocksDB in tests make sure the node is built with the cmake variable -DNANO_ROCKSDB=ON and the environment variable TEST_USE_ROCKSDB=1 is set */ /** To use RocksDB in tests make sure the node is built with the cmake variable -DNANO_ROCKSDB=ON and the environment variable TEST_USE_ROCKSDB=1 is set */
static nano::network_constants network_constants; static nano::network_constants network_constants;
auto use_rocksdb_str = std::getenv ("TEST_USE_ROCKSDB"); auto use_rocksdb_str = std::getenv ("TEST_USE_ROCKSDB");
if (use_rocksdb_str && (boost::lexical_cast<int> (use_rocksdb_str) == 1) && network_constants.is_test_network ()) if (use_rocksdb_str && (boost::lexical_cast<int> (use_rocksdb_str) == 1) && network_constants.is_dev_network ())
{ {
return make_rocksdb (); return make_rocksdb ();
} }

13
nano/node/nodeconfig.cpp
View file

@ -17,6 +17,7 @@ const char * signature_checker_threads_key = "signature_checker_threads";
const char * pow_sleep_interval_key = "pow_sleep_interval"; const char * pow_sleep_interval_key = "pow_sleep_interval";
const char * default_beta_peer_network = "peering-beta.nano.org"; const char * default_beta_peer_network = "peering-beta.nano.org";
const char * default_live_peer_network = "peering.nano.org"; const char * default_live_peer_network = "peering.nano.org";
const char * default_test_peer_network = "peering-test.nano.org";
} }
nano::node_config::node_config () : nano::node_config::node_config () :
@ -37,7 +38,7 @@ external_address (boost::asio::ip::address_v6{}.to_string ())
} }
switch (network_params.network.network ()) switch (network_params.network.network ())
{ {
case nano::nano_networks::nano_test_network: case nano::nano_networks::nano_dev_network:
enable_voting = true; enable_voting = true;
preconfigured_representatives.push_back (network_params.ledger.genesis_account); preconfigured_representatives.push_back (network_params.ledger.genesis_account);
break; break;
@ -60,6 +61,10 @@ external_address (boost::asio::ip::address_v6{}.to_string ())
preconfigured_representatives.emplace_back ("2298FAB7C61058E77EA554CB93EDEEDA0692CBFCC540AB213B2836B29029E23A"); preconfigured_representatives.emplace_back ("2298FAB7C61058E77EA554CB93EDEEDA0692CBFCC540AB213B2836B29029E23A");
preconfigured_representatives.emplace_back ("3FE80B4BC842E82C1C18ABFEEC47EA989E63953BC82AC411F304D13833D52A56"); preconfigured_representatives.emplace_back ("3FE80B4BC842E82C1C18ABFEEC47EA989E63953BC82AC411F304D13833D52A56");
break; break;
case nano::nano_networks::nano_test_network:
preconfigured_peers.push_back (default_test_peer_network);
preconfigured_representatives.push_back (network_params.ledger.genesis_account);
break;
default: default:
debug_assert (false); debug_assert (false);
break; break;
@ -319,7 +324,7 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
bool is_deprecated_lmdb_dbs_used = lmdb_max_dbs_default != deprecated_lmdb_max_dbs; bool is_deprecated_lmdb_dbs_used = lmdb_max_dbs_default != deprecated_lmdb_max_dbs;
// Note: using the deprecated setting will result in a fail-fast config error in the future // Note: using the deprecated setting will result in a fail-fast config error in the future
if (!network_params.network.is_test_network () && is_deprecated_lmdb_dbs_used) if (!network_params.network.is_dev_network () && is_deprecated_lmdb_dbs_used)
{ {
std::cerr << "WARNING: The node.lmdb_max_dbs setting is deprecated and will be removed in a future version." << std::endl; std::cerr << "WARNING: The node.lmdb_max_dbs setting is deprecated and will be removed in a future version." << std::endl;
std::cerr << "Please use the node.lmdb.max_databases setting instead." << std::endl; std::cerr << "Please use the node.lmdb.max_databases setting instead." << std::endl;
@ -398,7 +403,7 @@ nano::error nano::node_config::deserialize_toml (nano::tomlconfig & toml)
{ {
toml.get_error ().set ("io_threads must be non-zero"); toml.get_error ().set ("io_threads must be non-zero");
} }
if (active_elections_size <= 250 && !network.is_test_network ()) if (active_elections_size <= 250 && !network.is_dev_network ())
{ {
toml.get_error ().set ("active_elections_size must be greater than 250"); toml.get_error ().set ("active_elections_size must be greater than 250");
} }
@ -704,7 +709,7 @@ nano::error nano::node_config::deserialize_json (bool & upgraded_a, nano::jsonco
{ {
json.get_error ().set ("io_threads must be non-zero"); json.get_error ().set ("io_threads must be non-zero");
} }
if (active_elections_size <= 250 && !network.is_test_network ()) if (active_elections_size <= 250 && !network.is_dev_network ())
{ {
json.get_error ().set ("active_elections_size must be greater than 250"); json.get_error ().set ("active_elections_size must be greater than 250");
} }

6
nano/node/nodeconfig.hpp
View file

@ -73,15 +73,15 @@ public:
uint16_t callback_port{ 0 }; uint16_t callback_port{ 0 };
std::string callback_target; std::string callback_target;
int deprecated_lmdb_max_dbs{ 128 }; int deprecated_lmdb_max_dbs{ 128 };
bool allow_local_peers{ !network_params.network.is_live_network () }; // disable by default for live network bool allow_local_peers{ !(network_params.network.is_live_network () || network_params.network.is_test_network ()) }; // disable by default for live network
nano::stat_config stat_config; nano::stat_config stat_config;
nano::ipc::ipc_config ipc_config; nano::ipc::ipc_config ipc_config;
std::string external_address; std::string external_address;
uint16_t external_port{ 0 }; uint16_t external_port{ 0 };
std::chrono::milliseconds block_processor_batch_max_time{ network_params.network.is_test_network () ? std::chrono::milliseconds (500) : std::chrono::milliseconds (5000) }; std::chrono::milliseconds block_processor_batch_max_time{ network_params.network.is_dev_network () ? std::chrono::milliseconds (500) : std::chrono::milliseconds (5000) };
std::chrono::seconds unchecked_cutoff_time{ std::chrono::seconds (4 * 60 * 60) }; // 4 hours std::chrono::seconds unchecked_cutoff_time{ std::chrono::seconds (4 * 60 * 60) }; // 4 hours
/** Timeout for initiated async operations */ /** Timeout for initiated async operations */
std::chrono::seconds tcp_io_timeout{ (network_params.network.is_test_network () && !is_sanitizer_build) ? std::chrono::seconds (5) : std::chrono::seconds (15) }; std::chrono::seconds tcp_io_timeout{ (network_params.network.is_dev_network () && !is_sanitizer_build) ? std::chrono::seconds (5) : std::chrono::seconds (15) };
std::chrono::nanoseconds pow_sleep_interval{ 0 }; std::chrono::nanoseconds pow_sleep_interval{ 0 };
size_t active_elections_size{ 50000 }; size_t active_elections_size{ 50000 };
/** Default maximum incoming TCP connections, including realtime network & bootstrap */ /** Default maximum incoming TCP connections, including realtime network & bootstrap */

6
nano/node/portmapping.cpp
View file

@ -28,7 +28,7 @@ std::string nano::port_mapping::get_config_port (std::string const & node_port_a
void nano::port_mapping::refresh_devices () void nano::port_mapping::refresh_devices ()
{ {
if (!network_params.network.is_test_network ()) if (!network_params.network.is_dev_network ())
{ {
upnp_state upnp_l; upnp_state upnp_l;
int discover_error_l = 0; int discover_error_l = 0;
@ -74,7 +74,7 @@ nano::endpoint nano::port_mapping::external_address ()
void nano::port_mapping::refresh_mapping () void nano::port_mapping::refresh_mapping ()
{ {
debug_assert (!network_params.network.is_test_network ()); debug_assert (!network_params.network.is_dev_network ());
if (on) if (on)
{ {
nano::lock_guard<std::mutex> guard_l (mutex); nano::lock_guard<std::mutex> guard_l (mutex);
@ -113,7 +113,7 @@ void nano::port_mapping::refresh_mapping ()
bool nano::port_mapping::check_mapping () bool nano::port_mapping::check_mapping ()
{ {
// Long discovery time and fast setup/teardown make this impractical for testing // Long discovery time and fast setup/teardown make this impractical for testing
debug_assert (!network_params.network.is_test_network ()); debug_assert (!network_params.network.is_dev_network ());
bool result_l (true); bool result_l (true);
nano::lock_guard<std::mutex> guard_l (mutex); nano::lock_guard<std::mutex> guard_l (mutex);
auto node_port_l (std::to_string (node.network.endpoint ().port ())); auto node_port_l (std::to_string (node.network.endpoint ().port ()));

4
nano/node/repcrawler.cpp
View file

@ -98,7 +98,7 @@ void nano::rep_crawler::ongoing_crawl ()
node.keepalive_preconfigured (node.config.preconfigured_peers); node.keepalive_preconfigured (node.config.preconfigured_peers);
} }
// Reduce crawl frequency when there's enough total peer weight // Reduce crawl frequency when there's enough total peer weight
unsigned next_run_ms = node.network_params.network.is_test_network () ? 100 : sufficient_weight ? 7000 : 3000; unsigned next_run_ms = node.network_params.network.is_dev_network () ? 100 : sufficient_weight ? 7000 : 3000;
std::weak_ptr<nano::node> node_w (node.shared ()); std::weak_ptr<nano::node> node_w (node.shared ());
node.alarm.add (now + std::chrono::milliseconds (next_run_ms), [node_w, this]() { node.alarm.add (now + std::chrono::milliseconds (next_run_ms), [node_w, this]() {
if (auto node_l = node_w.lock ()) if (auto node_l = node_w.lock ())
@ -138,7 +138,7 @@ void nano::rep_crawler::query (std::vector<std::shared_ptr<nano::transport::chan
{ {
nano::lock_guard<std::mutex> lock (active_mutex); nano::lock_guard<std::mutex> lock (active_mutex);
// Don't send same block multiple times in tests // Don't send same block multiple times in tests
if (node.network_params.network.is_test_network ()) if (node.network_params.network.is_dev_network ())
{ {
for (auto i (0); active.count (hash) != 0 && i < 4; ++i) for (auto i (0); active.count (hash) != 0 && i < 4; ++i)
{ {

4
nano/node/request_aggregator.cpp
View file

@ -12,8 +12,8 @@
#include <nano/secure/ledger.hpp> #include <nano/secure/ledger.hpp>
nano::request_aggregator::request_aggregator (nano::network_constants const & network_constants_a, nano::node_config const & config_a, nano::stat & stats_a, nano::local_vote_history & history_a, nano::ledger & ledger_a, nano::wallets & wallets_a, nano::active_transactions & active_a) : nano::request_aggregator::request_aggregator (nano::network_constants const & network_constants_a, nano::node_config const & config_a, nano::stat & stats_a, nano::local_vote_history & history_a, nano::ledger & ledger_a, nano::wallets & wallets_a, nano::active_transactions & active_a) :
max_delay (network_constants_a.is_test_network () ? 50 : 300), max_delay (network_constants_a.is_dev_network () ? 50 : 300),
small_delay (network_constants_a.is_test_network () ? 10 : 50), small_delay (network_constants_a.is_dev_network () ? 10 : 50),
max_channel_requests (config_a.max_queued_requests), max_channel_requests (config_a.max_queued_requests),
stats (stats_a), stats (stats_a),
local_votes (history_a), local_votes (history_a),

2
nano/node/rocksdb/rocksdb.cpp
View file

@ -369,7 +369,7 @@ size_t nano::rocksdb_store::count (nano::transaction const & transaction_a, tabl
// This should only be used in tests // This should only be used in tests
else if (table_a == tables::accounts) else if (table_a == tables::accounts)
{ {
debug_assert (network_constants ().is_test_network ()); debug_assert (network_constants ().is_dev_network ());
for (auto i (latest_begin (transaction_a)), n (latest_end ()); i != n; ++i) for (auto i (latest_begin (transaction_a)), n (latest_end ()); i != n; ++i)
{ {
++sum; ++sum;

4
nano/node/socket.cpp
View file

@ -216,7 +216,7 @@ void nano::socket::checkup ()
std::weak_ptr<nano::socket> this_w (shared_from_this ()); std::weak_ptr<nano::socket> this_w (shared_from_this ());
if (auto node_l = node.lock ()) if (auto node_l = node.lock ())
{ {
node_l->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (node_l->network_params.network.is_test_network () ? 1 : 2), [this_w, node_l]() { node_l->alarm.add (std::chrono::steady_clock::now () + std::chrono::seconds (node_l->network_params.network.is_dev_network () ? 1 : 2), [this_w, node_l]() {
if (auto this_l = this_w.lock ()) if (auto this_l = this_w.lock ())
{ {
uint64_t now (nano::seconds_since_epoch ()); uint64_t now (nano::seconds_since_epoch ());
@ -381,7 +381,7 @@ void nano::server_socket::on_connection (std::function<bool(std::shared_ptr<nano
// Make sure the new connection doesn't idle. Note that in most cases, the callback is going to start // Make sure the new connection doesn't idle. Note that in most cases, the callback is going to start
// an IO operation immediately, which will start a timer. // an IO operation immediately, which will start a timer.
new_connection->checkup (); new_connection->checkup ();
new_connection->start_timer (node_l->network_params.network.is_test_network () ? std::chrono::seconds (2) : node_l->network_params.node.idle_timeout); new_connection->start_timer (node_l->network_params.network.is_dev_network () ? std::chrono::seconds (2) : node_l->network_params.node.idle_timeout);
node_l->stats.inc (nano::stat::type::tcp, nano::stat::detail::tcp_accept_success, nano::stat::dir::in); node_l->stats.inc (nano::stat::type::tcp, nano::stat::detail::tcp_accept_success, nano::stat::dir::in);
this_l->connections.push_back (new_connection); this_l->connections.push_back (new_connection);
this_l->evict_dead_connections (); this_l->evict_dead_connections ();

2
nano/node/telemetry.hpp
View file

@ -129,7 +129,7 @@ private:
std::chrono::seconds const cache_cutoff{ nano::telemetry_cache_cutoffs::network_to_time (network_params.network) }; std::chrono::seconds const cache_cutoff{ nano::telemetry_cache_cutoffs::network_to_time (network_params.network) };
// The maximum time spent waiting for a response to a telemetry request // The maximum time spent waiting for a response to a telemetry request
std::chrono::seconds const response_time_cutoff{ network_params.network.is_test_network () ? (is_sanitizer_build || nano::running_within_valgrind () ? 6 : 3) : 10 }; std::chrono::seconds const response_time_cutoff{ network_params.network.is_dev_network () ? (is_sanitizer_build || nano::running_within_valgrind () ? 6 : 3) : 10 };
std::unordered_map<nano::endpoint, std::vector<std::function<void(telemetry_data_response const &)>>> callbacks; std::unordered_map<nano::endpoint, std::vector<std::function<void(telemetry_data_response const &)>>> callbacks;

20
nano/node/testing.cpp
View file

@ -176,20 +176,20 @@ uint64_t nano::system::work_generate_limited (nano::block_hash const & root_a, u
std::unique_ptr<nano::state_block> nano::upgrade_epoch (nano::work_pool & pool_a, nano::ledger & ledger_a, nano::epoch epoch_a) std::unique_ptr<nano::state_block> nano::upgrade_epoch (nano::work_pool & pool_a, nano::ledger & ledger_a, nano::epoch epoch_a)
{ {
auto transaction (ledger_a.store.tx_begin_write ()); auto transaction (ledger_a.store.tx_begin_write ());
auto test_genesis_key = nano::ledger_constants (nano::nano_networks::nano_test_network).test_genesis_key; auto dev_genesis_key = nano::ledger_constants (nano::nano_networks::nano_dev_network).dev_genesis_key;
auto account = test_genesis_key.pub; auto account = dev_genesis_key.pub;
auto latest = ledger_a.latest (transaction, account); auto latest = ledger_a.latest (transaction, account);
auto balance = ledger_a.account_balance (transaction, account); auto balance = ledger_a.account_balance (transaction, account);
nano::state_block_builder builder; nano::state_block_builder builder;
std::error_code ec; std::error_code ec;
auto epoch = builder auto epoch = builder
.account (test_genesis_key.pub) .account (dev_genesis_key.pub)
.previous (latest) .previous (latest)
.balance (balance) .balance (balance)
.link (ledger_a.epoch_link (epoch_a)) .link (ledger_a.epoch_link (epoch_a))
.representative (test_genesis_key.pub) .representative (dev_genesis_key.pub)
.sign (test_genesis_key.prv, test_genesis_key.pub) .sign (dev_genesis_key.prv, dev_genesis_key.pub)
.work (*pool_a.generate (latest, nano::work_threshold (nano::work_version::work_1, nano::block_details (epoch_a, false, false, true)))) .work (*pool_a.generate (latest, nano::work_threshold (nano::work_version::work_1, nano::block_details (epoch_a, false, false, true))))
.build (ec); .build (ec);
@ -355,7 +355,7 @@ void nano::system::generate_receive (nano::node & node_a)
} }
if (send_block != nullptr) if (send_block != nullptr)
{ {
auto receive_error (wallet (0)->receive_sync (send_block, nano::ledger_constants (nano::nano_networks::nano_test_network).genesis_account, std::numeric_limits<nano::uint128_t>::max ())); auto receive_error (wallet (0)->receive_sync (send_block, nano::ledger_constants (nano::nano_networks::nano_dev_network).genesis_account, std::numeric_limits<nano::uint128_t>::max ()));
(void)receive_error; (void)receive_error;
} }
} }
@ -480,9 +480,9 @@ void nano::system::generate_send_new (nano::node & node_a, std::vector<nano::acc
void nano::system::generate_mass_activity (uint32_t count_a, nano::node & node_a) void nano::system::generate_mass_activity (uint32_t count_a, nano::node & node_a)
{ {
std::vector<nano::account> accounts; std::vector<nano::account> accounts;
auto test_genesis_key = nano::ledger_constants (nano::nano_networks::nano_test_network).test_genesis_key; auto dev_genesis_key = nano::ledger_constants (nano::nano_networks::nano_dev_network).dev_genesis_key;
wallet (0)->insert_adhoc (test_genesis_key.prv); wallet (0)->insert_adhoc (dev_genesis_key.prv);
accounts.push_back (test_genesis_key.pub); accounts.push_back (dev_genesis_key.pub);
auto previous (std::chrono::steady_clock::now ()); auto previous (std::chrono::steady_clock::now ());
for (uint32_t i (0); i < count_a; ++i) for (uint32_t i (0); i < count_a; ++i)
{ {
@ -535,7 +535,7 @@ uint16_t nano::get_available_port ()
return available_port; return available_port;
} }
void nano::cleanup_test_directories_on_exit () void nano::cleanup_dev_directories_on_exit ()
{ {
// Makes sure everything is cleaned up // Makes sure everything is cleaned up
nano::logging::release_file_sink (); nano::logging::release_file_sink ();

2
nano/node/testing.hpp
View file

@ -58,6 +58,6 @@ public:
std::unique_ptr<nano::state_block> upgrade_epoch (nano::work_pool &, nano::ledger &, nano::epoch); std::unique_ptr<nano::state_block> upgrade_epoch (nano::work_pool &, nano::ledger &, nano::epoch);
void blocks_confirm (nano::node &, std::vector<std::shared_ptr<nano::block>> const &); void blocks_confirm (nano::node &, std::vector<std::shared_ptr<nano::block>> const &);
uint16_t get_available_port (); uint16_t get_available_port ();
void cleanup_test_directories_on_exit (); void cleanup_dev_directories_on_exit ();
} }
REGISTER_ERROR_CODES (nano, error_system); REGISTER_ERROR_CODES (nano, error_system);

2
nano/node/transport/tcp.cpp
View file

@ -442,7 +442,7 @@ void nano::transport::tcp_channels::ongoing_keepalive ()
} }
// Attempt to start TCP connections to known UDP peers // Attempt to start TCP connections to known UDP peers
nano::tcp_endpoint invalid_endpoint (boost::asio::ip::address_v6::any (), 0); nano::tcp_endpoint invalid_endpoint (boost::asio::ip::address_v6::any (), 0);
if (!node.network_params.network.is_test_network () && !node.flags.disable_udp) if (!node.network_params.network.is_dev_network () && !node.flags.disable_udp)
{ {
size_t random_count (std::min (static_cast<size_t> (6), static_cast<size_t> (std::ceil (std::sqrt (node.network.udp_channels.size ()))))); size_t random_count (std::min (static_cast<size_t> (6), static_cast<size_t> (std::ceil (std::sqrt (node.network.udp_channels.size ())))));
for (auto i (0); i <= random_count; ++i) for (auto i (0); i <= random_count; ++i)

6
nano/node/transport/udp.cpp
View file

@ -104,7 +104,7 @@ std::shared_ptr<nano::transport::channel_udp> nano::transport::udp_channels::ins
{ {
debug_assert (endpoint_a.address ().is_v6 ()); debug_assert (endpoint_a.address ().is_v6 ());
std::shared_ptr<nano::transport::channel_udp> result; std::shared_ptr<nano::transport::channel_udp> result;
if (!node.network.not_a_peer (endpoint_a, node.config.allow_local_peers) && (node.network_params.network.is_test_network () || !max_ip_connections (endpoint_a))) if (!node.network.not_a_peer (endpoint_a, node.config.allow_local_peers) && (node.network_params.network.is_dev_network () || !max_ip_connections (endpoint_a)))
{ {
nano::unique_lock<std::mutex> lock (mutex); nano::unique_lock<std::mutex> lock (mutex);
auto existing (channels.get<endpoint_tag> ().find (endpoint_a)); auto existing (channels.get<endpoint_tag> ().find (endpoint_a));
@ -334,9 +334,9 @@ void nano::transport::udp_channels::stop ()
nano::lock_guard<std::mutex> lock (mutex); nano::lock_guard<std::mutex> lock (mutex);
local_endpoint = nano::endpoint (boost::asio::ip::address_v6::loopback (), 0); local_endpoint = nano::endpoint (boost::asio::ip::address_v6::loopback (), 0);
// On test-net, close directly to avoid address-reuse issues. On livenet, close // On devnet, close directly to avoid address-reuse issues. On livenet, close
// through the strand as multiple IO threads may access the socket. // through the strand as multiple IO threads may access the socket.
if (node.network_params.network.is_test_network ()) if (node.network_params.network.is_dev_network ())
{ {
this->close_socket (); this->close_socket ();
} }

4
nano/node/wallet.cpp
View file

@ -1150,7 +1150,7 @@ void nano::wallet::work_update (nano::transaction const & transaction_a, nano::a
void nano::wallet::work_ensure (nano::account const & account_a, nano::root const & root_a) void nano::wallet::work_ensure (nano::account const & account_a, nano::root const & root_a)
{ {
using namespace std::chrono_literals; using namespace std::chrono_literals;
std::chrono::seconds const precache_delay = wallets.node.network_params.network.is_test_network () ? 1s : 10s; std::chrono::seconds const precache_delay = wallets.node.network_params.network.is_dev_network () ? 1s : 10s;
wallets.delayed_work->operator[] (account_a) = root_a; wallets.delayed_work->operator[] (account_a) = root_a;
@ -1795,7 +1795,7 @@ void nano::wallets::ongoing_compute_reps ()
{ {
compute_reps (); compute_reps ();
auto & node_l (node); auto & node_l (node);
auto compute_delay (network_params.network.is_test_network () ? std::chrono::milliseconds (10) : std::chrono::milliseconds (15 * 60 * 1000)); // Representation drifts quickly on the test network but very slowly on the live network auto compute_delay (network_params.network.is_dev_network () ? std::chrono::milliseconds (10) : std::chrono::milliseconds (15 * 60 * 1000)); // Representation drifts quickly on the test network but very slowly on the live network
node.alarm.add (std::chrono::steady_clock::now () + compute_delay, [&node_l]() { node.alarm.add (std::chrono::steady_clock::now () + compute_delay, [&node_l]() {
node_l.wallets.ongoing_compute_reps (); node_l.wallets.ongoing_compute_reps ();
}); });

2
nano/qt_system/entry.cpp
View file

@ -10,7 +10,7 @@
#include <thread> #include <thread>
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard; nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard;
QApplication application (argc, argv); QApplication application (argc, argv);
QCoreApplication::setOrganizationName ("Nano"); QCoreApplication::setOrganizationName ("Nano");

8
nano/qt_test/entry.cpp
View file

@ -6,18 +6,18 @@
QApplication * test_application = nullptr; QApplication * test_application = nullptr;
namespace nano namespace nano
{ {
void cleanup_test_directories_on_exit (); void cleanup_dev_directories_on_exit ();
void force_nano_test_network (); void force_nano_dev_network ();
} }
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard; nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard;
QApplication application (argc, argv); QApplication application (argc, argv);
test_application = &application; test_application = &application;
testing::InitGoogleTest (&argc, argv); testing::InitGoogleTest (&argc, argv);
auto res = RUN_ALL_TESTS (); auto res = RUN_ALL_TESTS ();
nano::cleanup_test_directories_on_exit (); nano::cleanup_dev_directories_on_exit ();
return res; return res;
} }

66
nano/qt_test/qt.cpp
View file

@ -258,9 +258,9 @@ TEST (wallet, send)
{ {
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::system system (2); nano::system system (2);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::public_key key1 (system.wallet (1)->insert_adhoc (nano::keypair ().prv)); nano::public_key key1 (system.wallet (1)->insert_adhoc (nano::keypair ().prv));
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
ASSERT_NE (wallet->rendering_ratio, nano::raw_ratio); ASSERT_NE (wallet->rendering_ratio, nano::raw_ratio);
@ -291,13 +291,13 @@ TEST (wallet, send_locked)
{ {
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key1; nano::keypair key1;
{ {
auto transaction (system.wallet (0)->wallets.tx_begin_write ()); auto transaction (system.wallet (0)->wallets.tx_begin_write ());
system.wallet (0)->enter_password (transaction, "0"); system.wallet (0)->enter_password (transaction, "0");
} }
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
QTest::mouseClick (wallet->send_blocks, Qt::LeftButton); QTest::mouseClick (wallet->send_blocks, Qt::LeftButton);
@ -332,7 +332,7 @@ TEST (wallet, process_block)
QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton);
QTest::mouseClick (wallet->advanced.enter_block, Qt::LeftButton); QTest::mouseClick (wallet->advanced.enter_block, Qt::LeftButton);
ASSERT_EQ (wallet->block_entry.window, wallet->main_stack->currentWidget ()); ASSERT_EQ (wallet->block_entry.window, wallet->main_stack->currentWidget ());
nano::send_block send (latest, key1.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
std::string previous; std::string previous;
send.hashables.previous.encode_hex (previous); send.hashables.previous.encode_hex (previous);
std::string balance; std::string balance;
@ -361,16 +361,16 @@ TEST (wallet, create_send)
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::keypair key; nano::keypair key;
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
wallet->client_window->show (); wallet->client_window->show ();
QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton);
QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton);
QTest::mouseClick (wallet->block_creation.send, Qt::LeftButton); QTest::mouseClick (wallet->block_creation.send, Qt::LeftButton);
QTest::keyClicks (wallet->block_creation.account, nano::test_genesis_key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.account, nano::dev_genesis_key.pub.to_account ().c_str ());
QTest::keyClicks (wallet->block_creation.amount, "100000000000000000000"); QTest::keyClicks (wallet->block_creation.amount, "100000000000000000000");
QTest::keyClicks (wallet->block_creation.destination, key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.destination, key.pub.to_account ().c_str ());
QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton); QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton);
@ -391,14 +391,14 @@ TEST (wallet, create_open_receive)
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::keypair key; nano::keypair key;
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (0)->send_action (nano::test_genesis_key.pub, key.pub, 100); system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100);
nano::block_hash latest1 (system.nodes[0]->latest (nano::test_genesis_key.pub)); nano::block_hash latest1 (system.nodes[0]->latest (nano::dev_genesis_key.pub));
system.wallet (0)->send_action (nano::test_genesis_key.pub, key.pub, 100); system.wallet (0)->send_action (nano::dev_genesis_key.pub, key.pub, 100);
nano::block_hash latest2 (system.nodes[0]->latest (nano::test_genesis_key.pub)); nano::block_hash latest2 (system.nodes[0]->latest (nano::dev_genesis_key.pub));
ASSERT_NE (latest1, latest2); ASSERT_NE (latest1, latest2);
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
wallet->client_window->show (); wallet->client_window->show ();
@ -406,7 +406,7 @@ TEST (wallet, create_open_receive)
QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton);
wallet->block_creation.open->click (); wallet->block_creation.open->click ();
QTest::keyClicks (wallet->block_creation.source, latest1.to_string ().c_str ()); QTest::keyClicks (wallet->block_creation.source, latest1.to_string ().c_str ());
QTest::keyClicks (wallet->block_creation.representative, nano::test_genesis_key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.representative, nano::dev_genesis_key.pub.to_account ().c_str ());
QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton); QTest::mouseClick (wallet->block_creation.create, Qt::LeftButton);
std::string json1 (wallet->block_creation.block->toPlainText ().toStdString ()); std::string json1 (wallet->block_creation.block->toPlainText ().toStdString ());
ASSERT_FALSE (json1.empty ()); ASSERT_FALSE (json1.empty ());
@ -440,15 +440,15 @@ TEST (wallet, create_change)
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::keypair key; nano::keypair key;
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
wallet->client_window->show (); wallet->client_window->show ();
QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton);
QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton); QTest::mouseClick (wallet->advanced.create_block, Qt::LeftButton);
wallet->block_creation.change->click (); wallet->block_creation.change->click ();
QTest::keyClicks (wallet->block_creation.account, nano::test_genesis_key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.account, nano::dev_genesis_key.pub.to_account ().c_str ());
QTest::keyClicks (wallet->block_creation.representative, key.pub.to_account ().c_str ()); QTest::keyClicks (wallet->block_creation.representative, key.pub.to_account ().c_str ());
wallet->block_creation.create->click (); wallet->block_creation.create->click ();
std::string json (wallet->block_creation.block->toPlainText ().toStdString ()); std::string json (wallet->block_creation.block->toPlainText ().toStdString ());
@ -483,15 +483,15 @@ TEST (history, short_text)
auto transaction (store.tx_begin_write ()); auto transaction (store.tx_begin_write ());
store.initialize (transaction, genesis, ledger.cache); store.initialize (transaction, genesis, ledger.cache);
nano::keypair key; nano::keypair key;
auto latest (ledger.latest (transaction, nano::test_genesis_key.pub)); auto latest (ledger.latest (transaction, nano::dev_genesis_key.pub));
nano::send_block send (latest, nano::test_genesis_key.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, nano::dev_genesis_key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
nano::receive_block receive (send.hash (), send.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); nano::receive_block receive (send.hash (), send.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, receive).code);
nano::change_block change (receive.hash (), key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive.hash ())); nano::change_block change (receive.hash (), key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, change).code);
} }
nano_qt::history history (ledger, nano::test_genesis_key.pub, *wallet); nano_qt::history history (ledger, nano::dev_genesis_key.pub, *wallet);
history.refresh (); history.refresh ();
ASSERT_EQ (4, history.model->rowCount ()); ASSERT_EQ (4, history.model->rowCount ());
} }
@ -513,7 +513,7 @@ TEST (wallet, startup_work)
uint64_t work1; uint64_t work1;
{ {
auto transaction (system.nodes[0]->wallets.tx_begin_read ()); auto transaction (system.nodes[0]->wallets.tx_begin_read ());
ASSERT_TRUE (wallet->wallet_m->store.work_get (transaction, nano::test_genesis_key.pub, work1)); ASSERT_TRUE (wallet->wallet_m->store.work_get (transaction, nano::dev_genesis_key.pub, work1));
} }
QTest::mouseClick (wallet->accounts_button, Qt::LeftButton); QTest::mouseClick (wallet->accounts_button, Qt::LeftButton);
QTest::keyClicks (wallet->accounts.account_key_line, "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4"); QTest::keyClicks (wallet->accounts.account_key_line, "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4");
@ -524,7 +524,7 @@ TEST (wallet, startup_work)
{ {
ASSERT_NO_ERROR (system.poll ()); ASSERT_NO_ERROR (system.poll ());
auto transaction (system.nodes[0]->wallets.tx_begin_read ()); auto transaction (system.nodes[0]->wallets.tx_begin_read ());
again = wallet->wallet_m->store.work_get (transaction, nano::test_genesis_key.pub, work1); again = wallet->wallet_m->store.work_get (transaction, nano::dev_genesis_key.pub, work1);
} }
} }
@ -591,17 +591,17 @@ TEST (wallet, republish)
{ {
nano_qt::eventloop_processor processor; nano_qt::eventloop_processor processor;
nano::system system (2); nano::system system (2);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::keypair key; nano::keypair key;
nano::block_hash hash; nano::block_hash hash;
{ {
auto transaction (system.nodes[0]->store.tx_begin_write ()); auto transaction (system.nodes[0]->store.tx_begin_write ());
auto latest (system.nodes[0]->ledger.latest (transaction, nano::test_genesis_key.pub)); auto latest (system.nodes[0]->ledger.latest (transaction, nano::dev_genesis_key.pub));
nano::send_block block (latest, key.pub, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block block (latest, key.pub, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
hash = block.hash (); hash = block.hash ();
ASSERT_EQ (nano::process_result::progress, system.nodes[0]->ledger.process (transaction, block).code); ASSERT_EQ (nano::process_result::progress, system.nodes[0]->ledger.process (transaction, block).code);
} }
auto account (nano::test_genesis_key.pub); auto account (nano::dev_genesis_key.pub);
auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account)); auto wallet (std::make_shared<nano_qt::wallet> (*test_application, processor, *system.nodes[0], system.wallet (0), account));
wallet->start (); wallet->start ();
QTest::mouseClick (wallet->show_advanced, Qt::LeftButton); QTest::mouseClick (wallet->show_advanced, Qt::LeftButton);
@ -610,9 +610,9 @@ TEST (wallet, republish)
ASSERT_EQ (wallet->block_viewer.window, wallet->main_stack->currentWidget ()); ASSERT_EQ (wallet->block_viewer.window, wallet->main_stack->currentWidget ());
QTest::keyClicks (wallet->block_viewer.hash, hash.to_string ().c_str ()); QTest::keyClicks (wallet->block_viewer.hash, hash.to_string ().c_str ());
QTest::mouseClick (wallet->block_viewer.rebroadcast, Qt::LeftButton); QTest::mouseClick (wallet->block_viewer.rebroadcast, Qt::LeftButton);
ASSERT_FALSE (system.nodes[1]->balance (nano::test_genesis_key.pub).is_zero ()); ASSERT_FALSE (system.nodes[1]->balance (nano::dev_genesis_key.pub).is_zero ());
system.deadline_set (10s); system.deadline_set (10s);
while (system.nodes[1]->balance (nano::test_genesis_key.pub).is_zero ()) while (system.nodes[1]->balance (nano::dev_genesis_key.pub).is_zero ())
{ {
ASSERT_NO_ERROR (system.poll ()); ASSERT_NO_ERROR (system.poll ());
} }
@ -630,7 +630,7 @@ TEST (wallet, ignore_empty_adhoc)
ASSERT_EQ (wallet->advanced.window, wallet->main_stack->currentWidget ()); ASSERT_EQ (wallet->advanced.window, wallet->main_stack->currentWidget ());
QTest::mouseClick (wallet->accounts_button, Qt::LeftButton); QTest::mouseClick (wallet->accounts_button, Qt::LeftButton);
ASSERT_EQ (wallet->accounts.window, wallet->main_stack->currentWidget ()); ASSERT_EQ (wallet->accounts.window, wallet->main_stack->currentWidget ());
QTest::keyClicks (wallet->accounts.account_key_line, nano::test_genesis_key.prv.data.to_string ().c_str ()); QTest::keyClicks (wallet->accounts.account_key_line, nano::dev_genesis_key.prv.data.to_string ().c_str ());
QTest::mouseClick (wallet->accounts.account_key_button, Qt::LeftButton); QTest::mouseClick (wallet->accounts.account_key_button, Qt::LeftButton);
ASSERT_EQ (1, wallet->accounts.model->rowCount ()); ASSERT_EQ (1, wallet->accounts.model->rowCount ());
ASSERT_EQ (0, wallet->accounts.account_key_line->text ().length ()); ASSERT_EQ (0, wallet->accounts.account_key_line->text ().length ());
@ -797,7 +797,7 @@ TEST (wallet, DISABLED_synchronizing)
{ {
auto transaction (system1.nodes[0]->store.tx_begin_write ()); auto transaction (system1.nodes[0]->store.tx_begin_write ());
auto latest (system1.nodes[0]->ledger.latest (transaction, nano::genesis_account)); auto latest (system1.nodes[0]->ledger.latest (transaction, nano::genesis_account));
nano::send_block send (latest, key1, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system1.work.generate (latest)); nano::send_block send (latest, key1, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system1.work.generate (latest));
system1.nodes[0]->ledger.process (transaction, send); system1.nodes[0]->ledger.process (transaction, send);
} }
ASSERT_EQ (0, wallet->active_status.active.count (nano_qt::status_types::synchronizing)); ASSERT_EQ (0, wallet->active_status.active.count (nano_qt::status_types::synchronizing));

8
nano/rpc_test/entry.cpp
View file

@ -4,17 +4,17 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace nano namespace nano
{ {
void cleanup_test_directories_on_exit (); void cleanup_dev_directories_on_exit ();
void force_nano_test_network (); void force_nano_dev_network ();
} }
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::set_use_memory_pools (false); nano::set_use_memory_pools (false);
nano::node_singleton_memory_pool_purge_guard cleanup_guard; nano::node_singleton_memory_pool_purge_guard cleanup_guard;
testing::InitGoogleTest (&argc, argv); testing::InitGoogleTest (&argc, argv);
auto res = RUN_ALL_TESTS (); auto res = RUN_ALL_TESTS ();
nano::cleanup_test_directories_on_exit (); nano::cleanup_dev_directories_on_exit ();
return res; return res;
} }

680
nano/rpc_test/rpc.cpp
View file

File diff suppressed because it is too large Load diff

64
nano/secure/common.cpp
View file

@ -25,11 +25,12 @@ nano::nano_networks nano::network_constants::active_network = nano::nano_network
namespace namespace
{ {
char const * test_private_key_data = "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4"; char const * dev_private_key_data = "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4";
char const * test_public_key_data = "B0311EA55708D6A53C75CDBF88300259C6D018522FE3D4D0A242E431F9E8B6D0"; // xrb_3e3j5tkog48pnny9dmfzj1r16pg8t1e76dz5tmac6iq689wyjfpiij4txtdo char const * dev_public_key_data = "B0311EA55708D6A53C75CDBF88300259C6D018522FE3D4D0A242E431F9E8B6D0"; // xrb_3e3j5tkog48pnny9dmfzj1r16pg8t1e76dz5tmac6iq689wyjfpiij4txtdo
char const * beta_public_key_data = "259A4384075F73E19BEE72C0F23C491E30A678FBBD31D55D3982099D3CDA8116"; // nano_1betag41gqumw8fywwp1yay6k9jinswhqhbjtogmm1ibmnyfo1apej3medr3 char const * beta_public_key_data = "259A4384075F73E19BEE72C0F23C491E30A678FBBD31D55D3982099D3CDA8116"; // nano_1betag41gqumw8fywwp1yay6k9jinswhqhbjtogmm1ibmnyfo1apej3medr3
char const * live_public_key_data = "E89208DD038FBB269987689621D52292AE9C35941A7484756ECCED92A65093BA"; // xrb_3t6k35gi95xu6tergt6p69ck76ogmitsa8mnijtpxm9fkcm736xtoncuohr3 char const * live_public_key_data = "E89208DD038FBB269987689621D52292AE9C35941A7484756ECCED92A65093BA"; // xrb_3t6k35gi95xu6tergt6p69ck76ogmitsa8mnijtpxm9fkcm736xtoncuohr3
char const * test_genesis_data = R"%%%({ char const * test_public_key_data = "45C6FF9D1706D61F0821327752671BDA9F9ED2DA40326B01935AB566FB9E08ED"; // nano_1jg8zygjg3pp5w644emqcbmjqpnzmubfni3kfe1s8pooeuxsw49fdq1mco9j
char const * dev_genesis_data = R"%%%({
"type": "open", "type": "open",
"source": "B0311EA55708D6A53C75CDBF88300259C6D018522FE3D4D0A242E431F9E8B6D0", "source": "B0311EA55708D6A53C75CDBF88300259C6D018522FE3D4D0A242E431F9E8B6D0",
"representative": "xrb_3e3j5tkog48pnny9dmfzj1r16pg8t1e76dz5tmac6iq689wyjfpiij4txtdo", "representative": "xrb_3e3j5tkog48pnny9dmfzj1r16pg8t1e76dz5tmac6iq689wyjfpiij4txtdo",
@ -56,6 +57,15 @@ char const * live_genesis_data = R"%%%({
"signature": "9F0C933C8ADE004D808EA1985FA746A7E95BA2A38F867640F53EC8F180BDFE9E2C1268DEAD7C2664F356E37ABA362BC58E46DBA03E523A7B5A19E4B6EB12BB02" "signature": "9F0C933C8ADE004D808EA1985FA746A7E95BA2A38F867640F53EC8F180BDFE9E2C1268DEAD7C2664F356E37ABA362BC58E46DBA03E523A7B5A19E4B6EB12BB02"
})%%%"; })%%%";
char const * test_genesis_data = R"%%%({
"type": "open",
"source": "45C6FF9D1706D61F0821327752671BDA9F9ED2DA40326B01935AB566FB9E08ED",
"representative": "nano_1jg8zygjg3pp5w644emqcbmjqpnzmubfni3kfe1s8pooeuxsw49fdq1mco9j",
"account": "nano_1jg8zygjg3pp5w644emqcbmjqpnzmubfni3kfe1s8pooeuxsw49fdq1mco9j",
"work": "bc1ef279c1a34eb1",
"signature": "15049467CAEE3EC768639E8E35792399B6078DA763DA4EBA8ECAD33B0EDC4AF2E7403893A5A602EB89B978DABEF1D6606BB00F3C0EE11449232B143B6E07170E"
})%%%";
std::shared_ptr<nano::block> parse_block_from_genesis_data (std::string const & genesis_data_a) std::shared_ptr<nano::block> parse_block_from_genesis_data (std::string const & genesis_data_a)
{ {
boost::property_tree::ptree tree; boost::property_tree::ptree tree;
@ -74,9 +84,9 @@ nano::network_params::network_params (nano::nano_networks network_a) :
network (network_a), ledger (network), voting (network), node (network), portmapping (network), bootstrap (network) network (network_a), ledger (network), voting (network), node (network), portmapping (network), bootstrap (network)
{ {
unsigned constexpr kdf_full_work = 64 * 1024; unsigned constexpr kdf_full_work = 64 * 1024;
unsigned constexpr kdf_test_work = 8; unsigned constexpr kdf_dev_work = 8;
kdf_work = network.is_test_network () ? kdf_test_work : kdf_full_work; kdf_work = network.is_dev_network () ? kdf_dev_work : kdf_full_work;
header_magic_number = network.is_test_network () ? std::array<uint8_t, 2>{ { 'R', 'A' } } : network.is_beta_network () ? std::array<uint8_t, 2>{ { 'R', 'B' } } : std::array<uint8_t, 2>{ { 'R', 'C' } }; header_magic_number = network.is_dev_network () ? std::array<uint8_t, 2>{ { 'R', 'A' } } : network.is_beta_network () ? std::array<uint8_t, 2>{ { 'R', 'B' } } : network.is_live_network () ? std::array<uint8_t, 2>{ { 'R', 'C' } } : std::array<uint8_t, 2>{ { 'R', 'X' } };
} }
uint8_t nano::protocol_constants::protocol_version_min (bool use_epoch_2_min_version_a) const uint8_t nano::protocol_constants::protocol_version_min (bool use_epoch_2_min_version_a) const
@ -91,15 +101,17 @@ ledger_constants (network_constants.network ())
nano::ledger_constants::ledger_constants (nano::nano_networks network_a) : nano::ledger_constants::ledger_constants (nano::nano_networks network_a) :
zero_key ("0"), zero_key ("0"),
test_genesis_key (test_private_key_data), dev_genesis_key (dev_private_key_data),
nano_test_account (test_public_key_data), nano_dev_account (dev_public_key_data),
nano_beta_account (beta_public_key_data), nano_beta_account (beta_public_key_data),
nano_live_account (live_public_key_data), nano_live_account (live_public_key_data),
nano_test_genesis (test_genesis_data), nano_test_account (test_public_key_data),
nano_dev_genesis (dev_genesis_data),
nano_beta_genesis (beta_genesis_data), nano_beta_genesis (beta_genesis_data),
nano_live_genesis (live_genesis_data), nano_live_genesis (live_genesis_data),
genesis_account (network_a == nano::nano_networks::nano_test_network ? nano_test_account : network_a == nano::nano_networks::nano_beta_network ? nano_beta_account : nano_live_account), nano_test_genesis (test_genesis_data),
genesis_block (network_a == nano::nano_networks::nano_test_network ? nano_test_genesis : network_a == nano::nano_networks::nano_beta_network ? nano_beta_genesis : nano_live_genesis), genesis_account (network_a == nano::nano_networks::nano_dev_network ? nano_dev_account : network_a == nano::nano_networks::nano_beta_network ? nano_beta_account : network_a == nano::nano_networks::nano_test_network ? nano_test_account : nano_live_account),
genesis_block (network_a == nano::nano_networks::nano_dev_network ? nano_dev_genesis : network_a == nano::nano_networks::nano_beta_network ? nano_beta_genesis : network_a == nano::nano_networks::nano_test_network ? nano_test_genesis : nano_live_genesis),
genesis_hash (parse_block_from_genesis_data (genesis_block)->hash ()), genesis_hash (parse_block_from_genesis_data (genesis_block)->hash ()),
genesis_amount (std::numeric_limits<nano::uint128_t>::max ()), genesis_amount (std::numeric_limits<nano::uint128_t>::max ()),
burn_account (0) burn_account (0)
@ -113,7 +125,7 @@ burn_account (0)
nano::account nano_live_epoch_v2_signer; nano::account nano_live_epoch_v2_signer;
auto error (nano_live_epoch_v2_signer.decode_account ("nano_3qb6o6i1tkzr6jwr5s7eehfxwg9x6eemitdinbpi7u8bjjwsgqfj4wzser3x")); auto error (nano_live_epoch_v2_signer.decode_account ("nano_3qb6o6i1tkzr6jwr5s7eehfxwg9x6eemitdinbpi7u8bjjwsgqfj4wzser3x"));
debug_assert (!error); debug_assert (!error);
auto epoch_v2_signer (network_a == nano::nano_networks::nano_test_network ? nano_test_account : network_a == nano::nano_networks::nano_beta_network ? nano_beta_account : nano_live_epoch_v2_signer); auto epoch_v2_signer (network_a == nano::nano_networks::nano_dev_network ? nano_dev_account : network_a == nano::nano_networks::nano_beta_network ? nano_beta_account : network_a == nano::nano_networks::nano_test_network ? nano_test_account : nano_live_epoch_v2_signer);
const char * epoch_message_v2 ("epoch v2 block"); const char * epoch_message_v2 ("epoch v2 block");
strncpy ((char *)epoch_link_v2.bytes.data (), epoch_message_v2, epoch_link_v2.bytes.size ()); strncpy ((char *)epoch_link_v2.bytes.data (), epoch_message_v2, epoch_link_v2.bytes.size ());
epochs.add (nano::epoch::epoch_2, epoch_v2_signer, epoch_link_v2); epochs.add (nano::epoch::epoch_2, epoch_v2_signer, epoch_link_v2);
@ -127,24 +139,24 @@ nano::random_constants::random_constants ()
nano::node_constants::node_constants (nano::network_constants & network_constants) nano::node_constants::node_constants (nano::network_constants & network_constants)
{ {
period = network_constants.is_test_network () ? std::chrono::seconds (1) : std::chrono::seconds (60); period = network_constants.is_dev_network () ? std::chrono::seconds (1) : std::chrono::seconds (60);
half_period = network_constants.is_test_network () ? std::chrono::milliseconds (500) : std::chrono::milliseconds (30 * 1000); half_period = network_constants.is_dev_network () ? std::chrono::milliseconds (500) : std::chrono::milliseconds (30 * 1000);
idle_timeout = network_constants.is_test_network () ? period * 15 : period * 2; idle_timeout = network_constants.is_dev_network () ? period * 15 : period * 2;
cutoff = period * 5; cutoff = period * 5;
syn_cookie_cutoff = std::chrono::seconds (5); syn_cookie_cutoff = std::chrono::seconds (5);
backup_interval = std::chrono::minutes (5); backup_interval = std::chrono::minutes (5);
search_pending_interval = network_constants.is_test_network () ? std::chrono::seconds (1) : std::chrono::seconds (5 * 60); search_pending_interval = network_constants.is_dev_network () ? std::chrono::seconds (1) : std::chrono::seconds (5 * 60);
peer_interval = search_pending_interval; peer_interval = search_pending_interval;
unchecked_cleaning_interval = std::chrono::minutes (30); unchecked_cleaning_interval = std::chrono::minutes (30);
process_confirmed_interval = network_constants.is_test_network () ? std::chrono::milliseconds (50) : std::chrono::milliseconds (500); process_confirmed_interval = network_constants.is_dev_network () ? std::chrono::milliseconds (50) : std::chrono::milliseconds (500);
max_peers_per_ip = network_constants.is_test_network () ? 10 : 5; max_peers_per_ip = network_constants.is_dev_network () ? 10 : 5;
max_weight_samples = network_constants.is_live_network () ? 4032 : 288; max_weight_samples = (network_constants.is_live_network () || network_constants.is_test_network ()) ? 4032 : 288;
weight_period = 5 * 60; // 5 minutes weight_period = 5 * 60; // 5 minutes
} }
nano::voting_constants::voting_constants (nano::network_constants & network_constants) nano::voting_constants::voting_constants (nano::network_constants & network_constants)
{ {
max_cache = network_constants.is_test_network () ? 256 : 128 * 1024; max_cache = network_constants.is_dev_network () ? 256 : 128 * 1024;
} }
nano::portmapping_constants::portmapping_constants (nano::network_constants & network_constants) nano::portmapping_constants::portmapping_constants (nano::network_constants & network_constants)
@ -155,12 +167,12 @@ nano::portmapping_constants::portmapping_constants (nano::network_constants & ne
nano::bootstrap_constants::bootstrap_constants (nano::network_constants & network_constants) nano::bootstrap_constants::bootstrap_constants (nano::network_constants & network_constants)
{ {
lazy_max_pull_blocks = network_constants.is_test_network () ? 2 : 512; lazy_max_pull_blocks = network_constants.is_dev_network () ? 2 : 512;
lazy_min_pull_blocks = network_constants.is_test_network () ? 1 : 32; lazy_min_pull_blocks = network_constants.is_dev_network () ? 1 : 32;
frontier_retry_limit = network_constants.is_test_network () ? 2 : 16; frontier_retry_limit = network_constants.is_dev_network () ? 2 : 16;
lazy_retry_limit = network_constants.is_test_network () ? 2 : frontier_retry_limit * 10; lazy_retry_limit = network_constants.is_dev_network () ? 2 : frontier_retry_limit * 10;
lazy_destinations_retry_limit = network_constants.is_test_network () ? 1 : frontier_retry_limit / 4; lazy_destinations_retry_limit = network_constants.is_dev_network () ? 1 : frontier_retry_limit / 4;
gap_cache_bootstrap_start_interval = network_constants.is_test_network () ? std::chrono::milliseconds (5) : std::chrono::milliseconds (30 * 1000); gap_cache_bootstrap_start_interval = network_constants.is_dev_network () ? std::chrono::milliseconds (5) : std::chrono::milliseconds (30 * 1000);
} }
// Create a new random keypair // Create a new random keypair

8
nano/secure/common.hpp
View file

@ -372,13 +372,15 @@ public:
ledger_constants (nano::network_constants & network_constants); ledger_constants (nano::network_constants & network_constants);
ledger_constants (nano::nano_networks network_a); ledger_constants (nano::nano_networks network_a);
nano::keypair zero_key; nano::keypair zero_key;
nano::keypair test_genesis_key; nano::keypair dev_genesis_key;
nano::account nano_test_account; nano::account nano_dev_account;
nano::account nano_beta_account; nano::account nano_beta_account;
nano::account nano_live_account; nano::account nano_live_account;
std::string nano_test_genesis; nano::account nano_test_account;
std::string nano_dev_genesis;
std::string nano_beta_genesis; std::string nano_beta_genesis;
std::string nano_live_genesis; std::string nano_live_genesis;
std::string nano_test_genesis;
nano::account genesis_account; nano::account genesis_account;
std::string genesis_block; std::string genesis_block;
nano::block_hash genesis_hash; nano::block_hash genesis_hash;

2
nano/secure/ledger.cpp
View file

@ -801,7 +801,7 @@ nano::uint128_t nano::ledger::account_pending (nano::transaction const & transac
nano::process_return nano::ledger::process (nano::write_transaction const & transaction_a, nano::block & block_a, nano::signature_verification verification) nano::process_return nano::ledger::process (nano::write_transaction const & transaction_a, nano::block & block_a, nano::signature_verification verification)
{ {
debug_assert (!nano::work_validate_entry (block_a) || network_params.network.is_test_network ()); debug_assert (!nano::work_validate_entry (block_a) || network_params.network.is_dev_network ());
ledger_processor processor (*this, transaction_a, verification); ledger_processor processor (*this, transaction_a, verification);
block_a.visit (processor); block_a.visit (processor);
if (processor.result.code == nano::process_result::progress) if (processor.result.code == nano::process_result::progress)

16
nano/secure/utility.cpp
View file

@ -12,14 +12,14 @@ boost::filesystem::path nano::working_path (bool legacy)
auto result (nano::app_path ()); auto result (nano::app_path ());
switch (network_constants.network ()) switch (network_constants.network ())
{ {
case nano::nano_networks::nano_test_network: case nano::nano_networks::nano_dev_network:
if (!legacy) if (!legacy)
{ {
result /= "NanoTest"; result /= "NanoDev";
} }
else else
{ {
result /= "RaiBlocksTest"; result /= "RaiBlocksDev";
} }
break; break;
case nano::nano_networks::nano_beta_network: case nano::nano_networks::nano_beta_network:
@ -42,6 +42,16 @@ boost::filesystem::path nano::working_path (bool legacy)
result /= "RaiBlocks"; result /= "RaiBlocks";
} }
break; break;
case nano::nano_networks::nano_test_network:
if (!legacy)
{
result /= "NanoTest";
}
else
{
result /= "RaiBlocksTest";
}
break;
} }
return result; return result;
} }

8
nano/slow_test/entry.cpp
View file

@ -3,16 +3,16 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace nano namespace nano
{ {
void cleanup_test_directories_on_exit (); void cleanup_dev_directories_on_exit ();
void force_nano_test_network (); void force_nano_dev_network ();
} }
int main (int argc, char ** argv) int main (int argc, char ** argv)
{ {
nano::force_nano_test_network (); nano::force_nano_dev_network ();
nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard; nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard;
testing::InitGoogleTest (&argc, argv); testing::InitGoogleTest (&argc, argv);
auto res = RUN_ALL_TESTS (); auto res = RUN_ALL_TESTS ();
nano::cleanup_test_directories_on_exit (); nano::cleanup_dev_directories_on_exit ();
return res; return res;
} }

162
nano/slow_test/node.cpp
View file

@ -20,7 +20,7 @@ TEST (system, generate_mass_activity)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.enable_voting = false; // Prevent blocks cementing node_config.enable_voting = false; // Prevent blocks cementing
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
uint32_t count (20); uint32_t count (20);
system.generate_mass_activity (count, *system.nodes[0]); system.generate_mass_activity (count, *system.nodes[0]);
auto transaction (system.nodes[0]->store.tx_begin_read ()); auto transaction (system.nodes[0]->store.tx_begin_read ());
@ -37,7 +37,7 @@ TEST (system, generate_mass_activity_long)
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->wallets.watcher->stop (); // Stop work watcher system.wallet (0)->wallets.watcher->stop (); // Stop work watcher
nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads); nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
uint32_t count (1000000000); uint32_t count (1000000000);
system.generate_mass_activity (count, *system.nodes[0]); system.generate_mass_activity (count, *system.nodes[0]);
auto transaction (system.nodes[0]->store.tx_begin_read ()); auto transaction (system.nodes[0]->store.tx_begin_read ());
@ -57,7 +57,7 @@ TEST (system, receive_while_synchronizing)
node_config.enable_voting = false; // Prevent blocks cementing node_config.enable_voting = false; // Prevent blocks cementing
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads); nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
uint32_t count (1000); uint32_t count (1000);
system.generate_mass_activity (count, *system.nodes[0]); system.generate_mass_activity (count, *system.nodes[0]);
nano::keypair key; nano::keypair key;
@ -66,12 +66,12 @@ TEST (system, receive_while_synchronizing)
auto channel (std::make_shared<nano::transport::channel_udp> (node1->network.udp_channels, system.nodes[0]->network.endpoint (), node1->network_params.protocol.protocol_version)); auto channel (std::make_shared<nano::transport::channel_udp> (node1->network.udp_channels, system.nodes[0]->network.endpoint (), node1->network_params.protocol.protocol_version));
node1->network.send_keepalive (channel); node1->network.send_keepalive (channel);
auto wallet (node1->wallets.create (1)); auto wallet (node1->wallets.create (1));
wallet->insert_adhoc (nano::test_genesis_key.prv); // For voting wallet->insert_adhoc (nano::dev_genesis_key.prv); // For voting
ASSERT_EQ (key.pub, wallet->insert_adhoc (key.prv)); ASSERT_EQ (key.pub, wallet->insert_adhoc (key.prv));
node1->start (); node1->start ();
system.nodes.push_back (node1); system.nodes.push_back (node1);
system.alarm.add (std::chrono::steady_clock::now () + std::chrono::milliseconds (200), ([&system, &key]() { system.alarm.add (std::chrono::steady_clock::now () + std::chrono::milliseconds (200), ([&system, &key]() {
auto hash (system.wallet (0)->send_sync (nano::test_genesis_key.pub, key.pub, system.nodes[0]->config.receive_minimum.number ())); auto hash (system.wallet (0)->send_sync (nano::dev_genesis_key.pub, key.pub, system.nodes[0]->config.receive_minimum.number ()));
auto transaction (system.nodes[0]->store.tx_begin_read ()); auto transaction (system.nodes[0]->store.tx_begin_read ());
auto block (system.nodes[0]->store.block_get (transaction, hash)); auto block (system.nodes[0]->store.block_get (transaction, hash));
std::string block_text; std::string block_text;
@ -101,16 +101,16 @@ TEST (ledger, deep_account_compute)
nano::work_pool pool (std::numeric_limits<unsigned>::max ()); nano::work_pool pool (std::numeric_limits<unsigned>::max ());
nano::keypair key; nano::keypair key;
auto balance (nano::genesis_amount - 1); auto balance (nano::genesis_amount - 1);
nano::send_block send (genesis.hash (), key.pub, balance, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (genesis.hash ())); nano::send_block send (genesis.hash (), key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (genesis.hash ()));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
nano::open_block open (send.hash (), nano::test_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, open).code);
auto sprevious (send.hash ()); auto sprevious (send.hash ());
auto rprevious (open.hash ()); auto rprevious (open.hash ());
for (auto i (0), n (100000); i != n; ++i) for (auto i (0), n (100000); i != n; ++i)
{ {
balance -= 1; balance -= 1;
nano::send_block send (sprevious, key.pub, balance, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (sprevious)); nano::send_block send (sprevious, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (sprevious));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
sprevious = send.hash (); sprevious = send.hash ();
nano::receive_block receive (rprevious, send.hash (), key.prv, key.pub, *pool.generate (rprevious)); nano::receive_block receive (rprevious, send.hash (), key.prv, key.pub, *pool.generate (rprevious));
@ -132,21 +132,21 @@ TEST (wallet, multithreaded_send_async)
nano::system system (1); nano::system system (1);
nano::keypair key; nano::keypair key;
auto wallet_l (system.wallet (0)); auto wallet_l (system.wallet (0));
wallet_l->insert_adhoc (nano::test_genesis_key.prv); wallet_l->insert_adhoc (nano::dev_genesis_key.prv);
wallet_l->insert_adhoc (key.prv); wallet_l->insert_adhoc (key.prv);
for (auto i (0); i < 20; ++i) for (auto i (0); i < 20; ++i)
{ {
threads.push_back (boost::thread ([wallet_l, &key]() { threads.push_back (boost::thread ([wallet_l, &key]() {
for (auto i (0); i < 1000; ++i) for (auto i (0); i < 1000; ++i)
{ {
wallet_l->send_async (nano::test_genesis_key.pub, key.pub, 1000, [](std::shared_ptr<nano::block> block_a) { wallet_l->send_async (nano::dev_genesis_key.pub, key.pub, 1000, [](std::shared_ptr<nano::block> block_a) {
ASSERT_FALSE (block_a == nullptr); ASSERT_FALSE (block_a == nullptr);
ASSERT_FALSE (block_a->hash ().is_zero ()); ASSERT_FALSE (block_a->hash ().is_zero ());
}); });
} }
})); }));
} }
ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::test_genesis_key.pub) == (nano::genesis_amount - 20 * 1000 * 1000)); ASSERT_TIMELY (1000s, system.nodes[0]->balance (nano::dev_genesis_key.pub) == (nano::genesis_amount - 20 * 1000 * 1000));
} }
for (auto i (threads.begin ()), n (threads.end ()); i != n; ++i) for (auto i (threads.begin ()), n (threads.end ()); i != n; ++i)
{ {
@ -186,15 +186,15 @@ TEST (node, fork_storm)
nano::node_flags flags; nano::node_flags flags;
flags.disable_max_peers_per_ip = true; flags.disable_max_peers_per_ip = true;
nano::system system (64, nano::transport::transport_type::tcp, flags); nano::system system (64, nano::transport::transport_type::tcp, flags);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto previous (system.nodes[0]->latest (nano::test_genesis_key.pub)); auto previous (system.nodes[0]->latest (nano::dev_genesis_key.pub));
auto balance (system.nodes[0]->balance (nano::test_genesis_key.pub)); auto balance (system.nodes[0]->balance (nano::dev_genesis_key.pub));
ASSERT_FALSE (previous.is_zero ()); ASSERT_FALSE (previous.is_zero ());
for (auto j (0); j != system.nodes.size (); ++j) for (auto j (0); j != system.nodes.size (); ++j)
{ {
balance -= 1; balance -= 1;
nano::keypair key; nano::keypair key;
nano::send_block send (previous, key.pub, balance, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0); nano::send_block send (previous, key.pub, balance, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0);
system.nodes[j]->work_generate_blocking (send); system.nodes[j]->work_generate_blocking (send);
previous = send.hash (); previous = send.hash ();
for (auto i (0); i != system.nodes.size (); ++i) for (auto i (0); i != system.nodes.size (); ++i)
@ -391,7 +391,7 @@ TEST (store, unchecked_load)
{ {
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
auto block (std::make_shared<nano::send_block> (0, 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block (std::make_shared<nano::send_block> (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
constexpr auto num_unchecked = 1000000; constexpr auto num_unchecked = 1000000;
for (auto i (0); i < 1000000; ++i) for (auto i (0); i < 1000000; ++i)
{ {
@ -406,10 +406,10 @@ TEST (store, vote_load)
{ {
nano::system system (1); nano::system system (1);
auto & node (*system.nodes[0]); auto & node (*system.nodes[0]);
auto block (std::make_shared<nano::send_block> (0, 0, 0, nano::test_genesis_key.prv, nano::test_genesis_key.pub, 0)); auto block (std::make_shared<nano::send_block> (0, 0, 0, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, 0));
for (auto i (0); i < 1000000; ++i) for (auto i (0); i < 1000000; ++i)
{ {
auto vote (std::make_shared<nano::vote> (nano::test_genesis_key.pub, nano::test_genesis_key.prv, i, block)); auto vote (std::make_shared<nano::vote> (nano::dev_genesis_key.pub, nano::dev_genesis_key.prv, i, block));
node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (system.nodes[0]->network.udp_channels, system.nodes[0]->network.endpoint (), system.nodes[0]->network_params.protocol.protocol_version)); node.vote_processor.vote (vote, std::make_shared<nano::transport::channel_udp> (system.nodes[0]->network.udp_channels, system.nodes[0]->network.endpoint (), system.nodes[0]->network_params.protocol.protocol_version));
} }
} }
@ -435,13 +435,13 @@ TEST (wallets, rep_scan)
TEST (node, mass_vote_by_hash) TEST (node, mass_vote_by_hash)
{ {
nano::system system (1); nano::system system (1);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash previous (nano::genesis_hash); nano::block_hash previous (nano::genesis_hash);
nano::keypair key; nano::keypair key;
std::vector<std::shared_ptr<nano::state_block>> blocks; std::vector<std::shared_ptr<nano::state_block>> blocks;
for (auto i (0); i < 10000; ++i) for (auto i (0); i < 10000; ++i)
{ {
auto block (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous, nano::test_genesis_key.pub, nano::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous))); auto block (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous, nano::dev_genesis_key.pub, nano::genesis_amount - (i + 1) * nano::Gxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous)));
previous = block->hash (); previous = block->hash ();
blocks.push_back (block); blocks.push_back (block);
} }
@ -460,13 +460,13 @@ TEST (confirmation_height, many_accounts_single_confirmation)
node_config.online_weight_minimum = 100; node_config.online_weight_minimum = 100;
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
// The number of frontiers should be more than the nano::confirmation_height::unbounded_cutoff to test the amount of blocks confirmed is correct. // The number of frontiers should be more than the nano::confirmation_height::unbounded_cutoff to test the amount of blocks confirmed is correct.
node->confirmation_height_processor.batch_write_size = 500; node->confirmation_height_processor.batch_write_size = 500;
auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50; auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50;
nano::keypair last_keypair = nano::test_genesis_key; nano::keypair last_keypair = nano::dev_genesis_key;
auto last_open_hash = node->latest (nano::test_genesis_key.pub); auto last_open_hash = node->latest (nano::dev_genesis_key.pub);
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
for (auto i = num_accounts - 1; i > 0; --i) for (auto i = num_accounts - 1; i > 0; --i)
@ -531,11 +531,11 @@ TEST (confirmation_height, many_accounts_many_confirmations)
node_config.online_weight_minimum = 100; node_config.online_weight_minimum = 100;
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
node->confirmation_height_processor.batch_write_size = 500; node->confirmation_height_processor.batch_write_size = 500;
auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50; auto const num_accounts = nano::confirmation_height::unbounded_cutoff * 2 + 50;
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
std::vector<std::shared_ptr<nano::open_block>> open_blocks; std::vector<std::shared_ptr<nano::open_block>> open_blocks;
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -544,12 +544,12 @@ TEST (confirmation_height, many_accounts_many_confirmations)
nano::keypair key; nano::keypair key;
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
nano::send_block send (latest_genesis, key.pub, node->config.online_weight_minimum.number (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis)); nano::send_block send (ladev_genesis, key.pub, node->config.online_weight_minimum.number (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
auto open = std::make_shared<nano::open_block> (send.hash (), nano::test_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); auto open = std::make_shared<nano::open_block> (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code);
open_blocks.push_back (std::move (open)); open_blocks.push_back (std::move (open));
latest_genesis = send.hash (); ladev_genesis = send.hash ();
} }
} }
@ -594,15 +594,15 @@ TEST (confirmation_height, long_chains)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
nano::block_hash latest (node->latest (nano::test_genesis_key.pub)); nano::block_hash latest (node->latest (nano::dev_genesis_key.pub));
system.wallet (0)->insert_adhoc (key1.prv); system.wallet (0)->insert_adhoc (key1.prv);
node->confirmation_height_processor.batch_write_size = 500; node->confirmation_height_processor.batch_write_size = 500;
auto const num_blocks = nano::confirmation_height::unbounded_cutoff * 2 + 50; auto const num_blocks = nano::confirmation_height::unbounded_cutoff * 2 + 50;
// First open the other account // First open the other account
nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest)); nano::send_block send (latest, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + num_blocks + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (latest));
nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub)); nano::open_block open (send.hash (), nano::genesis_account, key1.pub, key1.prv, key1.pub, *system.work.generate (key1.pub));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -617,7 +617,7 @@ TEST (confirmation_height, long_chains)
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
for (auto i = num_blocks - 1; i > 0; --i) for (auto i = num_blocks - 1; i > 0; --i)
{ {
nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)); nano::send_block send (previous_genesis_chain_hash, key1.pub, nano::genesis_amount - nano::Gxrb_ratio + i + 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
nano::receive_block receive (previous_destination_chain_hash, send.hash (), key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); nano::receive_block receive (previous_destination_chain_hash, send.hash (), key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, receive).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, receive).code);
@ -628,12 +628,12 @@ TEST (confirmation_height, long_chains)
} }
// Send one from destination to genesis and pocket it // Send one from destination to genesis and pocket it
nano::send_block send1 (previous_destination_chain_hash, nano::test_genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash)); nano::send_block send1 (previous_destination_chain_hash, nano::dev_genesis_key.pub, nano::Gxrb_ratio - 2, key1.prv, key1.pub, *system.work.generate (previous_destination_chain_hash));
auto receive1 (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, previous_genesis_chain_hash, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash))); auto receive1 (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, previous_genesis_chain_hash, nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio + 1, send1.hash (), nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (previous_genesis_chain_hash)));
// Unpocketed. Send to a non-existing account to prevent auto receives from the wallet adjusting expected confirmation height // Unpocketed. Send to a non-existing account to prevent auto receives from the wallet adjusting expected confirmation height
nano::keypair key2; nano::keypair key2;
nano::state_block send2 (nano::genesis_account, receive1->hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (receive1->hash ())); nano::state_block send2 (nano::genesis_account, receive1->hash (), nano::genesis_account, nano::genesis_amount - nano::Gxrb_ratio, key2.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (receive1->hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -655,9 +655,9 @@ TEST (confirmation_height, long_chains)
auto transaction (node->store.tx_begin_read ()); auto transaction (node->store.tx_begin_read ());
nano::account_info account_info; nano::account_info account_info;
ASSERT_FALSE (node->store.account_get (transaction, nano::test_genesis_key.pub, account_info)); ASSERT_FALSE (node->store.account_get (transaction, nano::dev_genesis_key.pub, account_info));
nano::confirmation_height_info confirmation_height_info; nano::confirmation_height_info confirmation_height_info;
ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::test_genesis_key.pub, confirmation_height_info)); ASSERT_FALSE (node->store.confirmation_height_get (transaction, nano::dev_genesis_key.pub, confirmation_height_info));
ASSERT_EQ (num_blocks + 2, confirmation_height_info.height); ASSERT_EQ (num_blocks + 2, confirmation_height_info.height);
ASSERT_EQ (num_blocks + 3, account_info.block_count); // Includes the unpocketed send ASSERT_EQ (num_blocks + 3, account_info.block_count); // Includes the unpocketed send
@ -689,14 +689,14 @@ TEST (confirmation_height, dynamic_algorithm)
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
nano::genesis genesis; nano::genesis genesis;
nano::keypair key; nano::keypair key;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto const num_blocks = nano::confirmation_height::unbounded_cutoff; auto const num_blocks = nano::confirmation_height::unbounded_cutoff;
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
std::vector<std::shared_ptr<nano::state_block>> state_blocks; std::vector<std::shared_ptr<nano::state_block>> state_blocks;
for (auto i = 0; i < num_blocks; ++i) for (auto i = 0; i < num_blocks; ++i)
{ {
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, latest_genesis, nano::test_genesis_key.pub, nano::genesis_amount - i - 1, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, ladev_genesis, nano::dev_genesis_key.pub, nano::genesis_amount - i - 1, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis)));
latest_genesis = send->hash (); ladev_genesis = send->hash ();
state_blocks.push_back (send); state_blocks.push_back (send);
} }
{ {
@ -710,7 +710,7 @@ TEST (confirmation_height, dynamic_algorithm)
node->confirmation_height_processor.add (state_blocks.front ()->hash ()); node->confirmation_height_processor.add (state_blocks.front ()->hash ());
ASSERT_TIMELY (20s, node->ledger.cache.cemented_count == 2); ASSERT_TIMELY (20s, node->ledger.cache.cemented_count == 2);
node->confirmation_height_processor.add (latest_genesis); node->confirmation_height_processor.add (ladev_genesis);
ASSERT_TIMELY (20s, node->ledger.cache.cemented_count == num_blocks + 1); ASSERT_TIMELY (20s, node->ledger.cache.cemented_count == num_blocks + 1);
@ -741,16 +741,16 @@ TEST (confirmation_height, dynamic_algorithm_no_transition_while_pending)
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
nano::keypair key; nano::keypair key;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
std::vector<std::shared_ptr<nano::state_block>> state_blocks; std::vector<std::shared_ptr<nano::state_block>> state_blocks;
auto const num_blocks = nano::confirmation_height::unbounded_cutoff - 2; auto const num_blocks = nano::confirmation_height::unbounded_cutoff - 2;
auto add_block_to_genesis_chain = [&](nano::write_transaction & transaction) { auto add_block_to_genesis_chain = [&](nano::write_transaction & transaction) {
static int num = 0; static int num = 0;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, latest_genesis, nano::test_genesis_key.pub, nano::genesis_amount - num - 1, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, ladev_genesis, nano::dev_genesis_key.pub, nano::genesis_amount - num - 1, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis)));
latest_genesis = send->hash (); ladev_genesis = send->hash ();
state_blocks.push_back (send); state_blocks.push_back (send);
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *send).code);
++num; ++num;
@ -810,7 +810,7 @@ TEST (confirmation_height, many_accounts_send_receive_self)
nano::node_flags node_flags; nano::node_flags node_flags;
node_flags.confirmation_height_processor_mode = nano::confirmation_height_mode::unbounded; node_flags.confirmation_height_processor_mode = nano::confirmation_height_mode::unbounded;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
#ifndef NDEBUG #ifndef NDEBUG
auto const num_accounts = 10000; auto const num_accounts = 10000;
@ -818,7 +818,7 @@ TEST (confirmation_height, many_accounts_send_receive_self)
auto const num_accounts = 100000; auto const num_accounts = 100000;
#endif #endif
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
std::vector<nano::keypair> keys; std::vector<nano::keypair> keys;
std::vector<std::shared_ptr<nano::open_block>> open_blocks; std::vector<std::shared_ptr<nano::open_block>> open_blocks;
{ {
@ -828,12 +828,12 @@ TEST (confirmation_height, many_accounts_send_receive_self)
nano::keypair key; nano::keypair key;
keys.emplace_back (key); keys.emplace_back (key);
nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis)); nano::send_block send (ladev_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
auto open = std::make_shared<nano::open_block> (send.hash (), nano::test_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); auto open = std::make_shared<nano::open_block> (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub));
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, *open).code);
open_blocks.push_back (std::move (open)); open_blocks.push_back (std::move (open));
latest_genesis = send.hash (); ladev_genesis = send.hash ();
} }
} }
@ -929,7 +929,7 @@ TEST (confirmation_height, many_accounts_send_receive_self_no_elections)
auto const num_accounts = 100000; auto const num_accounts = 100000;
auto latest_genesis = nano::genesis_hash; auto ladev_genesis = nano::genesis_hash;
std::vector<nano::keypair> keys; std::vector<nano::keypair> keys;
std::vector<std::shared_ptr<nano::open_block>> open_blocks; std::vector<std::shared_ptr<nano::open_block>> open_blocks;
@ -944,12 +944,12 @@ TEST (confirmation_height, many_accounts_send_receive_self_no_elections)
{ {
nano::keypair key; nano::keypair key;
keys.emplace_back (key); keys.emplace_back (key);
nano::send_block send (latest_genesis, key.pub, nano::genesis_amount - 1 - i, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *pool.generate (latest_genesis)); nano::send_block send (ladev_genesis, key.pub, nano::genesis_amount - 1 - i, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *pool.generate (ladev_genesis));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, send).code);
auto open = std::make_shared<nano::open_block> (send.hash (), nano::test_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub)); auto open = std::make_shared<nano::open_block> (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *pool.generate (key.pub));
ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *open).code); ASSERT_EQ (nano::process_result::progress, ledger.process (transaction, *open).code);
open_blocks.push_back (std::move (open)); open_blocks.push_back (std::move (open));
latest_genesis = send.hash (); ladev_genesis = send.hash ();
} }
} }
@ -1027,11 +1027,11 @@ TEST (confirmation_height, prioritize_frontiers_overwrite)
nano::node_config node_config (nano::get_available_port (), system.logging); nano::node_config node_config (nano::get_available_port (), system.logging);
node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled; node_config.frontiers_confirmation = nano::frontiers_confirmation_mode::disabled;
auto node = system.add_node (node_config); auto node = system.add_node (node_config);
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
auto num_accounts = node->active.max_priority_cementable_frontiers * 2; auto num_accounts = node->active.max_priority_cementable_frontiers * 2;
nano::keypair last_keypair = nano::test_genesis_key; nano::keypair last_keypair = nano::dev_genesis_key;
auto last_open_hash = node->latest (nano::test_genesis_key.pub); auto last_open_hash = node->latest (nano::dev_genesis_key.pub);
// Clear confirmation height so that the genesis account has the same amount of uncemented blocks as the other frontiers // Clear confirmation height so that the genesis account has the same amount of uncemented blocks as the other frontiers
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -1069,9 +1069,9 @@ TEST (confirmation_height, prioritize_frontiers_overwrite)
// Add a new frontier with 1 block, it should not be added to the frontier container because it is not higher than any already in the maxed out container // Add a new frontier with 1 block, it should not be added to the frontier container because it is not higher than any already in the maxed out container
nano::keypair key; nano::keypair key;
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
nano::send_block send (latest_genesis, key.pub, nano::Gxrb_ratio - 1, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis)); nano::send_block send (ladev_genesis, key.pub, nano::Gxrb_ratio - 1, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis));
nano::open_block open (send.hash (), nano::test_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub)); nano::open_block open (send.hash (), nano::dev_genesis_key.pub, key.pub, key.prv, key.pub, *system.work.generate (key.pub));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code); ASSERT_EQ (nano::process_result::progress, node->ledger.process (transaction, send).code);
@ -1083,7 +1083,7 @@ TEST (confirmation_height, prioritize_frontiers_overwrite)
ASSERT_EQ (node->active.priority_wallet_cementable_frontiers_size (), num_accounts / 2); ASSERT_EQ (node->active.priority_wallet_cementable_frontiers_size (), num_accounts / 2);
// The account now has an extra block (2 in total) so has 1 more uncemented block than the next smallest frontier in the collection. // The account now has an extra block (2 in total) so has 1 more uncemented block than the next smallest frontier in the collection.
nano::send_block send1 (send.hash (), key.pub, nano::Gxrb_ratio - 2, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (send.hash ())); nano::send_block send1 (send.hash (), key.pub, nano::Gxrb_ratio - 2, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (send.hash ()));
nano::receive_block receive (open.hash (), send1.hash (), key.prv, key.pub, *system.work.generate (open.hash ())); nano::receive_block receive (open.hash (), send1.hash (), key.prv, key.pub, *system.work.generate (open.hash ()));
{ {
auto transaction = node->store.tx_begin_write (); auto transaction = node->store.tx_begin_write ();
@ -1258,13 +1258,13 @@ TEST (telemetry, under_load)
nano::genesis genesis; nano::genesis genesis;
nano::keypair key; nano::keypair key;
nano::keypair key1; nano::keypair key1;
system.wallet (0)->insert_adhoc (nano::test_genesis_key.prv); system.wallet (0)->insert_adhoc (nano::dev_genesis_key.prv);
system.wallet (0)->insert_adhoc (key.prv); system.wallet (0)->insert_adhoc (key.prv);
auto latest_genesis = node->latest (nano::test_genesis_key.pub); auto ladev_genesis = node->latest (nano::dev_genesis_key.pub);
auto num_blocks = 150000; auto num_blocks = 150000;
auto send (std::make_shared<nano::state_block> (nano::test_genesis_key.pub, latest_genesis, nano::test_genesis_key.pub, nano::genesis_amount - num_blocks, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (latest_genesis))); auto send (std::make_shared<nano::state_block> (nano::dev_genesis_key.pub, ladev_genesis, nano::dev_genesis_key.pub, nano::genesis_amount - num_blocks, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (ladev_genesis)));
node->process_active (send); node->process_active (send);
latest_genesis = send->hash (); ladev_genesis = send->hash ();
auto open (std::make_shared<nano::state_block> (key.pub, 0, key.pub, num_blocks, send->hash (), key.prv, key.pub, *system.work.generate (key.pub))); auto open (std::make_shared<nano::state_block> (key.pub, 0, key.pub, num_blocks, send->hash (), key.prv, key.pub, *system.work.generate (key.pub)));
node->process_active (open); node->process_active (open);
auto latest_key = open->hash (); auto latest_key = open->hash ();
@ -1279,7 +1279,7 @@ TEST (telemetry, under_load)
} }
}; };
std::thread thread1 (thread_func, nano::test_genesis_key, latest_genesis, nano::genesis_amount - num_blocks); std::thread thread1 (thread_func, nano::dev_genesis_key, ladev_genesis, nano::genesis_amount - num_blocks);
std::thread thread2 (thread_func, key, latest_key, num_blocks); std::thread thread2 (thread_func, key, latest_key, num_blocks);
ASSERT_TIMELY (200s, node1->ledger.cache.block_count == num_blocks * 2 + 3); ASSERT_TIMELY (200s, node1->ledger.cache.block_count == num_blocks * 2 + 3);
@ -1397,7 +1397,7 @@ TEST (telemetry, many_nodes)
// Give all nodes a non-default number of blocks // Give all nodes a non-default number of blocks
nano::keypair key; nano::keypair key;
nano::genesis genesis; nano::genesis genesis;
nano::state_block send (nano::test_genesis_key.pub, genesis.hash (), nano::test_genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::test_genesis_key.prv, nano::test_genesis_key.pub, *system.work.generate (genesis.hash ())); nano::state_block send (nano::dev_genesis_key.pub, genesis.hash (), nano::dev_genesis_key.pub, nano::genesis_amount - nano::Mxrb_ratio, key.pub, nano::dev_genesis_key.prv, nano::dev_genesis_key.pub, *system.work.generate (genesis.hash ()));
for (auto node : system.nodes) for (auto node : system.nodes)
{ {
auto transaction (node->store.tx_begin_write ()); auto transaction (node->store.tx_begin_write ());
@ -1544,8 +1544,8 @@ TEST (node, mass_epoch_upgrader)
//node_config.work_peers = { { "192.168.1.101", 7000 } }; //node_config.work_peers = { { "192.168.1.101", 7000 } };
auto & node = *system.add_node (node_config); auto & node = *system.add_node (node_config);
auto balance = node.balance (nano::test_genesis_key.pub); auto balance = node.balance (nano::dev_genesis_key.pub);
auto latest = node.latest (nano::test_genesis_key.pub); auto latest = node.latest (nano::dev_genesis_key.pub);
nano::uint128_t amount = 1; nano::uint128_t amount = 1;
// Send to all accounts // Send to all accounts
@ -1558,12 +1558,12 @@ TEST (node, mass_epoch_upgrader)
nano::state_block_builder builder; nano::state_block_builder builder;
std::error_code ec; std::error_code ec;
auto block = builder auto block = builder
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (latest) .previous (latest)
.balance (balance) .balance (balance)
.link (info.key.pub) .link (info.key.pub)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*node.work_generate_blocking (latest, nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_0, false, false, false)))) .work (*node.work_generate_blocking (latest, nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_0, false, false, false))))
.build (ec); .build (ec);
ASSERT_FALSE (ec); ASSERT_FALSE (ec);
@ -1597,7 +1597,7 @@ TEST (node, mass_epoch_upgrader)
ASSERT_EQ (1 + total_accounts + opened.size (), node.ledger.cache.block_count); ASSERT_EQ (1 + total_accounts + opened.size (), node.ledger.cache.block_count);
ASSERT_EQ (1 + opened.size (), node.ledger.cache.account_count); ASSERT_EQ (1 + opened.size (), node.ledger.cache.account_count);
nano::keypair epoch_signer (nano::test_genesis_key); nano::keypair epoch_signer (nano::dev_genesis_key);
auto const block_count_before = node.ledger.cache.block_count.load (); auto const block_count_before = node.ledger.cache.block_count.load ();
auto const total_to_upgrade = 1 + total_accounts; auto const total_to_upgrade = 1 + total_accounts;
@ -1678,19 +1678,19 @@ TEST (node, mass_block_new)
nano::state_block_builder builder; nano::state_block_builder builder;
std::vector<std::shared_ptr<nano::state_block>> send_blocks; std::vector<std::shared_ptr<nano::state_block>> send_blocks;
auto send_threshold (nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_2, true, false, false))); auto send_threshold (nano::work_threshold (nano::work_version::work_1, nano::block_details (nano::epoch::epoch_2, true, false, false)));
auto latest_genesis = node.latest (nano::test_genesis_key.pub); auto ladev_genesis = node.latest (nano::dev_genesis_key.pub);
for (auto i = 0; i < num_blocks; ++i) for (auto i = 0; i < num_blocks; ++i)
{ {
auto send = builder.make_block () auto send = builder.make_block ()
.account (nano::test_genesis_key.pub) .account (nano::dev_genesis_key.pub)
.previous (latest_genesis) .previous (ladev_genesis)
.balance (nano::genesis_amount - i - 1) .balance (nano::genesis_amount - i - 1)
.representative (nano::test_genesis_key.pub) .representative (nano::dev_genesis_key.pub)
.link (keys[i].pub) .link (keys[i].pub)
.sign (nano::test_genesis_key.prv, nano::test_genesis_key.pub) .sign (nano::dev_genesis_key.prv, nano::dev_genesis_key.pub)
.work (*system.work.generate (nano::work_version::work_1, latest_genesis, send_threshold)) .work (*system.work.generate (nano::work_version::work_1, ladev_genesis, send_threshold))
.build (); .build ();
latest_genesis = send->hash (); ladev_genesis = send->hash ();
send_blocks.push_back (std::move (send)); send_blocks.push_back (std::move (send));
} }
std::cout << "Send blocks built, start processing" << std::endl; std::cout << "Send blocks built, start processing" << std::endl;

18
nano/test_common/testutil.cpp
View file

@ -12,17 +12,17 @@ using namespace std::chrono_literals;
/* Convenience constants for tests which are always on the test network */ /* Convenience constants for tests which are always on the test network */
namespace namespace
{ {
nano::ledger_constants test_constants (nano::nano_networks::nano_test_network); nano::ledger_constants dev_constants (nano::nano_networks::nano_dev_network);
} }
nano::keypair const & nano::zero_key (test_constants.zero_key); nano::keypair const & nano::zero_key (dev_constants.zero_key);
nano::keypair const & nano::test_genesis_key (test_constants.test_genesis_key); nano::keypair const & nano::dev_genesis_key (dev_constants.dev_genesis_key);
nano::account const & nano::nano_test_account (test_constants.nano_test_account); nano::account const & nano::nano_dev_account (dev_constants.nano_dev_account);
std::string const & nano::nano_test_genesis (test_constants.nano_test_genesis); std::string const & nano::nano_dev_genesis (dev_constants.nano_dev_genesis);
nano::account const & nano::genesis_account (test_constants.genesis_account); nano::account const & nano::genesis_account (dev_constants.genesis_account);
nano::block_hash const & nano::genesis_hash (test_constants.genesis_hash); nano::block_hash const & nano::genesis_hash (dev_constants.genesis_hash);
nano::uint128_t const & nano::genesis_amount (test_constants.genesis_amount); nano::uint128_t const & nano::genesis_amount (dev_constants.genesis_amount);
nano::account const & nano::burn_account (test_constants.burn_account); nano::account const & nano::burn_account (dev_constants.burn_account);
void nano::wait_peer_connections (nano::system & system_a) void nano::wait_peer_connections (nano::system & system_a)
{ {

6
nano/test_common/testutil.hpp
View file

@ -54,11 +54,11 @@ class network_params;
class system; class system;
extern nano::keypair const & zero_key; extern nano::keypair const & zero_key;
extern nano::keypair const & test_genesis_key; extern nano::keypair const & dev_genesis_key;
extern std::string const & nano_test_genesis; extern std::string const & nano_dev_genesis;
extern std::string const & genesis_block; extern std::string const & genesis_block;
extern nano::block_hash const & genesis_hash; extern nano::block_hash const & genesis_hash;
extern nano::public_key const & nano_test_account; extern nano::public_key const & nano_dev_account;
extern nano::public_key const & genesis_account; extern nano::public_key const & genesis_account;
extern nano::public_key const & burn_account; extern nano::public_key const & burn_account;
extern nano::uint128_t const & genesis_amount; extern nano::uint128_t const & genesis_amount;