Преглед изворни кода

bin/dao: small fixes for mint::wallet's DaoParams{} and Builder{}

Dastan-glitch пре 3 година
родитељ
комит
52e2acc76c
2 измењених фајлова са 10 додато и 11 уклоњено
  1. 0 6
      bin/dao/daod/TODO
  2. 10 5
      bin/dao/daod/src/main.rs

+ 0 - 6
bin/dao/daod/TODO

@@ -1,10 +1,5 @@
 priority: immediate
 
-* split demo() into smaller functions that correspond with rpc requests
-        * see comments on main.rs
-        * these are super basic/ dumb right now, we will start small and gradually improve
-we are basically transforming demo.rs into a sequence of commands: create(), mint(), airdrop(), propose(), vote(), exec()
-
 * move schema.rs to darkfi/example
         * rename it to dao.rs
         * we want to be able to run it like how we run example/tx.rs
@@ -19,4 +14,3 @@ priority: low
 * rename [foo]_contract to just foo
         * contract/dao_contract/ is redundant
         * we can just have contract/dao
-

+ 10 - 5
bin/dao/daod/src/main.rs

@@ -87,7 +87,8 @@ impl DaoDemo {
         let dao_params = dao_contract::mint::wallet::DaoParams {
             proposer_limit: 0,
             quorum: 0,
-            approval_ratio: 0,
+            approval_ratio_quot: 0,
+            approval_ratio_base: 0,
             gov_token_id: gdrk_token_id,
             public_key: dao_keypair.public,
             bulla_blind: dao_bulla_blind,
@@ -228,7 +229,8 @@ impl DaoDemo {
         // DAO parameters
         let dao_proposer_limit = 110;
         let dao_quorum = 110;
-        let dao_approval_ratio = 2;
+        let dao_approval_ratio_quot = 1;
+        let dao_approval_ratio_base = 2;
 
         debug!(target: "demo", "Stage 1. Creating DAO bulla");
 
@@ -243,7 +245,8 @@ impl DaoDemo {
         let builder = dao_contract::mint::wallet::Builder {
             dao_proposer_limit,
             dao_quorum,
-            dao_approval_ratio,
+            dao_approval_ratio_quot,
+            dao_approval_ratio_base,
             gov_token_id: self.gdrk_token_id,
             dao_pubkey: dao_keypair.public,
             dao_bulla_blind,
@@ -657,7 +660,8 @@ impl DaoDemo {
         // DAO parameters
         let dao_proposer_limit = 110;
         let dao_quorum = 110;
-        let dao_approval_ratio = 2;
+        let dao_approval_ratio_quot = 1;
+        let dao_approval_ratio_base = 2;
 
         debug!(target: "demo", "Stage 4. Propose the vote");
 
@@ -702,7 +706,8 @@ impl DaoDemo {
             dao_contract::mint::wallet::DaoParams {
                 proposer_limit: dao_proposer_limit,
                 quorum: dao_quorum,
-                approval_ratio: dao_approval_ratio,
+                approval_ratio_base: dao_approval_ratio_base,
+                approval_ratio_quot: dao_approval_ratio_quot,
                 gov_token_id: self.gdrk_token_id,
                 public_key: self.dao_keypair.public,
                 bulla_blind: self.dao_bulla_blind,