remove dao- prefix from dao proof filenames

src/contract/dao/src/entrypoint/mod.rs

@@ -70,13 +70,13 @@ darkfi_sdk::define_contract!(
 fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
     // The zkas circuits can simply be embedded in the wasm and set up by
     // the initialization.
-    zkas_db_set(&include_bytes!("../../proof/dao-mint.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-propose-input.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-propose-main.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-vote-input.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-vote-main.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-exec.zk.bin")[..])?;
-    zkas_db_set(&include_bytes!("../../proof/dao-auth-money-transfer.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/mint.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/propose-input.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/propose-main.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/vote-input.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/vote-main.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/exec.zk.bin")[..])?;
+    zkas_db_set(&include_bytes!("../../proof/auth-money-transfer.zk.bin")[..])?;
 
     // Set up db for general info
     let dao_info_db = match db_lookup(cid, DAO_CONTRACT_DB_INFO_TREE) {

src/contract/test-harness/src/dao_propose.rs

@@ -23,7 +23,7 @@ use darkfi::{
     Result,
 };
 use darkfi_dao_contract::{
-    blockheight_to_day,
+    blockwindow,
     client::{DaoProposeCall, DaoProposeStakeInput},
     model::{Dao, DaoAuthCall, DaoBulla, DaoProposal, DaoProposeParams},
     DaoFunction, DAO_CONTRACT_ZKAS_DAO_PROPOSE_INPUT_NS, DAO_CONTRACT_ZKAS_DAO_PROPOSE_MAIN_NS,
@@ -99,7 +99,7 @@ impl TestHarness {
             },
         ];
 
-        let creation_day = blockheight_to_day(block_height);
+        let creation_day = blockwindow(block_height);
         let proposal = DaoProposal {
             auth_calls,
             creation_day,

src/contract/test-harness/src/dao_vote.rs

@@ -23,7 +23,7 @@ use darkfi::{
     Result,
 };
 use darkfi_dao_contract::{
-    blockheight_to_day,
+    blockwindow,
     client::{DaoVoteCall, DaoVoteInput},
     model::{Dao, DaoProposal, DaoProposalBulla, DaoVoteParams},
     DaoFunction, DAO_CONTRACT_ZKAS_DAO_VOTE_INPUT_NS, DAO_CONTRACT_ZKAS_DAO_VOTE_MAIN_NS,
@@ -80,7 +80,7 @@ impl TestHarness {
             signature_secret,
         };
 
-        let current_day = blockheight_to_day(block_height);
+        let current_day = blockwindow(block_height);
         let call = DaoVoteCall {
             inputs: vec![input],
             vote_option,

src/contract/test-harness/src/vks.rs

@@ -122,14 +122,14 @@ pub fn read_or_gen_vks_and_pks() -> Result<(Pks, Vks)> {
         &include_bytes!("../../money/proof/token_freeze_v1.zk.bin")[..],
         &include_bytes!("../../money/proof/auth_token_mint_v1.zk.bin")[..],
         // DAO
-        &include_bytes!("../../dao/proof/dao-mint.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-propose-input.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-propose-main.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-vote-input.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-vote-main.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-exec.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-auth-money-transfer.zk.bin")[..],
-        &include_bytes!("../../dao/proof/dao-auth-money-transfer-enc-coin.zk.bin")[..],
+        &include_bytes!("../../dao/proof/mint.zk.bin")[..],
+        &include_bytes!("../../dao/proof/propose-input.zk.bin")[..],
+        &include_bytes!("../../dao/proof/propose-main.zk.bin")[..],
+        &include_bytes!("../../dao/proof/vote-input.zk.bin")[..],
+        &include_bytes!("../../dao/proof/vote-main.zk.bin")[..],
+        &include_bytes!("../../dao/proof/exec.zk.bin")[..],
+        &include_bytes!("../../dao/proof/auth-money-transfer.zk.bin")[..],
+        &include_bytes!("../../dao/proof/auth-money-transfer-enc-coin.zk.bin")[..],
         // Deployooor
         &include_bytes!("../../deployooor/proof/derive_contract_id.zk.bin")[..],
     ];