rename ZkContractTable to ZkBinaryTable

bin/daod/src/dao_contract/mint/builder.rs

@@ -12,8 +12,8 @@ use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
 use rand::rngs::OsRng;
 
 use crate::{
-    dao_contract::mint::validate::CallData, demo::FuncCall, CallDataBase, ZkBinaryTable,
-    ZkContractInfo,
+    dao_contract::mint::validate::CallData, demo::FuncCall, CallDataBase, ZkContractInfo,
+    ZkContractTable,
 };
 
 pub struct Builder {
@@ -45,7 +45,7 @@ impl Builder {
     }
 
     /// Consumes self, and produces the function call
-    pub fn build(self, zk_bins: &ZkBinaryTable) -> FuncCall {
+    pub fn build(self, zk_bins: &ZkContractTable) -> FuncCall {
         // Dao bulla
         let dao_proposer_limit = pallas::Base::from(self.dao_proposer_limit);
         let dao_quorum = pallas::Base::from(self.dao_quorum);

bin/daod/src/demo.rs

@@ -66,12 +66,12 @@ pub enum ZkContractInfo {
     Native(ZkNativeContractInfo),
 }
 
-pub struct ZkBinaryTable {
+pub struct ZkContractTable {
     // Key will be a hash of zk binary contract on chain
     table: HashMap<String, ZkContractInfo>,
 }
 
-impl ZkBinaryTable {
+impl ZkContractTable {
     fn new() -> Self {
         Self { table: HashMap::new() }
     }
@@ -118,7 +118,7 @@ impl Transaction {
     /// Verify ZK contracts for the entire tx
     /// In real code, we could parallelize this for loop
     /// TODO: fix use of unwrap with Result type stuff
-    fn zk_verify(&self, zk_bins: &ZkBinaryTable) {
+    fn zk_verify(&self, zk_bins: &ZkContractTable) {
         for func_call in &self.func_calls {
             let proofs_public_vals = &func_call.call_data.zk_public_values();
             let proofs_keys = &func_call.call_data.zk_proof_addrs();
@@ -209,7 +209,7 @@ pub async fn demo() -> Result<()> {
     let mut states = StateRegistry::new();
 
     // Initialize ZK binary table
-    let mut zk_bins = ZkBinaryTable::new();
+    let mut zk_bins = ZkContractTable::new();
     let zk_dao_mint_bincode = include_bytes!("../proof/dao-mint.zk.bin");
     let zk_dao_mint_bin = ZkBinary::decode(zk_dao_mint_bincode)?;
     zk_bins.add_contract("dao-mint".to_string(), zk_dao_mint_bin, 13);

bin/daod/src/main.rs

@@ -17,7 +17,7 @@ use darkfi::{
 mod dao_contract;
 mod demo;
 mod money_contract;
-pub use demo::{CallDataBase, StateRegistry, Transaction, ZkBinaryTable, ZkContractInfo};
+pub use demo::{CallDataBase, StateRegistry, Transaction, ZkContractInfo, ZkContractTable};
 
 use crate::demo::demo;
 

bin/daod/src/money_contract/transfer/builder.rs

@@ -20,7 +20,7 @@ use super::partial::{Partial, PartialClearInput, PartialInput};
 use crate::{
     demo::FuncCall,
     money_contract::transfer::validate::{CallData, ClearInput, Input, Output},
-    ZkBinaryTable, ZkContractInfo,
+    ZkContractInfo, ZkContractTable,
 };
 
 pub struct Builder {
@@ -71,7 +71,7 @@ impl Builder {
         total
     }
 
-    pub fn build(self, zk_bins: &ZkBinaryTable) -> Result<FuncCall> {
+    pub fn build(self, zk_bins: &ZkContractTable) -> Result<FuncCall> {
         assert!(self.clear_inputs.len() + self.inputs.len() > 0);
 
         let mut clear_inputs = vec![];