Browse Source

Apply cargo fmt

Shamil Gadelshin 5 years ago
parent
commit
9593a3a901

+ 1 - 1
runtime-modules/common/src/lib.rs

@@ -1,4 +1,4 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod currency;
+pub mod currency;

+ 1 - 1
runtime-modules/content-working-group/src/mock.rs

@@ -15,8 +15,8 @@ pub use sr_primitives::{
 use srml_support::{impl_outer_event, impl_outer_origin, parameter_types};
 
 pub use common::currency::GovernanceCurrency;
-pub use membership::members;
 pub use hiring;
+pub use membership::members;
 pub use minting;
 pub use recurringrewards;
 pub use stake;

+ 26 - 24
runtime-modules/content-working-group/src/tests.rs

@@ -852,19 +852,20 @@ impl UpdateCuratorRoleAccountFixture {
             updated_curator
         );
 
-        let (event_curator_id, event_new_role_account) = if let mock::TestEvent::lib(ref x) =
-            System::events().last().unwrap().event
-        {
-            if let crate::RawEvent::CuratorRoleAccountUpdated(ref curator_id, ref new_role_account) =
-                x
-            {
-                (curator_id.clone(), new_role_account.clone())
+        let (event_curator_id, event_new_role_account) =
+            if let mock::TestEvent::lib(ref x) = System::events().last().unwrap().event {
+                if let crate::RawEvent::CuratorRoleAccountUpdated(
+                    ref curator_id,
+                    ref new_role_account,
+                ) = x
+                {
+                    (curator_id.clone(), new_role_account.clone())
+                } else {
+                    panic!("Event was not CuratorRoleAccountUpdated.")
+                }
             } else {
-                panic!("Event was not CuratorRoleAccountUpdated.")
-            }
-        } else {
-            panic!("No event deposited.")
-        };
+                panic!("No event deposited.")
+            };
 
         assert_eq!(self.curator_id, event_curator_id);
 
@@ -926,19 +927,20 @@ impl UpdateCuratorRewardAccountFixture {
             Actually checking new reward account requires checking call to token mint module, but we cannot do that properly yet.
         */
 
-        let (event_curator_id, event_reward_account) = if let mock::TestEvent::lib(ref x) =
-            System::events().last().unwrap().event
-        {
-            if let crate::RawEvent::CuratorRewardAccountUpdated(ref curator_id, ref reward_account) =
-                x
-            {
-                (curator_id.clone(), reward_account.clone())
+        let (event_curator_id, event_reward_account) =
+            if let mock::TestEvent::lib(ref x) = System::events().last().unwrap().event {
+                if let crate::RawEvent::CuratorRewardAccountUpdated(
+                    ref curator_id,
+                    ref reward_account,
+                ) = x
+                {
+                    (curator_id.clone(), reward_account.clone())
+                } else {
+                    panic!("Event was not CuratorRewardAccountUpdated.")
+                }
             } else {
-                panic!("Event was not CuratorRewardAccountUpdated.")
-            }
-        } else {
-            panic!("No event deposited.")
-        };
+                panic!("No event deposited.")
+            };
 
         assert_eq!(self.curator_id, event_curator_id);
 

+ 1 - 1
runtime-modules/membership/src/members.rs

@@ -1,5 +1,5 @@
-use common::currency::{BalanceOf, GovernanceCurrency};
 use codec::{Codec, Decode, Encode};
+use common::currency::{BalanceOf, GovernanceCurrency};
 
 use rstd::prelude::*;
 use sr_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic};

+ 1 - 1
runtime-modules/roles/src/actors.rs

@@ -1,5 +1,5 @@
-use common::currency::{BalanceOf, GovernanceCurrency};
 use codec::{Decode, Encode};
+use common::currency::{BalanceOf, GovernanceCurrency};
 use rstd::prelude::*;
 use sr_primitives::traits::{Bounded, Zero};
 use srml_support::traits::{

+ 1 - 1
runtime-modules/service-discovery/src/discovery.rs

@@ -1,5 +1,5 @@
-use roles::traits::Roles;
 use codec::{Decode, Encode};
+use roles::traits::Roles;
 use rstd::prelude::*;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};

+ 2 - 2
runtime-modules/storage/src/data_directory.rs

@@ -1,8 +1,8 @@
-use roles::actors;
 use crate::data_object_type_registry::Trait as DOTRTrait;
 use crate::traits::{ContentIdExists, IsActiveDataObjectType};
-use roles::traits::{Roles};
 use codec::{Codec, Decode, Encode};
+use roles::actors;
+use roles::traits::Roles;
 use rstd::prelude::*;
 use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter};

+ 2 - 2
runtime-modules/storage/src/data_object_storage_registry.rs

@@ -1,8 +1,8 @@
-use roles::actors;
 use crate::data_directory::Trait as DDTrait;
 use crate::traits::{ContentHasStorage, ContentIdExists};
-use roles::traits::{ Roles};
 use codec::{Codec, Decode, Encode};
+use roles::actors;
+use roles::traits::Roles;
 use rstd::prelude::*;
 use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter};

+ 1 - 1
runtime-modules/storage/src/mock.rs

@@ -1,10 +1,10 @@
 #![cfg(test)]
 
 pub use super::{data_directory, data_object_storage_registry, data_object_type_registry};
+use crate::traits;
 pub use common::currency::GovernanceCurrency;
 use membership::members;
 use roles::actors;
-use crate::traits;
 pub use system;
 
 pub use primitives::{Blake2Hasher, H256};