create zk module

src/bin/vm.rs

@@ -18,7 +18,7 @@ use darkfi::{
         util::pedersen_commitment_u64,
     },
     serial::Decodable,
-    vm,
+    zk::vm,
 };
 
 fn main() -> std::result::Result<(), failure::Error> {

src/bin/vm_burn.rs

@@ -27,7 +27,7 @@ use darkfi::{
         util::pedersen_commitment_u64,
     },
     serial::Decodable,
-    vm,
+    zk::vm,
 };
 
 fn root(path: [pallas::Base; 32], leaf_pos: u32, leaf: pallas::Base) -> pallas::Base {

src/lib.rs

@@ -2,14 +2,12 @@ pub mod blockchain;
 pub mod circuit;
 pub mod cli;
 pub mod crypto;
-pub mod endian;
 pub mod net;
 pub mod rpc;
 pub mod system;
 pub mod tx;
 pub mod types;
-pub mod vm;
-pub mod vm_serial;
+pub mod zk;
 
 pub mod node;
 

src/util/async_serial.rs

@@ -1,6 +1,6 @@
 use futures::prelude::*;
 
-use crate::{endian, serial::VarInt, Error, Result};
+use super::{endian, serial::VarInt, Error, Result};
 
 impl VarInt {
     pub async fn encode_async<W: AsyncWrite + Unpin>(&self, stream: &mut W) -> Result<usize> {

src/util/loader.rs

@@ -3,10 +3,11 @@ use std::{fs::*, path::PathBuf, time::Instant};
 use crate::{
     circuit::MintContract,
     crypto::proof::{ProvingKey, VerifyingKey},
-    serial::Decodable,
-    vm, Result,
+    zk::vm,
 };
 
+use super::{serial::Decodable, Result};
+
 pub struct ContractLoader {}
 
 impl ContractLoader {

src/util/mod.rs

@@ -1,6 +1,7 @@
 pub mod address;
 pub mod async_serial;
 pub mod async_util;
+pub mod endian;
 pub mod error;
 pub mod loader;
 pub mod net_name;

src/util/serial.rs

@@ -8,7 +8,7 @@ use std::{
 
 use num_bigint::BigUint;
 
-use crate::{
+use super::{
     endian,
     error::{Error, Result},
 };

src/zk/mod.rs

@@ -0,0 +1,2 @@
+pub mod vm;
+pub mod vm_serial;

src/zk/vm_serial.rs

@@ -1,10 +1,10 @@
 use std::io;
 
+use super::vm::{ZkBinary, ZkContract, ZkFunctionCall, ZkType};
 use crate::{
     error::{Error, Result},
     impl_vec,
     serial::{Decodable, Encodable, ReadExt, VarInt},
-    vm::{ZkBinary, ZkContract, ZkFunctionCall, ZkType},
 };
 
 impl_vec!((String, ZkType));