From 8e52dac4441c627b641180e790ebc94fb57d2f04 Mon Sep 17 00:00:00 2001 From: Luther Blissett Date: Sat, 24 Sep 2022 15:30:32 +0200 Subject: [PATCH] darkotc: Fix imports. --- bin/darkotc/src/cli_util.rs | 2 +- bin/darkotc/src/main.rs | 4 ++-- bin/darkotc/src/rpc.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/darkotc/src/cli_util.rs b/bin/darkotc/src/cli_util.rs index a98d89079..7cabdb2d6 100644 --- a/bin/darkotc/src/cli_util.rs +++ b/bin/darkotc/src/cli_util.rs @@ -2,7 +2,7 @@ use std::process::exit; use halo2_proofs::pasta::group::ff::PrimeField; -use darkfi::{crypto::types::DrkTokenId, util::decode_base10, Result}; +use darkfi::{crypto::types::DrkTokenId, util::parse::decode_base10, Result}; pub fn parse_value_pair(s: &str) -> Result<(u64, u64)> { let v: Vec<&str> = s.split(':').collect(); diff --git a/bin/darkotc/src/main.rs b/bin/darkotc/src/main.rs index 631580855..5cf44609c 100644 --- a/bin/darkotc/src/main.rs +++ b/bin/darkotc/src/main.rs @@ -27,14 +27,14 @@ use darkfi::{ BurnRevealedValues, MintRevealedValues, Proof, }, rpc::client::RpcClient, + serial::{deserialize, serialize, Encodable, SerialDecodable, SerialEncodable}, tx::{ partial::{PartialTransaction, PartialTransactionInput}, Transaction, TransactionInput, TransactionOutput, }, util::{ cli::{fg_green, fg_red, progress_bar}, - encode_base10, - serial::{deserialize, serialize, Encodable, SerialDecodable, SerialEncodable}, + parse::encode_base10, }, zk::circuit::{BurnContract, MintContract}, Result, diff --git a/bin/darkotc/src/rpc.rs b/bin/darkotc/src/rpc.rs index 935474fd0..90b5ffd66 100644 --- a/bin/darkotc/src/rpc.rs +++ b/bin/darkotc/src/rpc.rs @@ -5,12 +5,12 @@ use serde_json::json; use darkfi::{ crypto::{ address::Address, + coin::OwnCoin, merkle_node::MerkleNode, note::{EncryptedNote, Note}, - OwnCoin, }, rpc::{client::RpcClient, jsonrpc::JsonRequest}, - util::serial::{deserialize, serialize}, + serial::{deserialize, serialize}, Result, };