Просмотр исходного кода

rename money/src/state.rs to model.rs

x 3 лет назад
Родитель
Сommit
0e8f891e7f

+ 1 - 1
src/contract/money/src/client.rs

@@ -45,7 +45,7 @@ use halo2_proofs::circuit::Value;
 use log::{debug, error, info};
 use rand::rngs::OsRng;
 
-use crate::state::{
+use crate::model::{
     ClearInput, Input, MoneyStakeParams, MoneyTransferParams, MoneyUnstakeParams, Output,
     StakedInput, StakedOutput,
 };

+ 2 - 4
src/contract/money/src/lib.rs

@@ -59,10 +59,10 @@ impl TryFrom<u8> for MoneyFunction {
 }
 
 /// Structures and object definitions
-pub mod state;
+pub mod model;
 
 #[cfg(not(feature = "no-entrypoint"))]
-use state::{
+use model::{
     MoneyStakeParams, MoneyStakeUpdate, MoneyTransferParams, MoneyTransferUpdate,
     MoneyUnstakeParams,
 };
@@ -426,8 +426,6 @@ fn process_instruction(cid: ContractId, ix: &[u8]) -> ContractResult {
                     return Err(ContractError::Custom(22))
                 }
 
-                msg!("XXXX: spend_hook = {:?}", input.spend_hook);
-
                 // Check the invoked contract if spend hook is set
                 if !bool::from(input.spend_hook.is_zero()) {
                     let next_call_idx = call_idx + 1;

+ 0 - 0
src/contract/money/src/state.rs → src/contract/money/src/model.rs


+ 1 - 1
src/contract/money/tests/drop_pay_swap.rs

@@ -40,7 +40,7 @@ use rand::rngs::OsRng;
 
 use darkfi_money_contract::{
     client::{build_half_swap_tx, build_transfer_tx, Coin, EncryptedNote, OwnCoin},
-    state::MoneyTransferParams,
+    model::MoneyTransferParams,
     MoneyFunction,
 };
 

+ 1 - 1
src/contract/money/tests/harness.rs

@@ -40,7 +40,7 @@ use log::{info, warn};
 use rand::rngs::OsRng;
 
 use darkfi_money_contract::{
-    client::build_transfer_tx, state::MoneyTransferParams, MoneyFunction,
+    client::build_transfer_tx, model::MoneyTransferParams, MoneyFunction,
     MONEY_CONTRACT_ZKAS_BURN_NS_V1, MONEY_CONTRACT_ZKAS_MINT_NS_V1,
 };