From d001a140dc9ce4c26eaaa02f8e747da2b21c00c2 Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Sun, 9 Jan 2022 15:46:01 +0100 Subject: [PATCH] moved src/bin/ to /example and fixed errors --- Cargo.lock | 12 ++++++++++++ Cargo.toml | 33 ++++++++++++++++++++++++--------- example/net.rs | 2 +- {src/bin => example}/tree.rs | 0 {src/bin => example}/tui_ex.rs | 0 {src/bin => example}/tx.rs | 0 {src/bin => example}/vm.rs | 2 +- {src/bin => example}/vm_burn.rs | 2 +- script/run_burn_zk.sh | 2 +- script/run_mint_zk.sh | 2 +- src/lib.rs | 2 -- 11 files changed, 41 insertions(+), 16 deletions(-) rename {src/bin => example}/tree.rs (100%) rename {src/bin => example}/tui_ex.rs (100%) rename {src/bin => example}/tx.rs (100%) rename {src/bin => example}/vm.rs (98%) rename {src/bin => example}/vm_burn.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index a6e3ffc80..ba5742d62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,6 +941,7 @@ dependencies = [ "sha2", "signal-hook", "signal-hook-async-std", + "simplelog", "smol", "sqlx", "subtle", @@ -2707,6 +2708,17 @@ dependencies = [ "libc", ] +[[package]] +name = "simplelog" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecabc0118918611790b8615670ab79296272cbe09496b6884b02b1e929c20886" +dependencies = [ + "chrono", + "log", + "termcolor", +] + [[package]] name = "slab" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 880d371ef..de7bf9c5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ lazy_static = "1.4.0" log = "0.4.14" num_cpus = "1.13.0" signal-hook = "0.3.10" - +simplelog = "0.11.1" subtle = "2.4.1" thiserror = "1.0.30" @@ -93,14 +93,29 @@ chain = ["rocksdb"] node = ["sqlx", "libsqlite3-sys", "zeromq", "signal-hook-async-std"] tui = ["termion", "libc", "crossbeam-channel"] -[[bin]] -name = "tui_ex" -required-features = ["tui"] - -[[bin]] -name = "tx" -required-features = ["node"] - [[example]] name = "net" path = "example/net.rs" +required-features = ["node", "chain"] + +[[example]] +name = "tui" +path = "example/tui_ex.rs" +required-features = ["tui"] + +[[example]] +name = "vm" +path = "example/vm.rs" + +[[example]] +name = "vm_burn" +path = "example/vm_burn.rs" + +[[example]] +name = "tx" +path = "example/tx.rs" +required-features = ["node"] + +[[example]] +name = "tree" +path = "example/tree.rs" diff --git a/example/net.rs b/example/net.rs index 045948a18..0fdcf1cbc 100644 --- a/example/net.rs +++ b/example/net.rs @@ -3,7 +3,7 @@ use std::{net::SocketAddr, str::FromStr, sync::Arc}; use async_executor::Executor; use clap::Parser; -use drk::{net, Result}; +use darkfi::{net, Result}; async fn start(executor: Arc>, options: ProgramOptions) -> Result<()> { let p2p = net::P2p::new(options.network_settings); diff --git a/src/bin/tree.rs b/example/tree.rs similarity index 100% rename from src/bin/tree.rs rename to example/tree.rs diff --git a/src/bin/tui_ex.rs b/example/tui_ex.rs similarity index 100% rename from src/bin/tui_ex.rs rename to example/tui_ex.rs diff --git a/src/bin/tx.rs b/example/tx.rs similarity index 100% rename from src/bin/tx.rs rename to example/tx.rs diff --git a/src/bin/vm.rs b/example/vm.rs similarity index 98% rename from src/bin/vm.rs rename to example/vm.rs index c45032842..df76a1e89 100644 --- a/src/bin/vm.rs +++ b/example/vm.rs @@ -26,7 +26,7 @@ fn main() -> std::result::Result<(), failure::Error> { let k: u32 = 11; let start = Instant::now(); - let file = File::open("proof/mint.zk.bin")?; + let file = File::open("../proof/mint.zk.bin")?; let zkbin = vm::ZkBinary::decode(file)?; for contract_name in zkbin.contracts.keys() { println!("Loaded '{}' contract.", contract_name); diff --git a/src/bin/vm_burn.rs b/example/vm_burn.rs similarity index 99% rename from src/bin/vm_burn.rs rename to example/vm_burn.rs index f110c7ad6..f0e71b229 100644 --- a/src/bin/vm_burn.rs +++ b/example/vm_burn.rs @@ -57,7 +57,7 @@ fn main() -> std::result::Result<(), failure::Error> { let k: u32 = 11; let start = Instant::now(); - let file = File::open("proof/burn.zk.bin")?; + let file = File::open("../proof/burn.zk.bin")?; let zkbin = vm::ZkBinary::decode(file)?; for contract_name in zkbin.contracts.keys() { println!("Loaded '{}' contract.", contract_name); diff --git a/script/run_burn_zk.sh b/script/run_burn_zk.sh index fa0231203..1e2eedfd5 100755 --- a/script/run_burn_zk.sh +++ b/script/run_burn_zk.sh @@ -2,4 +2,4 @@ python zkas.py ../proof/burn.zk --bincode du -sh ../proof/burn.zk.bin python zkas.py ../proof/burn.zk -cargo run --all-features --release --bin vm_burn +cargo run --all-features --release --example vm_burn diff --git a/script/run_mint_zk.sh b/script/run_mint_zk.sh index f085231e3..6d9b03b7e 100755 --- a/script/run_mint_zk.sh +++ b/script/run_mint_zk.sh @@ -2,4 +2,4 @@ python zkas.py ../proof/mint.zk --bincode du -sh ../proof/mint.zk.bin python zkas.py ../proof/mint.zk -cargo run --all-features --release --bin vm +cargo run --all-features --release --example vm diff --git a/src/lib.rs b/src/lib.rs index b7e68349f..82c46da5a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,6 @@ -//pub mod circuit; pub mod cli; pub mod crypto; pub mod net; -//pub mod rpc; pub mod system; pub mod types; pub mod zk;