Bläddra i källkod

runtime: Refactor runtime Cargo.toml

Shamil Gadelshin 4 år sedan
förälder
incheckning
d87f5c3890
2 ändrade filer med 60 tillägg och 192 borttagningar
  1. 4 0
      Cargo.lock
  2. 56 192
      runtime/Cargo.toml

+ 4 - 0
Cargo.lock

@@ -596,6 +596,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
+ "serde",
  "sp-io",
  "sp-runtime",
  "sp-std",
@@ -1905,6 +1906,7 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "parity-scale-codec",
+ "serde",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -2177,6 +2179,7 @@ dependencies = [
  "frame-system",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
+ "serde",
  "smallvec 1.4.1",
  "sp-runtime",
  "sp-std",
@@ -2189,6 +2192,7 @@ source = "git+https://github.com/paritytech/substrate.git?rev=00768a1f21a579c478
 dependencies = [
  "frame-support",
  "parity-scale-codec",
+ "serde",
  "sp-api",
  "sp-runtime",
  "sp-std",

+ 56 - 192
runtime/Cargo.toml

@@ -7,14 +7,13 @@ name = 'joystream-node-runtime'
 version = '7.0.0'
 
 [dependencies]
+# Third-party dependencies
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
+
+# Substrate primitives
 rstd = { package = 'sp-std', 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'}
-frame-executive = { package = 'frame-executive', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
-frame-system-rpc-runtime-api = { package = 'frame-system-rpc-runtime-api', 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'}
-#node-primitives = { package = 'node-primitives', 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'}
 sp-offchain = { package = 'sp-offchain', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -23,11 +22,19 @@ sp-authority-discovery = { package = 'sp-authority-discovery', default-features
 sp-consensus-babe = { package = 'sp-consensus-babe', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-transaction-pool = { package = 'sp-transaction-pool', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-session = { package = 'sp-session', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
-pallet-grandpa = { package = 'pallet-grandpa', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-block-builder = { package = 'sp-block-builder', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-api = { package = 'sp-api', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-version = { package = 'sp-version', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-staking = { package = 'sp-staking', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+
+# Frame
+frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+frame-executive = { package = 'frame-executive', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+frame-system-rpc-runtime-api = { package = 'frame-system-rpc-runtime-api', 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'}
+
+# Pallets
+pallet-grandpa = { package = 'pallet-grandpa', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-staking-reward-curve = { package = 'pallet-staking-reward-curve', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-babe = { package = 'pallet-babe', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-indices = { package = 'pallet-indices', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -38,9 +45,6 @@ pallet-offences = { package = 'pallet-offences', default-features = false, git =
 pallet-finality-tracker = { package = 'pallet-finality-tracker', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-randomness-collective-flip = { package = 'pallet-randomness-collective-flip', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-authority-discovery = { package = 'pallet-authority-discovery', 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'}
 pallet-sudo = { package = 'pallet-sudo', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-staking = { package = 'pallet-staking', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -48,6 +52,7 @@ pallet-balances = { package = 'pallet-balances', default-features = false, git =
 pallet-im-online = { package = 'pallet-im-online', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 pallet-collective = { package = 'pallet-collective', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 
+# Joystream
 common = { package = 'pallet-common', default-features = false, path = '../runtime-modules/common'}
 memo = { package = 'pallet-memo', default-features = false, path = '../runtime-modules/memo'}
 forum = { package = 'pallet-forum', default-features = false, path = '../runtime-modules/forum'}
@@ -70,216 +75,75 @@ proposals-codex = { package = 'pallet-proposals-codex', default-features = false
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4' }
 
-
 [features]
 default = ['std']
 no_std = []
 std = [
-#    'authority-discovery-primitives/std',
-#    'authority-discovery/std',
-#    'authorship/std',
-#    'finality-tracker/std',
-#    'im-online/std',
-#    'session/std',
-#    'offences/std',
-#    'sr-staking-primitives/std',
-#    'substrate-client/std',
+    # Third-party dependencies
+    'serde',
+    'codec/std',
+
+    # Substrate primitives
     'rstd/std',
     'sp-io/std',
     'sp-core/std',
-    'frame-support/std',
-    'frame-system-rpc-runtime-api/std',
+    'sp-api/std',
+    'sp-version/std',
+    'sp-runtime/std',
+    'sp-arithmetic/std',
+    'sp-offchain/std',
     'sp-authority-discovery/std',
     'sp-consensus-babe/std',
-    'sp-block-builder/std',
     'sp-transaction-pool/std',
-    'sp-offchain/std',
- #   'node-primitives/std',
+    'sp-block-builder/std',
+    'sp-session/std',
+    'sp-staking/std',
+
+    # Frame
+    'frame-support/std',
+    'frame-executive/std',
+    'frame-system-rpc-runtime-api/std',
+    'system/std',
+
+    # Pallets
+    'timestamp/std',
+    'pallet-balances/std',
+    'pallet-transaction-payment/std',
     'pallet-grandpa/std',
     'pallet-babe/std',
-    'pallet-im-online/std',
-    'pallet-indices/std',
+    'pallet-session/std',
+    'pallet-finality-tracker/std',
     'pallet-authority-discovery/std',
-    'pallet-collective/std',
-#    'babe/std',
-#    'babe-primitives/std',
-#    'executive/std',
-#    'indices/std',
-#    'grandpa/std',
-#    'primitives/std',
-#    'sr-primitives/std',
-#    'version/std',
-#    'safe-mix/std',
-#    'offchain-primitives/std',
-#    'substrate-session/std',
-#    'transaction-payment/std',
-#    'randomness-collective-flip/std',
-#    'system-rpc-runtime-api/std',
-
-
-    'serde',
-    'codec/std',
-
+    'pallet-authorship/std',
+    'pallet-randomness-collective-flip/std',
     'pallet-staking/std',
-    'pallet-balances/std',
-    'system/std',
-    'timestamp/std',
+#    'pallet-staking-reward-curve/std', // don't have 'std' features
     'pallet-sudo/std',
+    'pallet-indices/std',
+    'pallet-im-online/std',
+    'pallet-collective/std',
+    'pallet-offences/std',
 
+    # Joystream
+    'common/std',
+    'memo/std',
     'forum/std',
-    'minting/std',
-    'recurring-rewards/std',
+    'membership/std',
     'stake/std',
+    'governance/std',
     'hiring/std',
+    'minting/std',
+    'recurring-rewards/std',
+    'working-group/std',
+    'content-working-group/std',
     'versioned-store/std',
     'versioned-store-permissions/std',
-    'common/std',
-    'content-working-group/std',
-    'governance/std',
-    'membership/std',
-    'memo/std',
-    'service-discovery/std',
     'storage/std',
+    'service-discovery/std',
     'proposals-engine/std',
     'proposals-discussion/std',
     'proposals-codex/std',
-    'working-group/std',
 ]
 
 
-#[dependencies.babe]
-#default-features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-babe'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.babe-primitives]
-#default-features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'substrate-consensus-babe-primitives'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.substrate-client]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'substrate-client'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.executive]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-executive'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.grandpa]
-#default-features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-grandpa'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.indices]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-indices'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.offchain-primitives]
-#default-features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'substrate-offchain-primitives'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.primitives]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'substrate-primitives'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.safe-mix]
-#default-features = false
-#version = '1.0'
-#
-#[dependencies.substrate-session]
-#default-features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-
-#
-#[dependencies.authority-discovery-primitives]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'substrate-authority-discovery-primitives'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.authority-discovery]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-authority-discovery'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.authorship]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-authorship'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.finality-tracker]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-finality-tracker'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.im-online]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-im-online'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.session]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-session'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.offences]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-offences'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.sr-staking-primitives]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'sr-staking-primitives'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.staking]
-#default_features = false
-#git = 'https://github.com/paritytech/substrate.git'
-#package = 'srml-staking'
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.transaction-payment]
-#package = "srml-transaction-payment"
-#git = 'https://github.com/paritytech/substrate.git'
-#default_features = false
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.randomness-collective-flip]
-#package = "srml-randomness-collective-flip"
-#git = 'https://github.com/paritytech/substrate.git'
-#default_features = false
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-#[dependencies.system-rpc-runtime-api]
-#package = "srml-system-rpc-runtime-api"
-#git = 'https://github.com/paritytech/substrate.git'
-#default_features = false
-#rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
-#
-
-
-
-