Merge #2368 #2369

2368: change parameters for v8 r=damip a=damip 2369: Fix coverage r=damip a=yvan-sraka Co-authored-by: Damir Vodenicarevic <[email protected]> Co-authored-by: Yvan Sraka <[email protected]>
massalabs · Mar 3, 2022 · fb3c7d1 · fb3c7d1
3 parents c536df1 + 78b22e5 + d243d5f
commit fb3c7d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -164,7 +164,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --all-features --no-fail-fast
+          args: --features testing --no-fail-fast
         env:
           CARGO_INCREMENTAL: "0"
           RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests"

diff --git a/massa-models/src/node_configuration/default.rs b/massa-models/src/node_configuration/default.rs
@@ -41,14 +41,14 @@ lazy_static::lazy_static! {
             .unwrap()
             .saturating_add(MassaTime::from(1000 * 60 * 3))
     } else {
-        1643918400000.into()
+        1646334000000.into()
     };
 
     /// TESTNET: time when the blockclique is ended.
     pub static ref END_TIMESTAMP: Option<MassaTime> = if cfg!(feature = "sandbox") {
         None
     } else {
-        Some(1646078400000.into())
+        Some(1648764000000.into())
     };
     /// Private_key to sign genesis blocks.
     pub static ref GENESIS_KEY: PrivateKey = "SGoTK5TJ9ZcCgQVmdfma88UdhS6GK94aFEYAsU3F1inFayQ6S"
@@ -60,7 +60,7 @@ lazy_static::lazy_static! {
         if cfg!(feature = "sandbox") {
             "SAND.0.0"
         } else {
-            "TEST.7.0"
+            "TEST.8.0"
         }
         .parse()
         .unwrap()
@@ -82,9 +82,9 @@ pub const ENDORSEMENT_COUNT: u32 = 9;
 /// Threshold for fitness.
 pub const DELTA_F0: u64 = 640;
 /// Maximum number of operations per block
-pub const MAX_OPERATIONS_PER_BLOCK: u32 = 102400;
+pub const MAX_OPERATIONS_PER_BLOCK: u32 = 204800;
 /// Maximum block size in bytes
-pub const MAX_BLOCK_SIZE: u32 = 102400;
+pub const MAX_BLOCK_SIZE: u32 = 204800;
 /// Maximum operation validity period count
 pub const OPERATION_VALIDITY_PERIODS: u64 = 10;
 /// cycle duration in periods

diff --git a/massa-node/base_config/config.toml b/massa-node/base_config/config.toml
@@ -39,12 +39,12 @@
     # max number of blocks waiting for dependencies
     max_dependency_blocks = 2048
     # number of final periods that must be kept at all times (increase to more resilience to short network disconnections, high values will increase RAM usage.)
-    force_keep_final_periods = 20
+    force_keep_final_periods = 30
 
     # max number of batches of pool operations to scan when generating a block
     max_operations_fill_attempts = 102400
     # size of a pool operation batch for block creation
-    operation_batch_size = 1024
+    operation_batch_size = 2048
 
     # path to the ledger file
     ledger_path = "storage/ledger"
@@ -179,11 +179,11 @@
     # max size of recently bootstrapped IP cache
     ip_list_max_size = 10000
     # refuse consecutive bootstrap attempts from a given IP when the interval between them is lower than per_ip_min_interval milliseconds
-    per_ip_min_interval = 300000
+    per_ip_min_interval = 86400000
 
 [pool]
     # max number of operations kept per thread
-    max_pool_size_per_thread = 100000
+    max_pool_size_per_thread = 25000
     # if an operation is too much in the future it will be ignored
     max_operation_future_validity_start_periods = 100
     # max number of endorsements kept