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

Rewriting how telemetry tests are run so their modifications don't alias with other instances of ledger_constants.

Browse source
This commit is contained in:
clemahieu 2021-08-10 23:02:44 +01:00
commit 7d4bc91af5
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
1 changed files with 8 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
nano/core_test/telemetry.cpp
View file

@ -550,20 +550,11 @@ TEST (telemetry, remove_peer_different_genesis)
nano::system system (1);
auto node0 (system.nodes[0]);
ASSERT_EQ (0, node0->network.size ());
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work));
// Change genesis block to something else in this test (this is the reference telemetry processing uses).
// Possible TSAN issue in the future if something else uses this, but will only appear in tests.
nano::state_block_builder builder;
auto junk = builder
.account (nano::dev::genesis_key.pub)
.previous (0)
.representative (nano::dev::genesis_key.pub)
.balance (0)
.link (0)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (0)
.build_shared ();
node1->network_params.ledger.genesis = junk;
nano::network_params network_params{ nano::networks::nano_dev_network };
network_params.ledger.genesis = network_params.ledger.nano_live_genesis;
nano::node_config config{ network_params };
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::unique_path (), config, system.work));
node1->start ();
system.nodes.push_back (node1);
node0->network.merge_peer (node1->network.endpoint ());
@ -590,18 +581,10 @@ TEST (telemetry, remove_peer_different_genesis_udp)
nano::system system (1, nano::transport::transport_type::udp, node_flags);
auto node0 (system.nodes[0]);
ASSERT_EQ (0, node0->network.size ());
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags));
nano::state_block_builder builder;
auto junk = builder
.account (nano::dev::genesis_key.pub)
.previous (0)
.representative (nano::dev::genesis_key.pub)
.balance (0)
.link (0)
.sign (nano::dev::genesis_key.prv, nano::dev::genesis_key.pub)
.work (0)
.build_shared ();
node1->network_params.ledger.genesis = junk;
nano::network_params network_params{ nano::networks::nano_dev_network };
network_params.ledger.genesis = network_params.ledger.nano_live_genesis;
nano::node_config config{ network_params };
auto node1 (std::make_shared<nano::node> (system.io_ctx, nano::unique_path (), config, system.work, node_flags));
node1->start ();
system.nodes.push_back (node1);
auto channel0 (std::make_shared<nano::transport::channel_udp> (node1->network.udp_channels, node0->network.endpoint (), node0->network_params.network.protocol_version));