fix integration test

near · Aug 15, 2021 · 7be383f · 7be383f
1 parent 330e083
commit 7be383f
Showing 1 changed file with 27 additions and 8 deletions.
diff --git a/nearcore/src/config.rs b/nearcore/src/config.rs
@@ -509,6 +509,7 @@ impl Genesis {
         accounts: Vec<AccountId>,
         num_validator_seats: NumSeats,
         num_validator_seats_per_shard: Vec<NumSeats>,
+        shard_layout: ShardLayout,
     ) -> Self {
         let mut validators = vec![];
         let mut records = vec![];
@@ -557,18 +558,28 @@ impl Genesis {
             chunk_producer_kickout_threshold: CHUNK_PRODUCER_KICKOUT_THRESHOLD,
             fishermen_threshold: FISHERMEN_THRESHOLD,
             min_gas_price: MIN_GAS_PRICE,
+            shard_layout,
             ..Default::default()
         };
         Genesis::new(config, records.into())
     }
 
     pub fn test(accounts: Vec<AccountId>, num_validator_seats: NumSeats) -> Self {
-        Self::test_with_seeds(accounts, num_validator_seats, vec![num_validator_seats])
+        Self::test_with_seeds(
+            accounts,
+            num_validator_seats,
+            vec![num_validator_seats],
+            ShardLayout::default(),
+        )
     }
 
     pub fn test_free(accounts: Vec<AccountId>, num_validator_seats: NumSeats) -> Self {
-        let mut genesis =
-            Self::test_with_seeds(accounts, num_validator_seats, vec![num_validator_seats]);
+        let mut genesis = Self::test_with_seeds(
+            accounts,
+            num_validator_seats,
+            vec![num_validator_seats],
+            ShardLayout::default(),
+        );
         genesis.config.runtime_config = RuntimeConfig::free();
         genesis
     }
@@ -578,7 +589,13 @@ impl Genesis {
         num_validator_seats: NumSeats,
         num_validator_seats_per_shard: Vec<NumSeats>,
     ) -> Self {
-        Self::test_with_seeds(accounts, num_validator_seats, num_validator_seats_per_shard)
+        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_version(
@@ -587,10 +604,12 @@ impl Genesis {
         num_validator_seats_per_shard: Vec<NumSeats>,
     ) -> Self {
         let num_shards = num_validator_seats_per_shard.len() as NumShards;
-        let mut genesis =
-            Self::test_with_seeds(accounts, num_validator_seats, num_validator_seats_per_shard);
-        genesis.config.shard_layout = ShardLayout::v0(num_shards, 1);
-        genesis
+        Self::test_with_seeds(
+            accounts,
+            num_validator_seats,
+            num_validator_seats_per_shard,
+            ShardLayout::v0(num_shards, 1),
+        )
     }
 }