refactor(gtest): Change block execution model in gtest to be simila…

…r to the vara-runtime (#4119)
gear-tech · Aug 14, 2024 · 8e4f55f · 8e4f55f
1 parent 67410ab
commit 8e4f55f
Show file tree

Hide file tree

Showing 23 changed files with 679 additions and 518 deletions.
diff --git a/examples/autoreply/src/lib.rs b/examples/autoreply/src/lib.rs
@@ -48,17 +48,19 @@ mod tests {
         let from = 42;
 
         // 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

diff --git a/examples/custom/src/btree.rs b/examples/custom/src/btree.rs
@@ -105,7 +105,8 @@ mod tests {
 
         let from = 42;
 
-        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));
     }
@@ -119,8 +120,7 @@ mod tests {
 
         let from = 42;
 
-        let _res = program.send(from, InitMessage::BTree);
-
+        program.send(from, InitMessage::BTree);
         IntoIterator::into_iter([
             Request::Insert(0, 1),
             Request::Insert(0, 2),
@@ -131,7 +131,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)),

diff --git a/examples/distributor/src/lib.rs b/examples/distributor/src/lib.rs
@@ -69,7 +69,8 @@ mod tests {
 
         let from = 42;
 
-        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));
     }
@@ -83,16 +84,19 @@ mod tests {
 
         let from = 42;
 
-        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)
@@ -111,22 +115,24 @@ mod tests {
         let from = 42;
 
         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)
@@ -143,21 +149,24 @@ mod tests {
 
         let from = 42;
 
-        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)
@@ -175,10 +184,13 @@ mod tests {
         let from = 42;
 
         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()

diff --git a/examples/gas-burned/src/lib.rs b/examples/gas-burned/src/lib.rs
@@ -23,13 +23,23 @@ mod tests {
         let from = 42;
 
         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);
     }

diff --git a/examples/new-meta/tests/read_state.rs b/examples/new-meta/tests/read_state.rs
@@ -192,5 +192,6 @@ fn initialize_current_program(system: &System) -> Program {
             currency: "USD".into(),
         },
     );
+    system.run_next_block();
     program
 }
diff --git a/examples/node/src/lib.rs b/examples/node/src/lib.rs
@@ -71,8 +71,9 @@ mod tests {
         let from = 42;
 
         let program = Program::current(&system);
-        let res = program.send(from, Request::IsReady);
-        assert!(res.main_failed());
+        let msg_id = program.send(from, Request::IsReady);
+        let res = system.run_next_block();
+        assert!(res.failed.contains(&msg_id));
     }
 
     #[test]
@@ -83,9 +84,10 @@ mod tests {
         let from = 42;
 
         let program = Program::current(&system);
-        let res = program.send(from, Initialization { status: 5 });
+        let msg_id = program.send(from, Initialization { status: 5 });
         let log = Log::builder().source(program.id()).dest(from);
-        assert!(!res.main_failed());
+        let res = system.run_next_block();
+        assert!(res.succeed.contains(&msg_id));
         assert!(res.contains(&log));
     }
 
@@ -97,23 +99,26 @@ mod tests {
         let from = 42;
 
         let program = Program::current(&system);
-        let _res = program.send(from, Initialization { status: 5 });
+        program.send(from, Initialization { status: 5 });
 
-        let res = program.send(from, Request::IsReady);
+        program.send(from, Request::IsReady);
         let log = Log::builder()
             .source(program.id())
             .dest(from)
             .payload(Reply::Yes);
+        let res = system.run_next_block();
         assert!(res.contains(&log));
 
-        let res = program.send(from, Request::Begin(Operation { to_status: 7 }));
+        program.send(from, Request::Begin(Operation { to_status: 7 }));
+        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::Commit);
+        program.send(from, Request::Commit);
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program.id())
             .dest(from)
@@ -133,36 +138,40 @@ mod tests {
         let program_3_id = 3;
 
         let program_1 = Program::current_with_id(&system, program_1_id);
-        let _res = program_1.send(from, Initialization { status: 5 });
+        program_1.send(from, Initialization { status: 5 });
 
         let program_2 = Program::current_with_id(&system, program_2_id);
-        let _res = program_2.send(from, Initialization { status: 5 });
+        program_2.send(from, Initialization { status: 5 });
 
         let program_3 = Program::current_with_id(&system, program_3_id);
-        let _res = program_3.send(from, Initialization { status: 9 });
+        program_3.send(from, Initialization { status: 9 });
 
-        let res = program_1.send(from, Request::Add(program_2_id.into()));
+        program_1.send(from, Request::Add(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::Add(program_3_id.into()));
+        program_1.send(from, Request::Add(program_3_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::Begin(Operation { to_status: 7 }));
+        program_1.send(from, Request::Begin(Operation { to_status: 7 }));
+        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::Commit);
+        program_1.send(from, Request::Commit);
+        let res = system.run_next_block();
         let log = Log::builder()
             .source(program_1.id())
             .dest(from)