feat(gtest): Improve value and ED managment

examples/autoreply/src/lib.rs

@@ -35,7 +35,7 @@ mod wasm;
 mod tests {
     use alloc::vec::Vec;
     use gstd::ActorId;
-    use gtest::{Program, System};
+    use gtest::{constants::DEFAULT_USER_ALICE, Program, System};
 
     #[test]
     fn auto_reply_received() {
@@ -45,20 +45,22 @@ mod tests {
         let prog1 = Program::current(&system);
         let prog1_id = ActorId::try_from(prog1.id().as_ref()).unwrap();
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
         // Init Program-1
-        let res = prog1.send(from, ActorId::zero());
-        assert!(!res.main_failed());
+        let init_msg1 = prog1.send(from, ActorId::zero());
 
         // Init Program-2 with Program-1 as destination
         let prog2 = Program::current(&system);
-        let res = prog2.send(from, prog1_id);
-        assert!(!res.main_failed());
+        let init_msg2 = prog2.send(from, prog1_id);
 
         // Send a message from Program-2 to Program-1
-        let res = prog2.send_bytes(from, b"Let's go!");
-        assert!(!res.main_failed());
+        let msg3 = prog2.send_bytes(from, b"Let's go!");
+
+        let res = system.run_next_block();
+        for msg in [init_msg1, init_msg2, msg3] {
+            assert!(res.succeed.contains(&msg));
+        }
 
         // Check whether the auto-reply was received
         let reply_received: bool = prog2

examples/custom/src/btree.rs

@@ -94,7 +94,7 @@ mod tests {
     use super::{Reply, Request};
     use crate::InitMessage;
     use alloc::vec;
-    use gtest::{Log, Program, System};
+    use gtest::{constants::DEFAULT_USER_ALICE, Log, Program, System};
 
     #[test]
     fn program_can_be_initialized() {
@@ -103,9 +103,10 @@ mod tests {
 
         let program = Program::current(&system);
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
-        let res = program.send(from, InitMessage::BTree);
+        program.send(from, InitMessage::BTree);
+        let res = system.run_next_block();
         let log = Log::builder().source(program.id()).dest(from);
         assert!(res.contains(&log));
     }
@@ -117,9 +118,9 @@ mod tests {
 
         let program = Program::current_opt(&system);
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
-        let _res = program.send(from, InitMessage::BTree);
+        program.send(from, InitMessage::BTree);
 
         IntoIterator::into_iter([
             Request::Insert(0, 1),
@@ -131,7 +132,10 @@ mod tests {
             Request::Clear,
             Request::List,
         ])
-        .map(|r| program.send(from, r))
+        .map(|r| {
+            program.send(from, r);
+            system.run_next_block()
+        })
         .zip(IntoIterator::into_iter([
             Reply::Value(None),
             Reply::Value(Some(1)),

examples/distributor/src/lib.rs

@@ -58,7 +58,7 @@ mod wasm;
 #[cfg(test)]
 mod tests {
     use super::{Reply, Request};
-    use gtest::{Log, Program, System};
+    use gtest::{constants::DEFAULT_USER_ALICE, Log, Program, System};
 
     #[test]
     fn program_can_be_initialized() {
@@ -67,9 +67,10 @@ mod tests {
 
         let program = Program::current(&system);
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
-        let res = program.send_bytes(from, b"init");
+        program.send_bytes(from, b"init");
+        let res = system.run_next_block();
         let log = Log::builder().source(program.id()).dest(from);
         assert!(res.contains(&log));
     }
@@ -81,18 +82,21 @@ mod tests {
 
         let program = Program::current(&system);
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
-        let _res = program.send_bytes(from, b"init");
+        // Init
+        program.send_bytes(from, b"init");
 
-        let res = program.send(from, Request::Receive(10));
+        program.send(from, Request::Receive(10));
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program.id())
             .dest(from)
             .payload(Reply::Success);
         assert!(res.contains(&log));
 
-        let res = program.send(from, Request::Report);
+        program.send(from, Request::Report);
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program.id())
             .dest(from)
@@ -108,25 +112,27 @@ mod tests {
     ) -> (Program, Program, Program) {
         system.init_logger();
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
         let program_1 = Program::current_with_id(system, program_1_id);
-        let _res = program_1.send_bytes(from, b"init");
+        program_1.send_bytes(from, b"init");
 
         let program_2 = Program::current_with_id(system, program_2_id);
-        let _res = program_2.send_bytes(from, b"init");
+        program_2.send_bytes(from, b"init");
 
         let program_3 = Program::current_with_id(system, program_3_id);
-        let _res = program_3.send_bytes(from, b"init");
+        program_3.send_bytes(from, b"init");
 
-        let res = program_1.send(from, Request::Join(program_2_id.into()));
+        program_1.send(from, Request::Join(program_2_id.into()));
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_1.id())
             .dest(from)
             .payload(Reply::Success);
         assert!(res.contains(&log));
 
-        let res = program_1.send(from, Request::Join(program_3_id.into()));
+        program_1.send(from, Request::Join(program_3_id.into()));
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_1.id())
             .dest(from)
@@ -141,23 +147,26 @@ mod tests {
         let system = System::new();
         let (program_1, program_2, _program_3) = multi_program_setup(&system, 1, 2, 3);
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
-        let res = program_1.send(from, Request::Receive(11));
+        program_1.send(from, Request::Receive(11));
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_1.id())
             .dest(from)
             .payload(Reply::Success);
         assert!(res.contains(&log));
 
-        let res = program_2.send(from, Request::Report);
+        program_2.send(from, Request::Report);
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_2.id())
             .dest(from)
             .payload(Reply::Amount(5));
         assert!(res.contains(&log));
 
-        let res = program_1.send(from, Request::Report);
+        program_1.send(from, Request::Report);
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_1.id())
             .dest(from)
@@ -172,13 +181,16 @@ mod tests {
         let (program_1, _program_2, _program_3) = multi_program_setup(&system, 1, 2, 3);
 
         let program_4_id = 4;
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
         let program_4 = Program::current_with_id(&system, program_4_id);
-        let _res = program_4.send_bytes(from, b"init");
+        program_4.send_bytes(from, b"init");
 
         IntoIterator::into_iter([Request::Receive(11), Request::Join(program_4_id.into())])
-            .map(|request| program_1.send(from, request))
+            .map(|request| {
+                program_1.send(from, request);
+                system.run_next_block()
+            })
             .zip(IntoIterator::into_iter([Reply::Success, Reply::Success]))
             .for_each(|(result, reply)| {
                 let log = Log::builder()

examples/gas-burned/src/lib.rs

@@ -13,23 +13,33 @@ mod wasm;
 
 #[cfg(test)]
 mod tests {
-    use gtest::{Gas, Program, System};
+    use gtest::{constants::DEFAULT_USER_ALICE, Gas, Program, System};
 
     #[test]
     fn gas_burned() {
         let system = System::new();
         system.init_logger();
 
-        let from = 42;
+        let from = DEFAULT_USER_ALICE;
 
         let program = Program::current(&system);
-        let res = program.send_bytes(from, "init");
-        let init_gas_burned = res.main_gas_burned();
+        let init_msg_id = program.send_bytes(from, "init");
+        let res = system.run_next_block();
+        let init_gas_burned = res
+            .gas_burned
+            .get(&init_msg_id)
+            .copied()
+            .expect("internal error: init message isn't sent");
         log::debug!("Init gas burned: {init_gas_burned}");
         assert!(init_gas_burned > Gas::zero());
 
-        let res = program.send_bytes(from, "handle");
-        let handle_gas_burned = res.main_gas_burned();
+        let handle_msg_id = program.send_bytes(from, "handle");
+        let res = system.run_next_block();
+        let handle_gas_burned = res
+            .gas_burned
+            .get(&handle_msg_id)
+            .copied()
+            .expect("internal error: init message isn't sent");
         log::debug!("Handle gas burned: {handle_gas_burned}");
         assert!(handle_gas_burned > init_gas_burned);
     }

examples/new-meta/tests/read_state.rs

@@ -2,7 +2,7 @@ use demo_new_meta::{
     MessageInitIn, Person, Wallet, META_EXPORTS_V1, META_EXPORTS_V2, META_WASM_V1, META_WASM_V2,
 };
 use gstd::Encode;
-use gtest::{state_args, state_args_encoded, Program, System};
+use gtest::{constants::DEFAULT_USER_ALICE, state_args, state_args_encoded, Program, System};
 
 #[test]
 fn read_state_bytes_returns_full_state() {
@@ -183,14 +183,14 @@ fn read_state_with_two_args_wasm_func_returns_transformed_state() {
 }
 
 fn initialize_current_program(system: &System) -> Program {
-    const SOME_USER_ID: u64 = 3;
     let program = Program::current(system);
     program.send(
-        SOME_USER_ID,
+        DEFAULT_USER_ALICE,
         MessageInitIn {
             amount: 123,
             currency: "USD".into(),
         },
     );
+    system.run_next_block();
     program
 }