Browse Source

substrate upgrade: fix warnings in test not handling return value

Mokhtar Naamani 6 years ago
parent
commit
66c78a46cb
5 changed files with 44 additions and 46 deletions
  1. 18 18
      src/governance/election.rs
  2. 22 22
      src/governance/proposals.rs
  3. 1 1
      src/membership/tests.rs
  4. 1 3
      src/roles/actors.rs
  5. 2 2
      src/roles/tests.rs

+ 18 - 18
src/governance/election.rs

@@ -1065,7 +1065,7 @@ mod tests {
             let applicant = 20 as u64;
 
             let starting_balance = 1000 as u32;
-            Balances::deposit_creating(&applicant, starting_balance);
+            let _ = Balances::deposit_creating(&applicant, starting_balance);
 
             let stake = 100 as u32;
 
@@ -1095,7 +1095,7 @@ mod tests {
             );
 
             let additional_stake = 100 as u32;
-            Balances::deposit_creating(&applicant, additional_stake);
+            let _ = Balances::deposit_creating(&applicant, additional_stake);
             assert!(Election::try_add_applicant(applicant, additional_stake).is_ok());
 
             assert_eq!(
@@ -1110,7 +1110,7 @@ mod tests {
     fn using_transferable_seat_stake_should_work() {
         with_externalities(&mut initial_test_ext(), || {
             let applicant = 20 as u64;
-            Balances::deposit_creating(&applicant, 5000);
+            let _ = Balances::deposit_creating(&applicant, 5000);
 
             <ExistingStakeHolders<Test>>::put(vec![applicant]);
             save_transferable_stake(
@@ -1232,10 +1232,10 @@ mod tests {
     #[test]
     fn refunding_applicant_stakes_should_work() {
         with_externalities(&mut initial_test_ext(), || {
-            Balances::deposit_creating(&1, 1000);
-            Balances::deposit_creating(&2, 7000);
+            let _ = Balances::deposit_creating(&1, 1000);
+            let _ = Balances::deposit_creating(&2, 7000);
             Balances::reserve(&2, 5000);
-            Balances::deposit_creating(&3, 8000);
+            let _ = Balances::deposit_creating(&3, 8000);
             Balances::reserve(&3, 5000);
 
             <Applicants<Test>>::put(vec![1, 2, 3]);
@@ -1310,7 +1310,7 @@ mod tests {
     #[test]
     fn voting_should_work() {
         with_externalities(&mut initial_test_ext(), || {
-            Balances::deposit_creating(&20, 1000);
+            let _ = Balances::deposit_creating(&20, 1000);
             let payload = vec![10u8];
             let commitment = <Test as system::Trait>::Hashing::hash(&payload[..]);
 
@@ -1337,7 +1337,7 @@ mod tests {
     #[test]
     fn votes_can_be_covered_by_transferable_stake() {
         with_externalities(&mut initial_test_ext(), || {
-            Balances::deposit_creating(&20, 1000);
+            let _ = Balances::deposit_creating(&20, 1000);
 
             save_transferable_stake(
                 20,
@@ -1369,7 +1369,7 @@ mod tests {
     #[test]
     fn voting_without_enough_balance_should_not_work() {
         with_externalities(&mut initial_test_ext(), || {
-            Balances::deposit_creating(&20, 100);
+            let _ = Balances::deposit_creating(&20, 100);
 
             save_transferable_stake(
                 20,
@@ -1392,7 +1392,7 @@ mod tests {
     #[test]
     fn voting_with_existing_commitment_should_not_work() {
         with_externalities(&mut initial_test_ext(), || {
-            Balances::deposit_creating(&20, 1000);
+            let _ = Balances::deposit_creating(&20, 1000);
 
             save_transferable_stake(
                 20,
@@ -1717,7 +1717,7 @@ mod tests {
         with_externalities(&mut initial_test_ext(), || {
             <Applicants<Test>>::put(vec![100, 200, 300]);
 
-            Balances::deposit_creating(&100, 2000);
+            let _ = Balances::deposit_creating(&100, 2000);
             Balances::reserve(&100, 1000);
 
             <ApplicantStakes<Test>>::insert(
@@ -1771,11 +1771,11 @@ mod tests {
     fn refunding_voting_stakes_should_work() {
         with_externalities(&mut initial_test_ext(), || {
             // voters' balances
-            Balances::deposit_creating(&10, 6000);
+            let _ = Balances::deposit_creating(&10, 6000);
             Balances::reserve(&10, 5000);
-            Balances::deposit_creating(&20, 7000);
+            let _ = Balances::deposit_creating(&20, 7000);
             Balances::reserve(&20, 5000);
-            Balances::deposit_creating(&30, 8000);
+            let _ = Balances::deposit_creating(&30, 8000);
             Balances::reserve(&30, 5000);
 
             save_transferable_stake(
@@ -1851,7 +1851,7 @@ mod tests {
         with_externalities(&mut initial_test_ext(), || {
             <ExistingStakeHolders<Test>>::put(vec![10, 20, 30]);
 
-            Balances::deposit_creating(&10, 6000);
+            let _ = Balances::deposit_creating(&10, 6000);
             Balances::reserve(&10, 5000);
             save_transferable_stake(
                 10,
@@ -1861,7 +1861,7 @@ mod tests {
                 },
             );
 
-            Balances::deposit_creating(&20, 7000);
+            let _ = Balances::deposit_creating(&20, 7000);
             Balances::reserve(&20, 5000);
             save_transferable_stake(
                 20,
@@ -1871,7 +1871,7 @@ mod tests {
                 },
             );
 
-            Balances::deposit_creating(&30, 8000);
+            let _ = Balances::deposit_creating(&30, 8000);
             Balances::reserve(&30, 5000);
             save_transferable_stake(
                 30,
@@ -1938,7 +1938,7 @@ mod tests {
             <MinVotingStake<Test>>::put(10);
 
             for i in 1..30 {
-                Balances::deposit_creating(&(i as u64), 50000);
+                let _ = Balances::deposit_creating(&(i as u64), 50000);
             }
 
             System::set_block_number(1);

+ 22 - 22
src/governance/proposals.rs

@@ -796,7 +796,7 @@ mod tests {
     #[test]
     fn member_create_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
             assert_eq!(Proposals::active_proposal_ids().len(), 1);
@@ -841,7 +841,7 @@ mod tests {
     #[test]
     fn cannot_create_proposal_with_small_stake() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_eq!(
                 _create_proposal(None, Some(min_stake() - 1), None, None, None),
@@ -857,7 +857,7 @@ mod tests {
     #[test]
     fn cannot_create_proposal_when_stake_is_greater_than_balance() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_eq!(
                 _create_proposal(None, Some(initial_balance() + 1), None, None, None),
@@ -873,7 +873,7 @@ mod tests {
     #[test]
     fn cannot_create_proposal_with_empty_values() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             // Empty name:
             assert_eq!(
@@ -898,7 +898,7 @@ mod tests {
     #[test]
     fn cannot_create_proposal_with_too_long_values() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             // Too long name:
             assert_eq!(
@@ -938,7 +938,7 @@ mod tests {
     #[test]
     fn owner_cancel_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
             assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1));
@@ -959,7 +959,7 @@ mod tests {
     #[test]
     fn owner_cannot_cancel_proposal_if_its_finalized() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
             assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1));
@@ -986,8 +986,8 @@ mod tests {
     #[test]
     fn not_owner_cannot_cancel_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
-            Balances::deposit_creating(&PROPOSER2, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER2, initial_balance());
             assert_ok!(_create_default_proposal());
             assert_eq!(
                 Proposals::cancel_proposal(Origin::signed(PROPOSER2), 1),
@@ -1002,7 +1002,7 @@ mod tests {
     #[test]
     fn councilor_vote_on_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1026,7 +1026,7 @@ mod tests {
     #[test]
     fn councilor_cannot_vote_on_proposal_twice() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1045,7 +1045,7 @@ mod tests {
     #[test]
     fn autovote_with_approve_when_councilor_creates_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&COUNCILOR1, initial_balance());
+            let _ = Balances::deposit_creating(&COUNCILOR1, initial_balance());
 
             assert_ok!(_create_proposal(Some(COUNCILOR1), None, None, None, None));
 
@@ -1062,7 +1062,7 @@ mod tests {
     #[test]
     fn not_councilor_cannot_vote_on_proposal() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
             assert_eq!(
@@ -1075,7 +1075,7 @@ mod tests {
     #[test]
     fn councilor_cannot_vote_on_proposal_if_it_has_been_cancelled() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
             assert_ok!(Proposals::cancel_proposal(Origin::signed(PROPOSER1), 1));
@@ -1089,7 +1089,7 @@ mod tests {
     #[test]
     fn councilor_cannot_vote_on_proposal_if_tally_has_been_finalized() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1129,7 +1129,7 @@ mod tests {
     #[test]
     fn approve_proposal_when_all_councilors_approved_it() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1183,7 +1183,7 @@ mod tests {
     #[test]
     fn approve_proposal_when_all_councilors_voted_and_only_quorum_approved() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1239,7 +1239,7 @@ mod tests {
     #[test]
     fn approve_proposal_when_voting_period_expired_if_only_quorum_voted() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1301,7 +1301,7 @@ mod tests {
     #[test]
     fn reject_proposal_when_all_councilors_voted_and_quorum_not_reached() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1360,7 +1360,7 @@ mod tests {
     #[test]
     fn reject_proposal_when_all_councilors_rejected_it() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1417,7 +1417,7 @@ mod tests {
     #[test]
     fn slash_proposal_when_all_councilors_slashed_it() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 
@@ -1483,7 +1483,7 @@ mod tests {
     #[test]
     fn expire_proposal_when_not_all_councilors_voted_and_quorum_not_reached() {
         with_externalities(&mut new_test_ext(), || {
-            Balances::deposit_creating(&PROPOSER1, initial_balance());
+            let _ = Balances::deposit_creating(&PROPOSER1, initial_balance());
 
             assert_ok!(_create_default_proposal());
 

+ 1 - 1
src/membership/tests.rs

@@ -51,7 +51,7 @@ fn buy_default_membership_as_alice() -> dispatch::Result {
 }
 
 fn set_alice_free_balance(balance: u32) {
-    Balances::deposit_creating(&ALICE_ACCOUNT_ID, balance);
+    let _ = Balances::deposit_creating(&ALICE_ACCOUNT_ID, balance);
 }
 
 #[test]

+ 1 - 3
src/roles/actors.rs

@@ -3,9 +3,7 @@ use parity_codec_derive::{Decode, Encode};
 use rstd::prelude::*;
 use runtime_primitives::traits::{As, Bounded, MaybeDebug, Zero};
 use srml_support::traits::Currency;
-use srml_support::{
-    decl_event, decl_module, decl_storage, ensure, StorageMap, StorageValue,
-};
+use srml_support::{decl_event, decl_module, decl_storage, ensure, StorageMap, StorageValue};
 use system::{self, ensure_signed};
 
 use crate::traits::{Members, Roles};

+ 2 - 2
src/roles/tests.rs

@@ -74,7 +74,7 @@ fn make_entry_request() {
         );
 
         let surplus_balance = 100;
-        Balances::deposit_creating(
+        let _ = Balances::deposit_creating(
             &actor_account,
             storage_params.entry_request_fee + surplus_balance,
         );
@@ -117,7 +117,7 @@ fn staking() {
 
         <actors::RoleEntryRequests<Test>>::put(vec![request]);
 
-        Balances::deposit_creating(&actor_account, storage_params.min_stake);
+        let _ = Balances::deposit_creating(&actor_account, storage_params.min_stake);
 
         assert!(Actors::stake(
             Origin::signed(MockMembers::alice_account()),