Merge pull request #13 from Chia-Network/20240820-fix-unsim-test-run

Dependency fix for cargo test without features=sim-tests

Author: prozacchiwawa

.github/workflows/build-test.yml

@@ -92,6 +92,9 @@ jobs:
       - name: cargo test
         run: |
           python -m pip install chia-blockchain
+          # Try tests without sim-tests to ensure we're tracking build failures in that
+          # configuration.  Also it's a lot shorter.
+          cargo test
           cargo test --features=sim-tests
 
   coverage:

src/tests/calpoker.rs

@@ -7,7 +7,10 @@ use clvm_traits::{ClvmEncoder, ToClvm};
 
 use crate::channel_handler::game::Game;
 use crate::common::types::{AllocEncoder, Amount, Error, GameID, Hash, Sha256Input};
-use crate::tests::simenv::{GameAction, GameActionResult, SimulatorEnvironment};
+use crate::tests::game::{GameAction, GameActionResult};
+
+#[cfg(feature = "sim-tests")]
+use crate::tests::simenv::SimulatorEnvironment;
 
 pub fn load_calpoker(allocator: &mut AllocEncoder, game_id: GameID) -> Result<Game, Error> {
     Game::new(
@@ -17,6 +20,7 @@ pub fn load_calpoker(allocator: &mut AllocEncoder, game_id: GameID) -> Result<Ga
     )
 }
 
+#[cfg(feature = "sim-tests")]
 #[test]
 fn test_load_calpoker() {
     let mut allocator = AllocEncoder::new();
@@ -31,6 +35,7 @@ fn test_load_calpoker() {
         .expect("should get a sim env");
 }
 
+#[cfg(feature = "sim-tests")]
 fn run_calpoker_play_test(
     allocator: &mut AllocEncoder,
     moves: &[GameAction],
@@ -77,6 +82,7 @@ pub fn test_moves_1(allocator: &mut AllocEncoder) -> [GameAction; 5] {
     ]
 }
 
+#[cfg(feature = "sim-tests")]
 #[test]
 fn test_play_calpoker_happy_path() {
     let mut allocator = AllocEncoder::new();
@@ -86,6 +92,7 @@ fn test_play_calpoker_happy_path() {
 }
 
 #[test]
+#[cfg(feature = "sim-tests")]
 fn test_play_calpoker_on_chain_after_1_move_p1() {
     let mut allocator = AllocEncoder::new();
 
@@ -100,6 +107,7 @@ fn test_play_calpoker_on_chain_after_1_move_p1() {
 }
 
 #[test]
+#[cfg(feature = "sim-tests")]
 fn test_play_calpoker_on_chain_after_1_move_p0_lost_message() {
     let mut allocator = AllocEncoder::new();
     let moves = test_moves_1(&mut allocator);
@@ -111,6 +119,7 @@ fn test_play_calpoker_on_chain_after_1_move_p0_lost_message() {
 }
 
 #[test]
+#[cfg(feature = "sim-tests")]
 fn test_play_calpoker_on_chain_after_1_move_p0() {
     let mut allocator = AllocEncoder::new();
     let moves = test_moves_1(&mut allocator);
@@ -121,6 +130,7 @@ fn test_play_calpoker_on_chain_after_1_move_p0() {
 }
 
 #[test]
+#[cfg(feature = "sim-tests")]
 fn test_play_calpoker_on_chain_after_2_moves_p0() {
     let mut allocator = AllocEncoder::new();
     let moves = test_moves_1(&mut allocator);
@@ -130,7 +140,9 @@ fn test_play_calpoker_on_chain_after_2_moves_p0() {
     let test4 = run_calpoker_play_test(&mut allocator, &on_chain_moves_3).expect("should work");
     debug!("play_result {test4:?}");
 }
+
 #[test]
+#[cfg(feature = "sim-tests")]
 fn test_play_calpoker_on_chain_after_2_moves_p1() {
     let mut allocator = AllocEncoder::new();
     let moves = test_moves_1(&mut allocator);

src/tests/game.rs

@@ -1,3 +1,5 @@
+use clvmr::NodePtr;
+
 #[cfg(feature = "sim-tests")]
 use rand::prelude::*;
 
@@ -19,6 +21,38 @@ use crate::common::types::{Amount, CoinString, Error, IntoErr, Timeout};
 #[cfg(feature = "sim-tests")]
 use crate::simulator::Simulator;
 
+#[derive(Debug, Clone)]
+pub enum GameAction {
+    /// Do a timeout
+    #[allow(dead_code)]
+    Timeout(usize),
+    /// Move (player, clvm readable move, was received)
+    Move(usize, NodePtr, bool),
+    /// Fake move, just calls receive on the indicated side.
+    #[allow(dead_code)]
+    FakeMove(usize, NodePtr, Vec<u8>),
+    /// Go on chain
+    GoOnChain(usize),
+}
+
+impl GameAction {
+    pub fn lose(&self) -> GameAction {
+        if let GameAction::Move(p, m, _r) = self {
+            return GameAction::Move(*p, *m, false);
+        }
+
+        self.clone()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum GameActionResult {
+    #[allow(dead_code)]
+    MoveResult(NodePtr, Vec<u8>),
+    BrokenMove,
+    MoveToOnChain,
+}
+
 #[cfg(feature = "sim-tests")]
 pub fn new_channel_handler_game<R: Rng>(
     simulator: &Simulator,

src/tests/mod.rs

@@ -1,4 +1,3 @@
-#[cfg(feature = "sim-tests")]
 pub mod calpoker;
 pub mod channel_handler;
 pub mod chialisp;

src/tests/peer/outside.rs

@@ -28,7 +28,7 @@ use crate::common::standard_coin::standard_solution_partial;
 use crate::common::types::{CoinSpend, Program};
 
 use crate::tests::calpoker::{load_calpoker, test_moves_1};
-use crate::tests::simenv::GameAction;
+use crate::tests::game::GameAction;
 
 #[derive(Default)]
 struct Pipe {

src/tests/peer/outsim.rs

@@ -30,8 +30,8 @@ use crate::peer_container::{
 
 use crate::simulator::Simulator;
 use crate::tests::calpoker::test_moves_1;
+use crate::tests::game::GameAction;
 use crate::tests::peer::outside::{quiesce, run_move};
-use crate::tests::simenv::GameAction;
 
 // potato handler tests with simulator.
 #[derive(Default)]

src/tests/simenv.rs

@@ -23,41 +23,9 @@ use crate::common::types::{
     PrivateKey, Program, PuzzleHash, Sha256tree, Spend, Timeout,
 };
 use crate::simulator::Simulator;
-use crate::tests::game::new_channel_handler_game;
+use crate::tests::game::{new_channel_handler_game, GameAction, GameActionResult};
 use crate::tests::referee::{make_debug_game_handler, RefereeTest};
 
-#[derive(Debug, Clone)]
-pub enum GameAction {
-    /// Do a timeout
-    #[allow(dead_code)]
-    Timeout(usize),
-    /// Move (player, clvm readable move, was received)
-    Move(usize, NodePtr, bool),
-    /// Fake move, just calls receive on the indicated side.
-    #[allow(dead_code)]
-    FakeMove(usize, NodePtr, Vec<u8>),
-    /// Go on chain
-    GoOnChain(usize),
-}
-
-impl GameAction {
-    pub fn lose(&self) -> GameAction {
-        if let GameAction::Move(p, m, _r) = self {
-            return GameAction::Move(*p, *m, false);
-        }
-
-        self.clone()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum GameActionResult {
-    #[allow(dead_code)]
-    MoveResult(NodePtr, Vec<u8>),
-    BrokenMove,
-    MoveToOnChain,
-}
-
 #[derive(Debug, Clone)]
 pub enum OnChainState {
     OffChain(CoinString),