Fmt

anoma · Feb 8, 2023 · be60cac · be60cac
1 parent b0d1eb3
commit be60cac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs
@@ -2261,8 +2261,8 @@ pub mod args {
                         .about(
                             "The list of proposed councils and spending \
                              caps:\n$council1 $cap1 $council2 $cap2 ... \
-                             (council is bech32m encoded address, cap is expressed in \
-                             microNAM",
+                             (council is bech32m encoded address, cap is \
+                             expressed in microNAM",
                         )
                         .requires(PROPOSAL_ID.name)
                         .conflicts_with(PROPOSAL_VOTE_ETH_OPT.name),

diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs
@@ -1809,9 +1809,9 @@ pub async fn query_bonded_stake(ctx: Context, args: args::QueryBondedStake) {
                     };
                     let is_active = validator_set.active.contains(&weighted);
                     if !is_active {
-                        debug_assert!(validator_set
-                            .inactive
-                            .contains(&weighted));
+                        debug_assert!(
+                            validator_set.inactive.contains(&weighted)
+                        );
                     }
                     println!(
                         "Validator {} is {}, bonded stake: {}",

diff --git a/shared/src/ledger/native_vp/governance/utils.rs b/shared/src/ledger/native_vp/governance/utils.rs
@@ -167,7 +167,7 @@ pub fn compute_tally(
                         return Err(Error::Tally(format!(
                             "Unexpected proposal type: {}",
                             proposal_type
-                        )))
+                        )));
                     }
                 };
 
@@ -237,7 +237,14 @@ pub fn compute_tally(
                                                 {
                                                     *power -= vote_power;
                                                 } else {
-                                                    return Err(Error::Tally(format!("Expected PGF vote {:?} was not in tally", vote)));
+                                                    return Err(Error::Tally(
+                                                        format!(
+                                                            "Expected PGF \
+                                                             vote {:?} was \
+                                                             not in tally",
+                                                            vote
+                                                        ),
+                                                    ));
                                                 }
                                             } else {
                                                 // Validator didn't vote for
@@ -250,9 +257,10 @@ pub fn compute_tally(
                                     } else {
                                         // Log the error and continue
                                         tracing::error!(
-                        "Unexpected vote type. Expected: PGFCouncil, Found: {}",
-                        validator_vote
-                    );
+                                            "Unexpected vote type. Expected: \
+                                             PGFCouncil, Found: {}",
+                                            validator_vote
+                                        );
                                         continue;
                                     }
                                 }
@@ -290,9 +298,8 @@ pub fn compute_tally(
                                             } else {
                                                 return Err(Error::Tally(
                                                     format!(
-                                                        "Expected PGF \
-                                                             vote {:?} was \
-                                                             not in tally",
+                                                        "Expected PGF vote \
+                                                         {:?} was not in tally",
                                                         vote
                                                     ),
                                                 ));
@@ -301,9 +308,10 @@ pub fn compute_tally(
                                     } else {
                                         // Log the error and continue
                                         tracing::error!(
-                        "Unexpected vote type. Expected: PGFCouncil, Found: {}",
-                        validator_vote
-                    );
+                                            "Unexpected vote type. Expected: \
+                                             PGFCouncil, Found: {}",
+                                            validator_vote
+                                        );
                                         continue;
                                     }
                                 }
@@ -312,9 +320,10 @@ pub fn compute_tally(
                         _ => {
                             // Log the error and continue
                             tracing::error!(
-                        "Unexpected vote type. Expected: PGFCouncil, Found: {}",
-                        delegator_vote
-                    );
+                                "Unexpected vote type. Expected: PGFCouncil, \
+                                 Found: {}",
+                                delegator_vote
+                            );
                             continue;
                         }
                     }