Parcourir la source

darkotc: Fix imports.

Luther Blissett il y a 3 ans
Parent
commit
8e52dac444
3 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 1 1
      bin/darkotc/src/cli_util.rs
  2. 2 2
      bin/darkotc/src/main.rs
  3. 2 2
      bin/darkotc/src/rpc.rs

+ 1 - 1
bin/darkotc/src/cli_util.rs

@@ -2,7 +2,7 @@ use std::process::exit;
 
 
 use halo2_proofs::pasta::group::ff::PrimeField;
 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)> {
 pub fn parse_value_pair(s: &str) -> Result<(u64, u64)> {
     let v: Vec<&str> = s.split(':').collect();
     let v: Vec<&str> = s.split(':').collect();

+ 2 - 2
bin/darkotc/src/main.rs

@@ -27,14 +27,14 @@ use darkfi::{
         BurnRevealedValues, MintRevealedValues, Proof,
         BurnRevealedValues, MintRevealedValues, Proof,
     },
     },
     rpc::client::RpcClient,
     rpc::client::RpcClient,
+    serial::{deserialize, serialize, Encodable, SerialDecodable, SerialEncodable},
     tx::{
     tx::{
         partial::{PartialTransaction, PartialTransactionInput},
         partial::{PartialTransaction, PartialTransactionInput},
         Transaction, TransactionInput, TransactionOutput,
         Transaction, TransactionInput, TransactionOutput,
     },
     },
     util::{
     util::{
         cli::{fg_green, fg_red, progress_bar},
         cli::{fg_green, fg_red, progress_bar},
-        encode_base10,
-        serial::{deserialize, serialize, Encodable, SerialDecodable, SerialEncodable},
+        parse::encode_base10,
     },
     },
     zk::circuit::{BurnContract, MintContract},
     zk::circuit::{BurnContract, MintContract},
     Result,
     Result,

+ 2 - 2
bin/darkotc/src/rpc.rs

@@ -5,12 +5,12 @@ use serde_json::json;
 use darkfi::{
 use darkfi::{
     crypto::{
     crypto::{
         address::Address,
         address::Address,
+        coin::OwnCoin,
         merkle_node::MerkleNode,
         merkle_node::MerkleNode,
         note::{EncryptedNote, Note},
         note::{EncryptedNote, Note},
-        OwnCoin,
     },
     },
     rpc::{client::RpcClient, jsonrpc::JsonRequest},
     rpc::{client::RpcClient, jsonrpc::JsonRequest},
-    util::serial::{deserialize, serialize},
+    serial::{deserialize, serialize},
     Result,
     Result,
 };
 };