rusk: Pass proper block_gas_limit value to new_state

rusk/benches/block_ingestion.rs

@@ -29,6 +29,8 @@ use tempfile::tempdir;
 
 use common::state::new_state;
 
+const BLOCK_GAS_LIMIT: u64 = 1_000_000_000_000;
+
 fn load_phoenix_txs() -> Vec<Transaction> {
     // The file "phoenix-txs" can be generated using
     // `generate_phoenix_txs()` in "tests/rusk-state.rs".
@@ -164,7 +166,8 @@ pub fn accept_benchmark(c: &mut Criterion) {
     let snapshot = toml::from_str(include_str!("../tests/config/bench.toml"))
         .expect("Cannot deserialize config");
 
-    let rusk = new_state(&tmp, &snapshot).expect("Creating state should work");
+    let rusk = new_state(&tmp, &snapshot, BLOCK_GAS_LIMIT)
+        .expect("Creating state should work");
 
     let phoenix_txs = load_phoenix_txs();
     let moonlight_txs = load_moonlight_txs();

rusk/tests/common/state.rs

@@ -30,15 +30,19 @@ use tracing::info;
 use crate::common::keys::STAKE_SK;
 
 // Creates a Rusk initial state in the given directory
-pub fn new_state<P: AsRef<Path>>(dir: P, snapshot: &Snapshot) -> Result<Rusk> {
+pub fn new_state<P: AsRef<Path>>(
+    dir: P,
+    snapshot: &Snapshot,
+    block_gas_limit: u64,
+) -> Result<Rusk> {
     let dir = dir.as_ref();
 
     let (_, commit_id) = state::deploy(dir, snapshot, |_| {})
         .expect("Deploying initial state should succeed");
 
     let (sender, _) = broadcast::channel(10);
 
-    let rusk = Rusk::new(dir, None, None, u64::MAX, sender)
+    let rusk = Rusk::new(dir, None, None, block_gas_limit, u64::MAX, sender)
         .expect("Instantiating rusk should succeed");
 
     assert_eq!(
@@ -109,7 +113,6 @@ pub fn generator_procedure(
 
     let call_params = CallParams {
         round,
-        block_gas_limit,
         generator_pubkey,
         to_slash,
         voters_pubkey: None,

rusk/tests/rusk-state.rs

@@ -35,14 +35,15 @@ use tracing::info;
 use crate::common::state::new_state;
 
 const BLOCK_HEIGHT: u64 = 1;
+const BLOCK_GAS_LIMIT: u64 = 100_000_000_000;
 const INITIAL_BALANCE: u64 = 10_000_000_000;
 
 // Creates the Rusk initial state for the tests below
 fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("./config/rusk-state.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 fn leaves_from_height(rusk: &Rusk, height: u64) -> Result<Vec<TreeLeaf>> {
@@ -183,7 +184,7 @@ async fn generate_phoenix_txs() -> Result<(), Box<dyn std::error::Error>> {
     let snapshot = toml::from_str(include_str!("./config/bench.toml"))
         .expect("Cannot deserialize config");
 
-    let rusk = new_state(&tmp, &snapshot)?;
+    let rusk = new_state(&tmp, &snapshot, 100_000_000_000)?;
 
     let cache =
         Arc::new(std::sync::RwLock::new(std::collections::HashMap::new()));
@@ -248,7 +249,7 @@ async fn generate_moonlight_txs() -> Result<(), Box<dyn std::error::Error>> {
     let snapshot = toml::from_str(include_str!("./config/bench.toml"))
         .expect("Cannot deserialize config");
 
-    let rusk = new_state(&tmp, &snapshot)?;
+    let rusk = new_state(&tmp, &snapshot, 100_000_000_000)?;
 
     let cache =
         Arc::new(std::sync::RwLock::new(std::collections::HashMap::new()));

rusk/tests/services/contract_deployment.rs

@@ -95,7 +95,7 @@ fn initial_state<P: AsRef<Path>>(dir: P, deploy_bob: bool) -> Result<Rusk> {
 
     let (sender, _) = broadcast::channel(10);
 
-    let rusk = Rusk::new(dir, None, None, u64::MAX, sender)
+    let rusk = Rusk::new(dir, None, None, BLOCK_GAS_LIMIT, u64::MAX, sender)
         .expect("Instantiating rusk should succeed");
     Ok(rusk)
 }

rusk/tests/services/gas_behavior.rs

@@ -35,7 +35,7 @@ fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("../config/gas-behavior.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 const SENDER_INDEX_0: u64 = 0;

rusk/tests/services/multi_transfer.rs

@@ -32,7 +32,7 @@ fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
         toml::from_str(include_str!("../config/multi_transfer.toml"))
             .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 /// Executes three different transactions in the same block, expecting only two

rusk/tests/services/stake.rs

@@ -35,15 +35,15 @@ fn stake_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("../config/stake.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 // Creates the Rusk initial state for the tests below
 fn slash_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("../config/slash.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 /// Stakes an amount Dusk and produces a block with this single transaction,

rusk/tests/services/transfer.rs

@@ -29,7 +29,7 @@ fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("../config/transfer.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 /// Transacts between two accounts on the in the same wallet and produces a

rusk/tests/services/unspendable.rs

@@ -36,7 +36,7 @@ fn initial_state<P: AsRef<Path>>(dir: P) -> Result<Rusk> {
     let snapshot = toml::from_str(include_str!("../config/unspendable.toml"))
         .expect("Cannot deserialize config");
 
-    new_state(dir, &snapshot)
+    new_state(dir, &snapshot, BLOCK_GAS_LIMIT)
 }
 
 const SENDER_INDEX_0: u64 = 0;