소스 검색

moved src/bin/ to /example and fixed errors

lunar-mining 4 년 전
부모
커밋
d001a140dc
11개의 변경된 파일39개의 추가작업 그리고 14개의 파일을 삭제
  1. 12 0
      Cargo.lock
  2. 22 7
      Cargo.toml
  3. 1 1
      example/net.rs
  4. 0 0
      example/tree.rs
  5. 0 0
      example/tui_ex.rs
  6. 0 0
      example/tx.rs
  7. 1 1
      example/vm.rs
  8. 1 1
      example/vm_burn.rs
  9. 1 1
      script/run_burn_zk.sh
  10. 1 1
      script/run_mint_zk.sh
  11. 0 2
      src/lib.rs

+ 12 - 0
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"

+ 22 - 7
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"    
+[[example]]
+name = "net"
+path = "example/net.rs"
+required-features = ["node", "chain"]
+
+[[example]]
+name = "tui"
+path = "example/tui_ex.rs"
 required-features = ["tui"]
 
-[[bin]]         
-name = "tx"    
+[[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 = "net"
-path = "example/net.rs"
+name = "tree"
+path = "example/tree.rs"

+ 1 - 1
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<Executor<'_>>, options: ProgramOptions) -> Result<()> {
     let p2p = net::P2p::new(options.network_settings);

+ 0 - 0
src/bin/tree.rs → example/tree.rs


+ 0 - 0
src/bin/tui_ex.rs → example/tui_ex.rs


+ 0 - 0
src/bin/tx.rs → example/tx.rs


+ 1 - 1
src/bin/vm.rs → 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);

+ 1 - 1
src/bin/vm_burn.rs → 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);

+ 1 - 1
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

+ 1 - 1
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

+ 0 - 2
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;