Browse Source

Fix content directory Cargo.toml

iorveth 4 years ago
parent
commit
0e4cfb15c7

+ 15 - 15
Cargo.lock

@@ -2882,6 +2882,21 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "pallet-content-directory"
+version = "3.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "parity-bytes"
 version = "0.1.0"
@@ -5243,21 +5258,6 @@ dependencies = [
  "substrate-primitives",
 ]
 
-[[package]]
-name = "substrate-content-directory-module"
-version = "3.0.0"
-dependencies = [
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "serde",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "substrate-content-working-group-module"
 version = "1.0.0"

+ 8 - 12
runtime-modules/content-directory/Cargo.toml

@@ -1,21 +1,17 @@
 [package]
-name = 'substrate-content-directory-module'
+name = 'pallet-content-directory'
 version = '3.0.0'
 authors = ['Joystream contributors']
 edition = '2018'
 
 [dependencies]
-codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
-
-[dependencies.serde]
-features = ['derive']
-optional = true
-version = '1.0.101'
+codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
+serde = {version = '1.0.101', features = ['derive'], optional = true}
 
 [dev-dependencies]
 sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -24,11 +20,11 @@ sp-core = { package = 'sp-core', default-features = false, git = 'https://github
 [features]
 default = ['std']
 std = [
-	'serde',
-	'codec/std',
-	'rstd/std',
-	'sp-arithmetic/std',
+	'sp-std/std',
 	'sp-runtime/std',
 	'frame-support/std',
 	'system/std',
+	'sp-arithmetic/std',
+	'codec/std',
+	'serde',
 ]

+ 2 - 3
runtime-modules/content-directory/src/lib.rs

@@ -1,7 +1,6 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "256"]
-#![warn(missing_docs)]
 
 #[cfg(test)]
 mod tests;
@@ -30,10 +29,10 @@ use core::ops::AddAssign;
 use codec::{Codec, Decode, Encode};
 use frame_support::storage::IterableStorageMap;
 use frame_support::{decl_event, decl_module, decl_storage, ensure, traits::Get, Parameter};
-use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{BaseArithmetic, One, Zero};
 use sp_runtime::traits::{MaybeSerializeDeserialize, Member};
+use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
+use sp_std::vec::Vec;
 use system::ensure_signed;
 
 #[cfg(feature = "std")]

+ 2 - 2
runtime-modules/content-directory/src/operations.rs

@@ -1,7 +1,7 @@
 use crate::{InputPropertyValue, InputValue, PropertyId, SchemaId, Trait, VecInputValue};
 use codec::{Decode, Encode};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::prelude::*;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::prelude::*;
 
 /// Parametrized entity property value
 #[derive(Encode, Decode, Eq, PartialEq, Clone, Debug)]

+ 2 - 1
runtime-modules/content-directory/src/schema.rs

@@ -83,7 +83,8 @@ impl<T: Trait> Default for VecPropertyType<T> {
 }
 
 impl<T: Trait> VecPropertyType<T> {
-    fn new(vec_type: Type<T>, max_length: VecMaxLength) -> Self {
+    /// Create new `VecPropertyType` from provided `type` and `max_length`
+    pub fn new(vec_type: Type<T>, max_length: VecMaxLength) -> Self {
         Self {
             vec_type,
             max_length,