Merge branch 'fraccaman+grarco/refactor-governance-storage-api' (#719)

* fraccaman+grarco/refactor-governance-storage-api: changelog: add #719 pos: use method governance: added method, fmt, clippy [ci] wasm checksums update governance: more refactor chore: rebuild wasm for test governance: more refactor governance: more refactor governance: more refactor governance: refactor with storage api
anoma · Nov 16, 2022 · 2e443a5 · 2e443a5
2 parents 8c1e5d1 + 4b95c01
commit 2e443a5
Show file tree

Hide file tree

Showing 26 changed files with 648 additions and 846 deletions.
diff --git a/.changelog/unreleased/improvements/719-refactor-governance-storage-api.md b/.changelog/unreleased/improvements/719-refactor-governance-storage-api.md
@@ -0,0 +1,2 @@
+- Refactored governance code to use storage_api.
+  ([#719](https://github.com/anoma/namada/pull/719))
diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs
@@ -776,6 +776,17 @@ pub async fn query_proposal(_ctx: Context, args: args::QueryProposal) {
                 println!("{:4}Status: pending", "");
             } else if start_epoch <= current_epoch && current_epoch <= end_epoch
             {
+                let votes = get_proposal_votes(client, start_epoch, id).await;
+                let partial_proposal_result =
+                    compute_tally(client, start_epoch, votes).await;
+                println!(
+                    "{:4}Yay votes: {}",
+                    "", partial_proposal_result.total_yay_power
+                );
+                println!(
+                    "{:4}Nay votes: {}",
+                    "", partial_proposal_result.total_nay_power
+                );
                 println!("{:4}Status: on-going", "");
             } else {
                 let votes = get_proposal_votes(client, start_epoch, id).await;

diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
@@ -2151,7 +2151,7 @@ async fn is_safe_voting_window(
 
     match proposal_end_epoch {
         Some(proposal_end_epoch) => {
-            !namada::ledger::governance::vp::is_valid_validator_voting_period(
+            !namada::ledger::governance::utils::is_valid_validator_voting_period(
                 current_epoch,
                 proposal_start_epoch,
                 proposal_end_epoch,

diff --git a/apps/src/lib/node/ledger/shell/governance.rs b/apps/src/lib/node/ledger/shell/governance.rs
@@ -1,10 +1,10 @@
 use namada::ledger::events::EventType;
-use namada::ledger::governance::storage as gov_storage;
 use namada::ledger::governance::utils::{
     compute_tally, get_proposal_votes, ProposalEvent,
 };
-use namada::ledger::governance::vp::ADDRESS as gov_address;
-use namada::ledger::protocol;
+use namada::ledger::governance::{
+    storage as gov_storage, ADDRESS as gov_address,
+};
 use namada::ledger::slash_fund::ADDRESS as slash_fund_address;
 use namada::ledger::storage::types::encode;
 use namada::ledger::storage::{DBIter, StorageHasher, DB};

diff --git a/apps/src/lib/wallet/defaults.rs b/apps/src/lib/wallet/defaults.rs
@@ -19,7 +19,7 @@ pub fn addresses_from_genesis(genesis: GenesisConfig) -> Vec<(Alias, Address)> {
     let mut addresses: Vec<(Alias, Address)> = vec![
         ("pos".into(), pos::ADDRESS),
         ("pos_slash_pool".into(), pos::SLASH_POOL_ADDRESS),
-        ("governance".into(), governance::vp::ADDRESS),
+        ("governance".into(), governance::ADDRESS),
         ("eth_bridge".into(), eth_bridge::vp::ADDRESS),
     ];
     // Genesis validators
@@ -113,7 +113,7 @@ mod dev {
         let mut addresses: Vec<(Alias, Address)> = vec![
             ("pos".into(), pos::ADDRESS),
             ("pos_slash_pool".into(), pos::SLASH_POOL_ADDRESS),
-            ("governance".into(), governance::vp::ADDRESS),
+            ("governance".into(), governance::ADDRESS),
             ("validator".into(), validator_address()),
             ("albert".into(), albert_address()),
             ("bertha".into(), bertha_address()),