fix(gtest): Fix execution model for mock wasms in gtest (#4220)

gear-tech · Sep 4, 2024 · d8e0e5b · d8e0e5b
1 parent 007cce6
commit d8e0e5b
Show file tree

Hide file tree

Showing 10 changed files with 237 additions and 191 deletions.
diff --git a/core-processor/Cargo.toml b/core-processor/Cargo.toml
@@ -35,3 +35,4 @@ default = ["std"]
 std = ["gear-core-backend/std"]
 strict = []
 mock = []
+gtest = []
diff --git a/core-processor/src/context.rs b/core-processor/src/context.rs
@@ -38,6 +38,14 @@ pub struct ContextChargedForProgram {
     pub(crate) gas_allowance_counter: GasAllowanceCounter,
 }
 
+impl ContextChargedForProgram {
+    /// Unwraps into inner data.
+    #[cfg(feature = "gtest")]
+    pub fn into_inner(self) -> (IncomingDispatch, ProgramId, GasCounter) {
+        (self.dispatch, self.destination_id, self.gas_counter)
+    }
+}
+
 pub struct ContextChargedForAllocations(pub(crate) ContextChargedForProgram);
 
 pub(crate) struct ContextData {

diff --git a/core-processor/src/lib.rs b/core-processor/src/lib.rs
@@ -35,8 +35,8 @@ mod precharge;
 mod processing;
 
 pub use context::{
-    ContextChargedForCode, ContextChargedForInstrumentation, ProcessExecutionContext,
-    SystemReservationContext,
+    ContextChargedForCode, ContextChargedForInstrumentation, ContextChargedForProgram,
+    ProcessExecutionContext, SystemReservationContext,
 };
 pub use ext::{
     AllocExtError, Ext, FallibleExtError, ProcessorContext, ProcessorExternalities,

diff --git a/gtest/Cargo.toml b/gtest/Cargo.toml
@@ -14,7 +14,7 @@ rust-version.workspace = true
 gear-core.workspace = true
 gear-common = { workspace = true, features = ["std"] }
 gear-core-errors.workspace = true
-core-processor = { workspace = true, features = ["std"] }
+core-processor = { workspace = true, features = ["std", "gtest"] }
 gear-lazy-pages.workspace = true
 gear-lazy-pages-common.workspace = true
 gear-lazy-pages-native-interface.workspace = true

diff --git a/gtest/src/manager.rs b/gtest/src/manager.rs
@@ -47,7 +47,7 @@ use crate::{
 use core_processor::{
     common::*,
     configs::{BlockConfig, TESTS_MAX_PAGES_NUMBER},
-    ContextChargedForInstrumentation, Ext,
+    ContextChargedForInstrumentation, ContextChargedForProgram, Ext,
 };
 use gear_common::{
     auxiliary::{
@@ -70,7 +70,6 @@ use gear_core::{
     },
     pages::{num_traits::Zero, GearPage},
 };
-use gear_core_errors::{ErrorReplyReason, SimpleExecutionError};
 use gear_lazy_pages_native_interface::LazyPagesNative;
 use hold_bound::HoldBoundBuilder;
 use rand::{rngs::StdRng, RngCore, SeedableRng};