More code running

Author: prozacchiwawa

resources/debug_game_handler.clsp

@@ -22,7 +22,13 @@
   )
 
 (defun get-move-share (new-move)
-  (substr new-move 1 (- (strlen new-move 1)))
+  (assign
+    len (strlen new-move)
+    (if (> len 1)
+      (substr new-move 1 (strlen new-move))
+      ()
+      )
+    )
   )
 
 (defun validation_program (validation-data)
@@ -51,22 +57,23 @@
     (c set_share set_cheated)
     100
     set_share
-    (curry MOD_HASH PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
+    (curry PUZZLE MOD_HASH PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
     ()
     )
    )
   )
 
 (defun do_their_turn (MOD_HASH PUZZLE AMOUNT MY_TURN SLASH_INFO amount last_state new_move new_validation_info_hash new_max_move_size new_mover_share)
   (assign
-   set_cheated (substr new_move 0 1)
+   set_cheated (+ (substr new_move 0 1))
 
    (if set_cheated
        (c 2 SLASH_INFO)
        (list
         0
         (c set_cheated (get-move-share new_move)) ;; readable move
-        (curry PUZZLE PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
+        (curry PUZZLE MOD_HASH PUZZLE AMOUNT (not MY_TURN) SLASH_INFO)
+        "message data"
         )
        )
    )

resources/debug_game_handler.hex

@@ -1 +1 @@
-ff02ffff01ff02ffff03ff2fffff01ff02ff10ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f80808080808080ffff01ff02ff14ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f8080808080808080ff0180ffff04ffff01ffffffff02ff18ffff04ff02ffff04ff03ffff04ff8200bfffff04ffff02ff2effff04ff02ffff04ff8202ffffff04ffff019174686973206973206e6f74207269676874ff8080808080ff808080808080ff04ffff0effff02ff2affff04ff02ffff04ff1bff80808080ff1380ffff04ffff04ffff0102ffff04ffff04ffff0101ff3e80ffff04ffff04ffff0104ffff04ffff04ffff0101ff0280ffff04ffff0101ff80808080ff80808080ffff04ff17ffff04ffff04ff13ff1b80ffff04ffff0164ffff04ff13ffff04ffff02ff16ffff04ff02ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff8080808080808080ffff04ff80ff808080808080808080ffff02ff2cffff04ff02ffff04ff03ffff04ffff0cff8202ffff80ffff010180ff8080808080ffff02ffff03ff0bffff01ff04ffff0102ff8200bd80ffff01ff04ff80ffff04ffff04ff0bffff02ff3cffff04ff02ffff04ff8205fdff8080808080ffff04ffff02ff16ffff04ff02ffff04ff15ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff8080808080808080ff8080808080ff0180ff0cff05ffff0101ffff11ffff0dff05ffff0101808080ffff82017fffff03ff05ff05ffff010080ff02ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffff02ff3affff04ff02ffff04ff0dff80808080ff80808080ffff01ff010180ff0180ffff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffff02ff3affff04ff02ffff04ff07ff80808080ff80808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff02ffff03ffff0cffff02ff12ffff04ff02ffff04ff05ff80808080ff80ffff010180ffff01ff08ffff019b76616c69646174696f6e2070726f6772616d206368656174696e67ff0580ffff01ff018080ff0180ff018080
+ff02ffff01ff02ffff03ff2fffff01ff02ff10ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f80808080808080ffff01ff02ff38ffff04ff02ffff04ff05ffff04ff0bffff04ff17ffff04ff2fffff04ff5fff7f8080808080808080ff0180ffff04ffff01ffffffff02ff28ffff04ff02ffff04ff03ffff04ff8200bfffff04ffff02ff2effff04ff02ffff04ff8202ffffff04ffff019174686973206973206e6f74207269676874ff8080808080ff808080808080ffff04ffff0effff02ff2affff04ff02ffff04ff1bff80808080ff1380ffff04ffff04ffff0102ffff04ffff04ffff0101ff3e80ffff04ffff04ffff0104ffff04ffff04ffff0101ff0280ffff04ffff0101ff80808080ff80808080ffff04ff17ffff04ffff04ff13ff1b80ffff04ffff0164ffff04ff13ffff04ffff02ff16ffff04ff02ffff04ff15ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080808080ffff04ff80ff808080808080808080ff02ff14ffff04ff02ffff04ff03ffff04ffff10ffff0cff8202ffff80ffff01018080ff8080808080ffff02ffff03ff0bffff01ff04ffff0102ff8200bd80ffff01ff04ff80ffff04ffff04ff0bffff02ff2cffff04ff02ffff04ff8205fdff8080808080ffff04ffff02ff16ffff04ff02ffff04ff15ffff04ff09ffff04ff15ffff04ff2dffff04ffff20ff5d80ffff04ff8200bdff808080808080808080ffff04ffff018c6d6573736167652064617461ff808080808080ff0180ffff02ff3cffff04ff02ffff04ff03ffff04ffff0dff0580ff8080808080ff02ffff03ffff15ff0bffff010180ffff01ff0cff09ffff0101ff0b80ffff01ff018080ff0180ffff82017fffff03ff05ff05ffff010080ff02ffff03ff05ffff01ff04ffff0104ffff04ffff04ffff0101ff0980ffff04ffff02ff3affff04ff02ffff04ff0dff80808080ff80808080ffff01ff010180ff0180ffff04ffff0102ffff04ffff04ffff0101ff0580ffff04ffff02ff3affff04ff02ffff04ff07ff80808080ff80808080ffff02ffff03ffff07ff0580ffff01ff0bffff0102ffff02ff2effff04ff02ffff04ff09ff80808080ffff02ff2effff04ff02ffff04ff0dff8080808080ffff01ff0bffff0101ff058080ff0180ff02ffff03ffff0cffff02ff12ffff04ff02ffff04ff05ff80808080ff80ffff010180ffff01ff08ffff019b76616c69646174696f6e2070726f6772616d206368656174696e67ff0580ffff01ff018080ff0180ff018080

src/channel_handler/game_handler.rs

@@ -16,7 +16,7 @@ use clvm_tools_rs::compiler::clvm::{convert_to_clvm_rs, convert_from_clvm_rs, ru
 use clvm_tools_rs::compiler::comptypes::CompilerOpts;
 #[cfg(test)]
 use clvm_tools_rs::compiler::srcloc::Srcloc;
-use clvm_traits::ToClvm;
+use clvm_traits::{ToClvm, ClvmEncoder};
 
 use crate::common::types::{AllocEncoder, Amount, Error, Hash, Aggsig, usize_from_atom, u64_from_atom, Node, IntoErr, atom_from_clvm};
 use crate::channel_handler::types::{ReadableMove, ReadableUX};
@@ -283,7 +283,7 @@ impl GameHandler {
         let driver_args =
             (inputs.amount.clone(),
              (Node(inputs.last_state.clone()),
-              (inputs.new_move.clone(),
+              (Node(allocator.encode_atom(inputs.new_move).into_gen()?),
                (inputs.new_validation_info_hash.clone(),
                 (inputs.new_max_move_size.clone(),
                  (inputs.new_mover_share.clone(), ())))))
@@ -317,12 +317,12 @@ impl GameHandler {
 
         if move_type == 0 {
             if pl.len() != 4 {
-                return Err(Error::StrErr("bad length".to_string()));
+                return Err(Error::StrErr(format!("bad length for move result {}", disassemble(allocator.allocator(), run_result, None))));
             }
             Ok(TheirTurnResult::MakeMove(GameHandler::my_driver_from_nodeptr(pl[2]), pl[1], allocator.allocator().atom(pl[3]).to_vec()))
         } else if move_type == 2 {
             if pl.len() != 3 {
-                return Err(Error::StrErr(format!("bad length {}", disassemble(allocator.allocator(), run_result, None))));
+                return Err(Error::StrErr(format!("bad length for slash {}", disassemble(allocator.allocator(), run_result, None))));
             }
             let sig_bytes = allocator.allocator().atom(pl[2]).to_vec();
             Ok(TheirTurnResult::Slash(pl[1], Aggsig::from_slice(&sig_bytes)?))

src/referee/mod.rs

@@ -126,6 +126,7 @@ struct RefereeMakerGameState {
 // Referee coin has two inner puzzles.
 // Throughout channel handler, the one that's ours is the standard format puzzle
 // to the pubkey of the referee private key (referred to in channel_handler).
+#[derive(Clone)]
 pub struct RefereeMaker {
     pub referee_coin_puzzle_hash: PuzzleHash,
     pub my_private_key: PrivateKey,

src/tests/referee.rs

@@ -4,9 +4,9 @@ use rand_chacha::ChaCha8Rng;
 use clvm_traits::{clvm_curried_args, ToClvm};
 use clvm_utils::CurriedProgram;
 
-use clvm_tools_rs::classic::clvm_tools::binutils::assemble;
+use clvm_tools_rs::classic::clvm_tools::binutils::{assemble, disassemble};
 
-use crate::common::types::{GameID, Timeout, Amount, PuzzleHash, PrivateKey, AllocEncoder, Sha256tree, Node};
+use crate::common::types::{GameID, Timeout, Amount, PuzzleHash, PrivateKey, AllocEncoder, Sha256tree, Node, Aggsig, Error};
 use crate::common::standard_coin::read_hex_puzzle;
 use crate::channel_handler::game_handler::GameHandler;
 use crate::channel_handler::types::{GameStartInfo, ReadableMove};
@@ -21,14 +21,15 @@ fn make_debug_game_handler(
         "resources/debug_game_handler.hex"
     ).expect("should be readable");
     let game_handler_mod_hash = debug_game_handler.sha256tree(allocator);
+    let aggsig = Aggsig::default();
     let curried_game_handler = CurriedProgram {
         program: debug_game_handler.clone(),
         args: clvm_curried_args!(
             game_handler_mod_hash,
             debug_game_handler,
             amount.clone(),
             true,
-            ((), ()) // slash info
+            ((), (aggsig, ())) // slash info
         )
     };
     GameHandler::my_driver_from_nodeptr(curried_game_handler.to_clvm(allocator).expect("should curry"))
@@ -84,4 +85,28 @@ fn test_referee_smoke() {
         &ReadableMove::from_nodeptr(readable_move)
     ).expect("should move");
     assert_eq!(my_move_result.move_made, &[0]);
+    let mut off_chain_slash_gives_error = referee.clone();
+    let their_move_result = off_chain_slash_gives_error.their_turn_move_off_chain(
+        &mut allocator,
+        &[1],
+        &my_move_result.validation_info_hash,
+        100,
+        &Amount::default()
+    );
+    if let Err(Error::StrErr(s)) = their_move_result {
+        assert!(s.contains("slash"));
+        assert!(s.contains("off chain"));
+    } else {
+        assert!(false);
+    }
+
+    let their_move_result = referee.their_turn_move_off_chain(
+        &mut allocator,
+        &[0],
+        &my_move_result.validation_info_hash,
+        100,
+        &Amount::default()
+    ).expect("should run");
+    assert_eq!(their_move_result.message, b"message data");
+    assert_eq!(disassemble(allocator.allocator(), their_move_result.readable_move, None), "(())");
 }