From 2bb24a27102d116f44f7cd6a53af29779599ff90 Mon Sep 17 00:00:00 2001 From: Min Zhang Date: Thu, 19 Aug 2021 13:44:48 -0400 Subject: [PATCH] fix neard testnet to use shard_version = 0 instead of 1 --- integration-tests/src/runtime_utils.rs | 2 +- integration-tests/tests/client/process_blocks.rs | 14 ++++++++++---- integration-tests/tests/nearcore/node_cluster.rs | 2 +- .../tests/nearcore/sync_state_nodes.rs | 4 ++-- nearcore/src/config.rs | 14 ++++++++++++++ nearcore/src/runtime/mod.rs | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/integration-tests/src/runtime_utils.rs b/integration-tests/src/runtime_utils.rs index 1449ced42f9..463021f547b 100644 --- a/integration-tests/src/runtime_utils.rs +++ b/integration-tests/src/runtime_utils.rs @@ -14,7 +14,7 @@ use testlib::runtime_utils::{add_test_contract, alice_account, bob_account}; pub const TEST_SHARD_UID: ShardUId = ShardUId { version: 1, shard_id: 0 }; pub fn get_runtime_and_trie() -> (Runtime, ShardTries, StateRoot) { - let mut genesis = Genesis::test_sharded( + let mut genesis = Genesis::test_sharded_new_version( vec![alice_account(), bob_account(), "carol.near".parse().unwrap()], 3, vec![3], diff --git a/integration-tests/tests/client/process_blocks.rs b/integration-tests/tests/client/process_blocks.rs index cd4a686e193..03738d3775d 100644 --- a/integration-tests/tests/client/process_blocks.rs +++ b/integration-tests/tests/client/process_blocks.rs @@ -1549,8 +1549,11 @@ fn test_gc_after_state_sync() { fn test_process_block_after_state_sync() { let epoch_length = 1024; // test with shard_version > 0 - let mut genesis = - Genesis::test_sharded(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1, vec![1]); + let mut genesis = Genesis::test_sharded_new_version( + vec!["test0".parse().unwrap(), "test1".parse().unwrap()], + 1, + vec![1], + ); genesis.config.epoch_length = epoch_length; let mut chain_genesis = ChainGenesis::test(); chain_genesis.epoch_length = epoch_length; @@ -2386,8 +2389,11 @@ fn test_refund_receipts_processing() { let epoch_length = 5; let min_gas_price = 10000; - let mut genesis = - Genesis::test_sharded(vec!["test0".parse().unwrap(), "test1".parse().unwrap()], 1, vec![1]); + let mut genesis = Genesis::test_sharded_new_version( + vec!["test0".parse().unwrap(), "test1".parse().unwrap()], + 1, + vec![1], + ); genesis.config.epoch_length = epoch_length; genesis.config.min_gas_price = min_gas_price; // set gas limit to be small diff --git a/integration-tests/tests/nearcore/node_cluster.rs b/integration-tests/tests/nearcore/node_cluster.rs index a9941364dd1..50c7516fb46 100644 --- a/integration-tests/tests/nearcore/node_cluster.rs +++ b/integration-tests/tests/nearcore/node_cluster.rs @@ -24,7 +24,7 @@ pub fn start_nodes( let num_nodes = dirs.len(); let num_tracking_nodes = num_nodes - num_lightclient; let seeds = (0..num_nodes).map(|i| format!("near.{}", i)).collect::>(); - let mut genesis = Genesis::test_sharded( + let mut genesis = Genesis::test_sharded_new_version( seeds.iter().map(|s| s.parse().unwrap()).collect(), num_validator_seats, (0..num_shards).map(|_| num_validator_seats).collect(), diff --git a/integration-tests/tests/nearcore/sync_state_nodes.rs b/integration-tests/tests/nearcore/sync_state_nodes.rs index d3a48c248a5..ef61e3c1119 100644 --- a/integration-tests/tests/nearcore/sync_state_nodes.rs +++ b/integration-tests/tests/nearcore/sync_state_nodes.rs @@ -112,7 +112,7 @@ fn sync_state_nodes_multishard() { heavy_test(|| { init_integration_logger(); - let mut genesis = Genesis::test_sharded( + let mut genesis = Genesis::test_sharded_new_version( vec![ "test1".parse().unwrap(), "test2".parse().unwrap(), @@ -259,7 +259,7 @@ fn sync_empty_state() { heavy_test(|| { init_integration_logger(); - let mut genesis = Genesis::test_sharded( + let mut genesis = Genesis::test_sharded_new_version( vec!["test1".parse().unwrap(), "test2".parse().unwrap()], 1, vec![1, 1, 1, 1], diff --git a/nearcore/src/config.rs b/nearcore/src/config.rs index 958978234fe..bbf665f5803 100644 --- a/nearcore/src/config.rs +++ b/nearcore/src/config.rs @@ -588,6 +588,20 @@ impl Genesis { accounts: Vec, num_validator_seats: NumSeats, num_validator_seats_per_shard: Vec, + ) -> Self { + let num_shards = num_validator_seats_per_shard.len() as NumShards; + Self::test_with_seeds( + accounts, + num_validator_seats, + num_validator_seats_per_shard, + ShardLayout::v0(num_shards, 0), + ) + } + + pub fn test_sharded_new_version( + accounts: Vec, + num_validator_seats: NumSeats, + num_validator_seats_per_shard: Vec, ) -> Self { let num_shards = num_validator_seats_per_shard.len() as NumShards; Self::test_with_seeds( diff --git a/nearcore/src/runtime/mod.rs b/nearcore/src/runtime/mod.rs index 461e3532ff3..436babe1c92 100644 --- a/nearcore/src/runtime/mod.rs +++ b/nearcore/src/runtime/mod.rs @@ -1832,7 +1832,7 @@ mod test { acc.union(&x.iter().cloned().collect()).cloned().collect() }); let validators_len = all_validators.len() as ValidatorId; - let mut genesis = Genesis::test_sharded( + let mut genesis = Genesis::test_sharded_new_version( all_validators.into_iter().collect(), validators_len, validators.iter().map(|x| x.len() as ValidatorId).collect(),