moved /circuit to /zk/circuit

bin/cashier/src/main.rs

@@ -12,7 +12,6 @@ use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode};
 
 use darkfi::{
     blockchain::{rocks::columns, Rocks, RocksColumn},
-    circuit::{MintContract, SpendContract},
     cli::{CashierdConfig, CliCashierd, Config},
     crypto::{
         keypair::{PublicKey, SecretKey},
@@ -36,6 +35,7 @@ use darkfi::{
         },
         Address, NetworkName,
     },
+    zk::circuit::{MintContract, SpendContract},
     Error, Result,
 };
 

bin/darkfid/src/main.rs

@@ -13,7 +13,6 @@ use url::Url;
 
 use darkfi::{
     blockchain::{rocks::columns, Rocks, RocksColumn},
-    circuit::{MintContract, SpendContract},
     cli::{CliDarkfid, Config, DarkfidConfig},
     crypto::{
         keypair::{Keypair, PublicKey, SecretKey},
@@ -36,6 +35,7 @@ use darkfi::{
         },
         Address, DrkTokenList, NetworkName, TokenList,
     },
+    zk::circuit::{MintContract, SpendContract},
     Error, Result,
 };
 

src/bin/tx.rs

@@ -2,7 +2,6 @@ use incrementalmerkletree::{bridgetree::BridgeTree, Frontier, Tree};
 use rand::rngs::OsRng;
 
 use darkfi::{
-    circuit::{mint_contract::MintContract, spend_contract::SpendContract},
     crypto::{
         coin::Coin,
         keypair::{Keypair, PublicKey, SecretKey},
@@ -14,6 +13,7 @@ use darkfi::{
     node::state::{state_transition, ProgramState, StateUpdate},
     tx,
     util::{generate_id2, NetworkName},
+    zk::circuit::{mint_contract::MintContract, spend_contract::SpendContract},
     Result,
 };
 

src/crypto/mint_proof.rs

@@ -12,7 +12,6 @@ use pasta_curves::{
 };
 
 use crate::{
-    circuit::mint_contract::MintContract,
     crypto::{
         coin::Coin,
         keypair::PublicKey,
@@ -21,6 +20,7 @@ use crate::{
     },
     serial::{Decodable, Encodable},
     types::{DrkCoinBlind, DrkSerial, DrkTokenId, DrkValue, DrkValueBlind, DrkValueCommit},
+    zk::circuit::mint_contract::MintContract,
     Result,
 };
 

src/crypto/spend_proof.rs

@@ -18,13 +18,13 @@ use super::{
     util::{mod_r_p, pedersen_commitment_scalar, pedersen_commitment_u64},
 };
 use crate::{
-    circuit::spend_contract::SpendContract,
     crypto::{
         keypair::{PublicKey, SecretKey},
         merkle_node::MerkleNode,
     },
     serial::{Decodable, Encodable},
     types::*,
+    zk::circuit::spend_contract::SpendContract,
     Result,
 };
 

src/lib.rs

@@ -1,4 +1,4 @@
-pub mod circuit;
+//pub mod circuit;
 pub mod cli;
 pub mod crypto;
 pub mod net;

src/node/client.rs

@@ -7,7 +7,6 @@ use url::Url;
 
 use crate::{
     blockchain::{rocks::columns, Rocks, RocksColumn, Slab},
-    circuit::{MintContract, SpendContract},
     crypto::{
         coin::Coin,
         keypair::{Keypair, PublicKey, SecretKey},
@@ -19,6 +18,7 @@ use crate::{
     tx,
     types::DrkTokenId,
     util::Address,
+    zk::circuit::{MintContract, SpendContract},
     Result,
 };
 

src/util/loader.rs

@@ -1,9 +1,8 @@
 use std::{fs::*, path::PathBuf, time::Instant};
 
 use crate::{
-    circuit::MintContract,
     crypto::proof::{ProvingKey, VerifyingKey},
-    zk::vm,
+    zk::{circuit::MintContract, vm},
 };
 
 use super::{serial::Decodable, Result};

src/util/mod.rs

@@ -7,9 +7,9 @@ pub mod loader;
 pub mod net_name;
 pub mod parse;
 pub mod path;
+pub mod rpc;
 pub mod serial;
 pub mod token_list;
-pub mod rpc;
 
 pub use async_util::sleep;
 pub use loader::ContractLoader;

src/zk/mod.rs

@@ -1,2 +1,3 @@
+pub mod circuit;
 pub mod vm;
 pub mod vm_serial;