From 971ea62ab85fd5b5f32fdaf397a9f493fe7a6a37 Mon Sep 17 00:00:00 2001 From: aggstam Date: Mon, 9 Jan 2023 18:26:50 +0200 Subject: [PATCH] fix broken imports --- bin/drk/src/rpc_blockchain.rs | 2 +- bin/drk/src/rpc_swap.rs | 2 +- src/contract/dao/src/entrypoint.rs | 2 +- src/contract/dao/src/money_client.rs | 2 +- src/contract/dao/tests/integration.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/drk/src/rpc_blockchain.rs b/bin/drk/src/rpc_blockchain.rs index 9516d2c10..484283a0d 100644 --- a/bin/drk/src/rpc_blockchain.rs +++ b/bin/drk/src/rpc_blockchain.rs @@ -37,7 +37,7 @@ use darkfi_money_contract::{ MONEY_COINS_COL_VALUE_BLIND, MONEY_COINS_TABLE, MONEY_INFO_COL_LAST_SCANNED_SLOT, MONEY_INFO_TABLE, }, - state::{MoneyTransferParams, Output}, + model::{MoneyTransferParams, Output}, MoneyFunction, }; use darkfi_sdk::{ diff --git a/bin/drk/src/rpc_swap.rs b/bin/drk/src/rpc_swap.rs index 749da7f34..3204d4267 100644 --- a/bin/drk/src/rpc_swap.rs +++ b/bin/drk/src/rpc_swap.rs @@ -25,7 +25,7 @@ use darkfi::{ }; use darkfi_money_contract::{ client::{build_half_swap_tx, EncryptedNote, Note}, - state::MoneyTransferParams, + model::MoneyTransferParams, MoneyFunction, MONEY_CONTRACT_ZKAS_BURN_NS_V1, MONEY_CONTRACT_ZKAS_MINT_NS_V1, }; use darkfi_sdk::{ diff --git a/src/contract/dao/src/entrypoint.rs b/src/contract/dao/src/entrypoint.rs index 21caebc44..ad8a2f84c 100644 --- a/src/contract/dao/src/entrypoint.rs +++ b/src/contract/dao/src/entrypoint.rs @@ -32,7 +32,7 @@ use darkfi_sdk::{ use darkfi_serial::{deserialize, serialize, Decodable, Encodable, WriteExt}; use darkfi_money_contract::{ - state::MoneyTransferParams, MoneyFunction, MONEY_CONTRACT_COIN_ROOTS_TREE, + model::MoneyTransferParams, MoneyFunction, MONEY_CONTRACT_COIN_ROOTS_TREE, MONEY_CONTRACT_NULLIFIERS_TREE, }; diff --git a/src/contract/dao/src/money_client.rs b/src/contract/dao/src/money_client.rs index c12bd3e6b..a48dddb64 100644 --- a/src/contract/dao/src/money_client.rs +++ b/src/contract/dao/src/money_client.rs @@ -29,7 +29,7 @@ use rand::rngs::OsRng; use darkfi_money_contract::{ client::{create_transfer_burn_proof, create_transfer_mint_proof, Note}, - state::{ClearInput, Input, MoneyTransferParams, Output}, + model::{ClearInput, Input, MoneyTransferParams, Output}, }; pub struct TransferCall { diff --git a/src/contract/dao/tests/integration.rs b/src/contract/dao/tests/integration.rs index 6402b555a..8ab503e74 100644 --- a/src/contract/dao/tests/integration.rs +++ b/src/contract/dao/tests/integration.rs @@ -32,7 +32,7 @@ use darkfi_dao_contract::{ dao_client, dao_model, money_client, note, wallet_cache::WalletCache, DaoFunction, }; -use darkfi_money_contract::{client::EncryptedNote, state::MoneyTransferParams, MoneyFunction}; +use darkfi_money_contract::{client::EncryptedNote, model::MoneyTransferParams, MoneyFunction}; mod harness; use harness::{init_logger, DaoTestHarness};