Browse Source

Silence warnings during 'cargo build' and 'cargo test'. Running
`build.sh` still has warnings, but they aren't as distracting during
development.

Jens Finkhaeuser 6 years ago
parent
commit
4770deb281

+ 3 - 6
src/governance/council.rs

@@ -1,8 +1,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use srml_support::{StorageValue, StorageMap, dispatch::Result, decl_module, decl_event, decl_storage, ensure};
-use srml_support::traits::{Currency};
-use system::{self, ensure_signed};
+use srml_support::{StorageValue, decl_module, decl_event, decl_storage, ensure};
+use system::{self};
 use runtime_primitives::traits::{As, Zero};
 use rstd::prelude::*;
 
@@ -37,7 +36,7 @@ decl_storage! {
     }
 }
 
-/// Event for this module.
+// Event for this module.
 decl_event!(
     pub enum Event<T> where <T as system::Trait>::BlockNumber {
         CouncilTermEnded(BlockNumber),
@@ -123,9 +122,7 @@ decl_module! {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::governance::mock::*;
-    use parity_codec::Encode;
     use runtime_io::with_externalities;
     use srml_support::*;
 

+ 3 - 3
src/governance/election.rs

@@ -65,7 +65,7 @@ pub trait CouncilElected<Elected, Term> {
 }
 
 impl<Elected, Term> CouncilElected<Elected, Term> for () {
-    fn council_elected(_new_council: Elected, term: Term) {}
+    fn council_elected(_new_council: Elected, _term: Term) {}
 }
 
 impl<Elected, Term, X: CouncilElected<Elected, Term>> CouncilElected<Elected, Term> for (X,) {
@@ -116,7 +116,7 @@ decl_storage! {
     }
 }
 
-/// Event for this module.
+// Event for this module.
 decl_event!(
     pub enum Event<T> where
     <T as system::Trait>::BlockNumber,
@@ -1668,4 +1668,4 @@ mod tests {
             assert_ok!(Election::start_election(vec![]));
         });
     }
-}
+}

+ 2 - 3
src/governance/mock.rs

@@ -1,6 +1,5 @@
 #![cfg(test)]
 
-use rstd::prelude::*;
 pub use super::{election, council, proposals, GovernanceCurrency};
 pub use system;
 use crate::traits;
@@ -20,7 +19,7 @@ impl_outer_origin! {
 
 pub struct AnyAccountIsMember {}
 impl<T: system::Trait> traits::IsActiveMember<T> for AnyAccountIsMember {
-    fn is_active_member(who: &T::AccountId) -> bool {
+    fn is_active_member(_who: &T::AccountId) -> bool {
         true
     }
 }
@@ -96,7 +95,7 @@ impl GovernanceCurrency for Test {
 // This function basically just builds a genesis storage key/value store according to
 // our desired mockup.
 pub fn initial_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
-    let mut t = system::GenesisConfig::<Test>::default().build_storage().unwrap().0;
+    let t = system::GenesisConfig::<Test>::default().build_storage().unwrap().0;
 
     runtime_io::TestExternalities::new(t)
 }

+ 7 - 5
src/governance/proposals.rs

@@ -1,11 +1,14 @@
 use srml_support::{StorageValue, StorageMap, dispatch::Result, decl_module, decl_event, decl_storage, ensure};
 use srml_support::traits::{Currency};
-use primitives::{storage::well_known_keys};
 use runtime_primitives::traits::{As, Hash, Zero};
 use runtime_io::print;
-use {balances, system::{self, ensure_signed}};
+use system::{self, ensure_signed};
 use rstd::prelude::*;
 
+#[cfg(test)]
+use primitives::{storage::well_known_keys};
+
+
 use super::council;
 pub use super::{ GovernanceCurrency, BalanceOf };
 use crate::traits::{IsActiveMember};
@@ -382,7 +385,7 @@ impl<T: Trait> Module<T> {
         Ok(())
     }
 
-    fn end_block(now: T::BlockNumber) -> Result {
+    fn end_block(_now: T::BlockNumber) -> Result {
 
         // TODO refactor this method
 
@@ -558,7 +561,6 @@ mod tests {
         traits::{BlakeTwo256, OnFinalise, IdentityLookup},
         testing::{Digest, DigestItem, Header, UintAuthorityId}
     };
-    use system::{EventRecord, Phase};
     use srml_support::*;
 
     impl_outer_origin! {
@@ -620,7 +622,7 @@ mod tests {
 
     pub struct AnyAccountIsMember {}
     impl<T: system::Trait> IsActiveMember<T> for AnyAccountIsMember {
-        fn is_active_member(who: &T::AccountId) -> bool {
+        fn is_active_member(_who: &T::AccountId) -> bool {
             true
         }
     }

+ 3 - 3
src/membership/members.rs

@@ -5,7 +5,7 @@ use parity_codec::Codec;
 use parity_codec_derive::{Encode, Decode};
 use srml_support::{StorageMap, StorageValue, dispatch, decl_module, decl_storage, decl_event, ensure, Parameter};
 use srml_support::traits::{Currency};
-use runtime_primitives::traits::{Zero, SimpleArithmetic, As, Member, MaybeSerializeDebug};
+use runtime_primitives::traits::{SimpleArithmetic, As, Member, MaybeSerializeDebug};
 use system::{self, ensure_signed};
 use crate::governance::{GovernanceCurrency, BalanceOf };
 use {timestamp};
@@ -179,7 +179,7 @@ impl<T: Trait> traits::IsActiveMember<T> for Module<T> {
             .and_then(|member_id| Self::ensure_profile(member_id))
         {
             Ok(profile) => !profile.suspended,
-            Err(err) => false
+            Err(_err) => false
         }
     }
 }
@@ -408,4 +408,4 @@ impl<T: Trait> Module<T> {
         <MemberProfile<T>>::insert(id, profile);
         Ok(())
     }
-}
+}

+ 0 - 2
src/membership/mock.rs

@@ -1,6 +1,5 @@
 #![cfg(test)]
 
-use rstd::prelude::*;
 pub use crate::governance::{GovernanceCurrency};
 pub use super::{members};
 pub use system;
@@ -110,6 +109,5 @@ impl ExtBuilder {
     }
 }
 
-pub type System = system::Module<Test>;
 pub type Balances = balances::Module<Test>;
 pub type Members = members::Module<Test>;

+ 0 - 1
src/membership/tests.rs

@@ -3,7 +3,6 @@
 use super::*;
 use super::mock::*;
 
-use parity_codec::Encode;
 use runtime_io::with_externalities;
 use srml_support::*;
 

+ 1 - 1
src/memo.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use srml_support::{StorageMap, dispatch::Result, decl_module, decl_storage, decl_event, ensure};
+use srml_support::{StorageMap, decl_module, decl_storage, decl_event, ensure};
 use srml_support::traits::{Currency};
 use runtime_primitives::traits::{Zero};
 use system::{self, ensure_signed};

+ 1 - 1
src/migration.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use srml_support::{StorageValue, dispatch::Result, decl_module, decl_storage, decl_event, ensure};
+use srml_support::{StorageValue, decl_module, decl_storage, decl_event};
 use system;
 use rstd::prelude::*;
 use runtime_io::print;

+ 0 - 1
src/storage/mock.rs

@@ -1,6 +1,5 @@
 #![cfg(test)]
 
-use rstd::prelude::*;
 pub use super::{data_object_type_registry};
 pub use system;
 

+ 0 - 1
src/storage/tests.rs

@@ -4,7 +4,6 @@ use super::*;
 use super::mock::*;
 
 use runtime_io::with_externalities;
-use srml_support::*;
 use system::{self, Phase, EventRecord};
 
 #[test]

+ 1 - 1
src/traits.rs

@@ -34,7 +34,7 @@ pub trait ContentHasStorage<T: data_object_storage_registry::Trait> {
 // Membership
 
 pub trait IsActiveMember<T: system::Trait> {
-    fn is_active_member(account_id: &T::AccountId) -> bool {
+    fn is_active_member(_account_id: &T::AccountId) -> bool {
         false
     }
 }