This commit is contained in:
thiolliere
2019-08-29 17:43:04 +02:00
committed by GitHub
parent 9900562389
commit 26202c66f7
14 changed files with 24 additions and 24 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ system = { package = "srml-system", path = "../system", default-features = false
[dev-dependencies]
primitives = { package = "substrate-primitives", path = "../../core/primitives" }
sr-std = { path = "../../core/sr-std" }
rstd = { package = "sr-std", path = "../../core/sr-std" }
runtime_io = { package = "sr-io", path = "../../core/sr-io" }
[features]
+2 -2
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-std = { path = "../../core/sr-std", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
sr-io = { path = "../../core/sr-io", default-features = false }
srml-support = { path = "../support", default-features = false }
system = { package = "srml-system", path = "../system", default-features = false }
@@ -22,7 +22,7 @@ std = [
"serde",
"codec/std",
"sr-primitives/std",
"sr-std/std",
"rstd/std",
"sr-io/std",
"srml-support/std",
"system/std",
+3 -3
View File
@@ -22,7 +22,7 @@
// Ensure we're `no_std` when compiling for Wasm.
#![cfg_attr(not(feature = "std"), no_std)]
use sr_std::prelude::*;
use rstd::prelude::*;
use srml_support::{
StorageValue, decl_module, decl_storage, decl_event, traits::{ChangeMembers, InitializeMembers},
};
@@ -61,7 +61,7 @@ decl_storage! {
}
add_extra_genesis {
config(members): Vec<T::AccountId>;
config(phantom): sr_std::marker::PhantomData<I>;
config(phantom): rstd::marker::PhantomData<I>;
build(|config: &Self| {
let mut members = config.members.clone();
members.sort();
@@ -85,7 +85,7 @@ decl_event!(
/// The membership was reset; see the transaction for who the new set is.
MembersReset,
/// Phantom member, never used.
Dummy(sr_std::marker::PhantomData<(AccountId, Event)>),
Dummy(rstd::marker::PhantomData<(AccountId, Event)>),
}
);
+2 -2
View File
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
serde = { version = "1.0", optional = true }
sr-io = { path = "../../core/sr-io", default-features = false }
sr-primitives = { path = "../../core/sr-primitives", default-features = false }
sr-std = { path = "../../core/sr-std", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
srml-support = { path = "../support", default-features = false }
system = { package = "srml-system", path = "../system", default-features = false }
@@ -24,7 +24,7 @@ std = [
"serde",
"sr-io/std",
"sr-primitives/std",
"sr-std/std",
"rstd/std",
"srml-support/std",
"system/std",
]
+3 -3
View File
@@ -89,7 +89,7 @@ mod mock;
mod tests;
use codec::{Encode, Decode};
use sr_std::prelude::*;
use rstd::prelude::*;
use srml_support::{
StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure,
traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
@@ -171,7 +171,7 @@ decl_storage! {
}
add_extra_genesis {
config(members): Vec<T::AccountId>;
config(phantom): sr_std::marker::PhantomData<I>;
config(phantom): rstd::marker::PhantomData<I>;
build(|config| {
let mut pool = config.pool.clone();
@@ -214,7 +214,7 @@ decl_event!(
/// See the transaction for who.
CandidateScored,
/// Phantom member, never used.
Dummy(sr_std::marker::PhantomData<(AccountId, I)>),
Dummy(rstd::marker::PhantomData<(AccountId, I)>),
}
);
+2 -2
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
sr-std = { path = "../../core/sr-std", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
sr-io = { path = "../../core/sr-io", default-features = false }
sr-primitives = { path = "../../core/sr-primitives", default-features = false }
srml-support = { path = "../support", default-features = false }
@@ -23,7 +23,7 @@ default = ["std"]
std = [
"serde",
"codec/std",
"sr-std/std",
"rstd/std",
"sr-io/std",
"sr-primitives/std",
"srml-support/std",
+1 -1
View File
@@ -86,7 +86,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use sr_std::prelude::*;
use rstd::prelude::*;
use sr_primitives::traits::StaticLookup;
use sr_primitives::weights::SimpleDispatchInfo;
use srml_support::{
+2 -2
View File
@@ -8,7 +8,7 @@ edition = "2018"
serde = { version = "1.0", optional = true, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = ["derive"] }
srml-metadata = { path = "../metadata", default-features = false }
sr-std = { path = "../../core/sr-std", default-features = false }
rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
sr-primitives = { path = "../../core/sr-primitives", default-features = false }
primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false }
@@ -30,7 +30,7 @@ std = [
"serde",
"runtime_io/std",
"codec/std",
"sr-std/std",
"rstd/std",
"sr-primitives/std",
"srml-metadata/std",
"inherents/std",
+1 -1
View File
@@ -19,7 +19,7 @@
use crate::rstd::prelude::*;
use crate::codec::{Codec, Encode};
use crate::storage::unhashed;
use sr_std::borrow::Borrow;
use rstd::borrow::Borrow;
/// An implementation of a map with a two keys.
///
+1 -1
View File
@@ -27,7 +27,7 @@ extern crate bitmask;
#[cfg(feature = "std")]
pub use serde;
#[doc(hidden)]
pub use sr_std as rstd;
pub use rstd;
#[doc(hidden)]
pub use codec;
#[cfg(feature = "std")]
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use sr_std::prelude::*;
use rstd::prelude::*;
use codec::{Codec, Encode, EncodeAppend};
use crate::{storage::{self, unhashed, hashed::StorageHasher}, rstd::borrow::Borrow};
@@ -16,7 +16,7 @@
use codec::{Codec, Encode, Decode};
use crate::{storage::{self, unhashed, hashed::StorageHasher}, traits::Len};
use sr_std::{
use rstd::{
borrow::Borrow,
marker::PhantomData,
};
@@ -15,8 +15,8 @@
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
#[cfg(not(feature = "std"))]
use sr_std::prelude::*;
use sr_std::borrow::Borrow;
use rstd::prelude::*;
use rstd::borrow::Borrow;
use codec::{Codec, Encode};
use crate::{storage::{self, unhashed, hashed::StorageHasher}, traits::Len};
@@ -15,8 +15,8 @@
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
#[cfg(not(feature = "std"))]
use sr_std::prelude::*;
use sr_std::{borrow::Borrow, iter::FromIterator};
use rstd::prelude::*;
use rstd::{borrow::Borrow, iter::FromIterator};
use codec::{Codec, Encode};
use crate::{storage::{self, unhashed, hashed::{Twox128, StorageHasher}}, traits::Len};