fmt

Author: prozacchiwawa

src/channel_handler/game_handler.rs

@@ -1,3 +1,3 @@
+pub mod game_handler;
 pub mod handler;
 pub mod types;
-pub mod game_handler;

src/channel_handler/handler.rs

@@ -1,12 +1,15 @@
-use rand::prelude::*;
-use rand::distributions::Standard;
-use clvmr::allocator::NodePtr;
-use clvm_traits::{ToClvm, ClvmEncoder, ToClvmError, clvm_curried_args};
+use clvm_traits::{clvm_curried_args, ClvmEncoder, ToClvm, ToClvmError};
 use clvm_utils::CurriedProgram;
+use clvmr::allocator::NodePtr;
+use rand::distributions::Standard;
+use rand::prelude::*;
 
-use crate::common::types::{Amount, CoinString, PrivateKey, PublicKey, Aggsig, GameID, Puzzle, PuzzleHash, Error, Timeout, Hash, CoinID, AllocEncoder, IntoErr, SpecificTransactionBundle, Sha256tree};
 use crate::channel_handler::game_handler::GameHandler;
 use crate::common::standard_coin::read_hex_puzzle;
+use crate::common::types::{
+    Aggsig, AllocEncoder, Amount, CoinID, CoinString, Error, GameID, Hash, IntoErr, PrivateKey,
+    PublicKey, Puzzle, PuzzleHash, Sha256tree, SpecificTransactionBundle, Timeout,
+};
 use crate::referee::RefereeMaker;
 
 #[derive(Default)]
@@ -38,7 +41,7 @@ pub struct ChannelHandlerInitiationData {
 
 pub struct ChannelHandlerInitiationResult {
     pub channel_puzzle_hash_up: PuzzleHash,
-    pub my_initial_channel_half_signature_peer: Aggsig
+    pub my_initial_channel_half_signature_peer: Aggsig,
 }
 
 pub struct PotatoSignatures {
@@ -59,18 +62,23 @@ pub struct GameStartInfo {
     pub initial_state: NodePtr,
     pub initial_move: Vec<u8>,
     pub initial_max_move_size: usize,
-    pub initial_mover_share: Amount
+    pub initial_mover_share: Amount,
 }
 
 #[derive(Clone)]
 pub struct ReadableMove(NodePtr);
 
 impl ReadableMove {
-    pub fn from_nodeptr(n: NodePtr) -> Self { ReadableMove(n) }
+    pub fn from_nodeptr(n: NodePtr) -> Self {
+        ReadableMove(n)
+    }
 }
 
 impl ToClvm<NodePtr> for ReadableMove {
-    fn to_clvm(&self, encoder: &mut impl ClvmEncoder<Node = NodePtr>) -> Result<NodePtr, ToClvmError> {
+    fn to_clvm(
+        &self,
+        encoder: &mut impl ClvmEncoder<Node = NodePtr>,
+    ) -> Result<NodePtr, ToClvmError> {
         Ok(self.0)
     }
 }
@@ -83,20 +91,20 @@ pub struct MoveResult {
     pub move_peer: Vec<u8>,
     pub validation_info_hash_peer: Hash,
     pub max_move_size_peer: usize,
-    pub mover_share_peer: Amount
+    pub mover_share_peer: Amount,
 }
 
 pub struct OnChainGameCoin<'a> {
     pub game_id_up: GameID,
     pub coin_string_up: Option<CoinString>,
-    pub referee_up: &'a RefereeMaker
+    pub referee_up: &'a RefereeMaker,
 }
 
 #[derive(Clone)]
 pub struct CoinSpentMoveUp {
     pub game_id: GameID,
     pub spend_before_game_coin: SpecificTransactionBundle,
-    pub after_update_game_coin: CoinString
+    pub after_update_game_coin: CoinString,
 }
 
 #[derive(Clone)]
@@ -130,15 +138,18 @@ pub struct CoinSpentResult<'a> {
 
 pub struct UnrollCoinSignatures {
     pub to_create_unroll_coin: Aggsig,
-    pub to_spend_unroll_coin: Aggsig
+    pub to_spend_unroll_coin: Aggsig,
 }
 
 pub fn read_unroll_metapuzzle(allocator: &mut AllocEncoder) -> Result<Puzzle, Error> {
     read_hex_puzzle(allocator, "resources/unroll_meta_puzzle.hex")
 }
 
 pub fn read_unroll_puzzle(allocator: &mut AllocEncoder) -> Result<Puzzle, Error> {
-    read_hex_puzzle(allocator, "resources/unroll_puzzle_state_channel_unrolling.hex")
+    read_hex_puzzle(
+        allocator,
+        "resources/unroll_puzzle_state_channel_unrolling.hex",
+    )
 }
 
 pub struct ChannelHandlerEnv<'a, R: Rng> {
@@ -160,7 +171,7 @@ impl<'a, R: Rng> ChannelHandlerEnv<'a, R> {
         unroll_metapuzzle: Puzzle,
         unroll_puzzle: Puzzle,
         referee_coin_puzzle: Puzzle,
-        agg_sig_me_additional_data: Hash
+        agg_sig_me_additional_data: Hash,
     ) -> ChannelHandlerEnv<'a, R> {
         let referee_coin_puzzle_hash = referee_coin_puzzle.sha256tree(allocator);
         ChannelHandlerEnv {
@@ -170,14 +181,22 @@ impl<'a, R: Rng> ChannelHandlerEnv<'a, R> {
             referee_coin_puzzle_hash,
             unroll_metapuzzle,
             unroll_puzzle,
-            agg_sig_me_additional_data
+            agg_sig_me_additional_data,
         }
     }
 
-    pub fn curried_unroll_puzzle(&mut self, old_seq_number: u64, default_conditions_hash: PuzzleHash) -> Result<Puzzle, Error> {
+    pub fn curried_unroll_puzzle(
+        &mut self,
+        old_seq_number: u64,
+        default_conditions_hash: PuzzleHash,
+    ) -> Result<Puzzle, Error> {
         let curried_program = CurriedProgram {
             program: self.unroll_puzzle.clone(),
-            args: clvm_curried_args!(self.unroll_metapuzzle.clone(), old_seq_number, default_conditions_hash)
+            args: clvm_curried_args!(
+                self.unroll_metapuzzle.clone(),
+                old_seq_number,
+                default_conditions_hash
+            ),
         };
         let nodeptr = curried_program.to_clvm(self.allocator).into_gen()?;
         Ok(Puzzle::from_nodeptr(nodeptr))
@@ -206,5 +225,5 @@ pub struct PotatoMoveCachedData {
 pub enum CachedPotatoRegenerateLastHop {
     PotatoCreatedGame(Vec<GameID>, Amount, Amount),
     PotatoAccept(PotatoAcceptCachedData),
-    PotatoMoveHappening(PotatoMoveCachedData)
+    PotatoMoveHappening(PotatoMoveCachedData),
 }

src/channel_handler/mod.rs

@@ -1,11 +1,9 @@
+use crate::common::types::{Hash, Sha256Input};
 use lazy_static::lazy_static;
-use crate::common::types::{Sha256Input, Hash};
 
 lazy_static! {
-    pub static ref Q_KW_TREEHASH: Hash = Sha256Input::Array(vec![
-        Sha256Input::Bytes(&[1]),
-        Sha256Input::Bytes(&[1]),
-    ]).hash();
+    pub static ref Q_KW_TREEHASH: Hash =
+        Sha256Input::Array(vec![Sha256Input::Bytes(&[1]), Sha256Input::Bytes(&[1]),]).hash();
 }
 
 pub const CREATE_COIN: u32 = 51;
@@ -17,143 +15,23 @@ pub const CREATE_COIN_ATOM: [u8; 1] = [51];
 pub const REM_ATOM: [u8; 1] = [1];
 
 pub const GROUP_ORDER: [u8; 32] = [
-    0x73,
-    0xED,
-    0xA7,
-    0x53,
-    0x29,
-    0x9D,
-    0x7D,
-    0x48,
-    0x33,
-    0x39,
-    0xD8,
-    0x08,
-    0x09,
-    0xA1,
-    0xD8,
-    0x05,
-    0x53,
-    0xBD,
-    0xA4,
-    0x02,
-    0xFF,
-    0xFE,
-    0x5B,
-    0xFE,
-    0xFF,
-    0xFF,
-    0xFF,
-    0xFF,
-    0x00,
-    0x00,
-    0x00,
-    0x01
+    0x73, 0xED, 0xA7, 0x53, 0x29, 0x9D, 0x7D, 0x48, 0x33, 0x39, 0xD8, 0x08, 0x09, 0xA1, 0xD8, 0x05,
+    0x53, 0xBD, 0xA4, 0x02, 0xFF, 0xFE, 0x5B, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01,
 ];
 
 pub const DEFAULT_HIDDEN_PUZZLE_HASH: [u8; 32] = [
-    0x71,
-    0x1d,
-    0x6c,
-    0x4e,
-    0x32,
-    0xc9,
-    0x2e,
-    0x53,
-    0x17,
-    0x9b,
-    0x19,
-    0x94,
-    0x84,
-    0xcf,
-    0x8c,
-    0x89,
-    0x75,
-    0x42,
-    0xbc,
-    0x57,
-    0xf2,
-    0xb2,
-    0x25,
-    0x82,
-    0x79,
-    0x9f,
-    0x9d,
-    0x65,
-    0x7e,
-    0xec,
-    0x46,
-    0x99,
+    0x71, 0x1d, 0x6c, 0x4e, 0x32, 0xc9, 0x2e, 0x53, 0x17, 0x9b, 0x19, 0x94, 0x84, 0xcf, 0x8c, 0x89,
+    0x75, 0x42, 0xbc, 0x57, 0xf2, 0xb2, 0x25, 0x82, 0x79, 0x9f, 0x9d, 0x65, 0x7e, 0xec, 0x46, 0x99,
 ];
 
 pub const DEFAULT_PUZZLE_HASH: [u8; 32] = [
-    0xe9,
-    0xaa,
-    0xa4,
-    0x9f,
-    0x45,
-    0xba,
-    0xd5,
-    0xc8,
-    0x89,
-    0xb8,
-    0x6e,
-    0xe3,
-    0x34,
-    0x15,
-    0x50,
-    0xc1,
-    0x55,
-    0xcf,
-    0xdd,
-    0x10,
-    0xc3,
-    0xa6,
-    0x75,
-    0x7d,
-    0xe6,
-    0x18,
-    0xd2,
-    0x06,
-    0x12,
-    0xff,
-    0xfd,
-    0x52,
+    0xe9, 0xaa, 0xa4, 0x9f, 0x45, 0xba, 0xd5, 0xc8, 0x89, 0xb8, 0x6e, 0xe3, 0x34, 0x15, 0x50, 0xc1,
+    0x55, 0xcf, 0xdd, 0x10, 0xc3, 0xa6, 0x75, 0x7d, 0xe6, 0x18, 0xd2, 0x06, 0x12, 0xff, 0xfd, 0x52,
 ];
 
 pub const AGG_SIG_ME_ADDITIONAL_DATA: [u8; 32] = [
-    0xcc,
-    0xd5,
-    0xbb,
-    0x71,
-    0x18,
-    0x35,
-    0x32,
-    0xbf,
-    0xf2,
-    0x20,
-    0xba,
-    0x46,
-    0xc2,
-    0x68,
-    0x99,
-    0x1a,
-    0x3f,
-    0xf0,
-    0x7e,
-    0xb3,
-    0x58,
-    0xe8,
-    0x25,
-    0x5a,
-    0x65,
-    0xc3,
-    0x0a,
-    0x2d,
-    0xce,
-    0x0e,
-    0x5f,
-    0xbb
+    0xcc, 0xd5, 0xbb, 0x71, 0x18, 0x35, 0x32, 0xbf, 0xf2, 0x20, 0xba, 0x46, 0xc2, 0x68, 0x99, 0x1a,
+    0x3f, 0xf0, 0x7e, 0xb3, 0x58, 0xe8, 0x25, 0x5a, 0x65, 0xc3, 0x0a, 0x2d, 0xce, 0x0e, 0x5f, 0xbb,
 ];
 
 pub const ONE: [u8; 1] = [1];
@@ -162,4 +40,3 @@ pub const TWO: [u8; 1] = [2];
 pub const Q_KW: [u8; 1] = [1];
 pub const A_KW: [u8; 1] = [2];
 pub const C_KW: [u8; 1] = [4];
-

src/channel_handler/types.rs

@@ -1,3 +1,3 @@
 pub mod constants;
-pub mod types;
 pub mod standard_coin;
+pub mod types;