reorganize dao client functions into src/dao_client/foo.rs and rename state.rs to dao_model.rs

src/contract/dao/src/dao_exec_client.rs → src/contract/dao/src/dao_client/exec.rs

@@ -46,10 +46,8 @@ use darkfi::{
     Error, Result,
 };
 
-use crate::{
-    dao_propose_client::{DaoParams, Proposal},
-    state::DaoExecParams,
-};
+use super::propose::{DaoParams, Proposal};
+use crate::dao_model::DaoExecParams;
 
 pub struct Builder {
     pub proposal: Proposal,

src/contract/dao/src/dao_client.rs → src/contract/dao/src/dao_client/mint.rs

@@ -36,7 +36,7 @@ use rand::rngs::OsRng;
 
 use darkfi_money_contract::client::{EncryptedNote, Note};
 
-use crate::state::{DaoBulla, DaoMintParams};
+use crate::dao_model::{DaoBulla, DaoMintParams};
 
 pub type MerkleTree = BridgeTree<MerkleNode, { MERKLE_DEPTH }>;
 

src/contract/dao/src/dao_propose_client.rs → src/contract/dao/src/dao_client/propose.rs

@@ -46,8 +46,8 @@ use darkfi::{
 };
 
 use crate::{
+    dao_model::{DaoProposeParams, ProposeInput},
     note,
-    state::{DaoProposeParams, ProposeInput},
 };
 
 #[derive(Clone)]

src/contract/dao/src/dao_vote_client.rs → src/contract/dao/src/dao_client/vote.rs

@@ -47,10 +47,10 @@ use darkfi::{
     Error, Result,
 };
 
+use super::propose::{DaoParams, Proposal};
 use crate::{
-    dao_propose_client::{DaoParams, Proposal},
+    dao_model::{DaoVoteParams, VoteInput},
     note,
-    state::{DaoVoteParams, VoteInput},
 };
 
 #[derive(SerialEncodable, SerialDecodable)]

src/contract/dao/src/entrypoint.rs

@@ -43,7 +43,7 @@ use darkfi_money_contract::{
 };
 
 use crate::{
-    state::{
+    dao_model::{
         DaoExecParams, DaoExecUpdate, DaoMintParams, DaoMintUpdate, DaoProposeParams,
         DaoProposeUpdate, DaoVoteParams, DaoVoteUpdate, ProposalVotes,
     },

src/contract/dao/src/lib.rs

@@ -21,8 +21,6 @@ use darkfi_sdk::error::ContractError;
 #[cfg(not(feature = "no-entrypoint"))]
 pub mod entrypoint;
 
-pub mod state;
-
 #[cfg(feature = "client")]
 pub mod note;
 
@@ -30,17 +28,19 @@ pub mod note;
 /// Transaction building API for clients interacting with DAO contract
 pub mod dao_client;
 
-#[cfg(feature = "client")]
-/// Transaction building API for clients interacting with DAO contract
-pub mod dao_propose_client;
-
-#[cfg(feature = "client")]
-/// Transaction building API for clients interacting with DAO contract
-pub mod dao_vote_client;
+pub mod dao_model;
 
-#[cfg(feature = "client")]
-/// Transaction building API for clients interacting with DAO contract
-pub mod dao_exec_client;
+//#[cfg(feature = "client")]
+///// Transaction building API for clients interacting with DAO contract
+//pub mod dao_propose_client;
+//
+//#[cfg(feature = "client")]
+///// Transaction building API for clients interacting with DAO contract
+//pub mod dao_vote_client;
+//
+//#[cfg(feature = "client")]
+///// Transaction building API for clients interacting with DAO contract
+//pub mod dao_exec_client;
 
 #[cfg(feature = "client")]
 /// Transaction building API for clients interacting with money contract

src/contract/dao/tests/integration.rs

@@ -39,8 +39,12 @@ use log::{debug, info};
 use rand::rngs::OsRng;
 
 use darkfi_dao_contract::{
-    dao_client::{build_dao_mint_tx, MerkleTree, WalletCache},
-    dao_exec_client, dao_propose_client, dao_vote_client, money_client, note, DaoFunction,
+    dao_client::{
+        exec as dao_exec_client,
+        mint::{build_dao_mint_tx, MerkleTree, WalletCache},
+        propose as dao_propose_client, vote as dao_vote_client,
+    },
+    money_client, note, DaoFunction,
 };
 
 use darkfi_money_contract::{