update tests, revert RUNTIME_API_BLOCK_LIMITS_COUNT

pallets/gear/src/lib.rs

@@ -796,7 +796,7 @@ pub mod pallet {
                     value,
                     allow_other_panics,
                     allow_skip_zero_replies,
-                    Some(gas_allowance),
+                    None,
                 );
                 GasAllowanceOf::<T>::put(gas_allowance);
                 if queue_processing {

pallets/gear/src/runtime_api.rs

@@ -23,6 +23,10 @@ use core::convert::TryFrom;
 use gear_core::pages::WasmPage;
 use gear_wasm_instrument::syscalls::SysCallName;
 
+// Multiplier 6 was experimentally found as median value for performance,
+// security and abilities for calculations on-chain.
+pub(crate) const RUNTIME_API_BLOCK_LIMITS_COUNT: u64 = 6;
+
 pub(crate) struct CodeWithMemoryData {
     pub instrumented_code: InstrumentedCode,
     pub allocations: BTreeSet<WasmPage>,
@@ -114,7 +118,9 @@ where
 
         let mut ext_manager = ExtManager::<T>::default();
 
-        let _ = Self::update_gas_allowance(allowance_multiplier.unwrap_or(1));
+        let _ = Self::update_gas_allowance(
+            allowance_multiplier.unwrap_or(RUNTIME_API_BLOCK_LIMITS_COUNT),
+        );
 
         loop {
             if QueueProcessingOf::<T>::denied() {
@@ -326,7 +332,9 @@ where
             timestamp: <pallet_timestamp::Pallet<T>>::get().unique_saturated_into(),
         };
 
-        let gas_allowance = Self::update_gas_allowance(allowance_multiplier.unwrap_or(1));
+        let gas_allowance = Self::update_gas_allowance(
+            allowance_multiplier.unwrap_or(RUNTIME_API_BLOCK_LIMITS_COUNT),
+        );
 
         core_processor::informational::execute_for_reply::<ExecutionEnvironment<String>, String>(
             function.into(),
@@ -366,7 +374,9 @@ where
             timestamp: <pallet_timestamp::Pallet<T>>::get().unique_saturated_into(),
         };
 
-        let gas_allowance = Self::update_gas_allowance(allowance_multiplier.unwrap_or(1));
+        let gas_allowance = Self::update_gas_allowance(
+            allowance_multiplier.unwrap_or(RUNTIME_API_BLOCK_LIMITS_COUNT),
+        );
 
         core_processor::informational::execute_for_reply::<ExecutionEnvironment<String>, String>(
             String::from("state"),
@@ -405,7 +415,9 @@ where
             timestamp: <pallet_timestamp::Pallet<T>>::get().unique_saturated_into(),
         };
 
-        let gas_allowance = Self::update_gas_allowance(allowance_multiplier.unwrap_or(1));
+        let gas_allowance = Self::update_gas_allowance(
+            allowance_multiplier.unwrap_or(RUNTIME_API_BLOCK_LIMITS_COUNT),
+        );
 
         core_processor::informational::execute_for_reply::<ExecutionEnvironment<String>, String>(
             String::from("metahash"),

pallets/gear/src/tests.rs

@@ -232,7 +232,7 @@ fn read_big_state() {
 
             assert_succeed(mid);
             let state =
-                Gear::read_state_impl(pid, Default::default()).expect("Failed to read state");
+                Gear::read_state_impl(pid, Default::default(), None).expect("Failed to read state");
             assert_eq!(approx_size(state.len(), i), expected_size(i));
         }
     });
@@ -2002,8 +2002,8 @@ fn read_state_works() {
 
         let expected = Wallet::test_sequence().encode();
 
-        let res =
-            Gear::read_state_impl(program_id, Default::default()).expect("Failed to read state");
+        let res = Gear::read_state_impl(program_id, Default::default(), None)
+            .expect("Failed to read state");
 
         assert_eq!(res, expected);
     });
@@ -2044,6 +2044,7 @@ fn read_state_using_wasm_works() {
             func1,
             META_WASM_V1.to_vec(),
             None,
+            None,
         )
         .expect("Failed to read state");
 
@@ -2069,6 +2070,7 @@ fn read_state_using_wasm_works() {
             func2,
             META_WASM_V2.to_vec(),
             Some(id.encode()),
+            None,
         )
         .expect("Failed to read state");
 
@@ -2089,6 +2091,7 @@ fn read_state_bn_and_timestamp_works() {
             "block_number",
             META_WASM_V3.to_vec(),
             None,
+            None,
         )
         .expect("Failed to read state");
         let res = u32::decode(&mut res.as_ref()).unwrap();
@@ -2103,6 +2106,7 @@ fn read_state_bn_and_timestamp_works() {
             "block_timestamp",
             META_WASM_V3.to_vec(),
             None,
+            None,
         )
         .expect("Failed to read state");
         let res = u64::decode(&mut res.as_ref()).unwrap();
@@ -2164,6 +2168,7 @@ fn wasm_metadata_generation_works() {
             "metadata",
             META_WASM_V1.to_vec(),
             None,
+            None,
         )
         .expect("Failed to read state");
 
@@ -2182,6 +2187,7 @@ fn wasm_metadata_generation_works() {
             "metadata",
             META_WASM_V2.to_vec(),
             None,
+            None,
         )
         .expect("Failed to read state");
 
@@ -2234,7 +2240,8 @@ fn read_state_using_wasm_errors() {
             Default::default(),
             "inexistent",
             meta_wasm.clone(),
-            None
+            None,
+            None,
         )
         .is_err());
         // Empty function
@@ -2243,7 +2250,8 @@ fn read_state_using_wasm_errors() {
             Default::default(),
             "empty",
             meta_wasm.clone(),
-            None
+            None,
+            None,
         )
         .is_err());
         // Greed function
@@ -2252,7 +2260,8 @@ fn read_state_using_wasm_errors() {
             Default::default(),
             "loop",
             meta_wasm,
-            None
+            None,
+            None,
         )
         .is_err());
     });
@@ -6334,15 +6343,15 @@ fn state_request() {
         run_to_next_block(None);
 
         for (key, value) in data {
-            let ret =
-                Gear::read_state_impl(program_id, StateRequest::ForKey(key).encode()).unwrap();
+            let ret = Gear::read_state_impl(program_id, StateRequest::ForKey(key).encode(), None)
+                .unwrap();
             assert_eq!(
                 Option::<u32>::decode(&mut ret.as_slice()).unwrap().unwrap(),
                 value
             );
         }
 
-        let ret = Gear::read_state_impl(program_id, StateRequest::Full.encode()).unwrap();
+        let ret = Gear::read_state_impl(program_id, StateRequest::Full.encode(), None).unwrap();
         let ret = BTreeMap::<u32, u32>::decode(&mut ret.as_slice()).unwrap();
         let expected: BTreeMap<u32, u32> = data.into_iter().collect();
         assert_eq!(ret, expected);