Эх сурвалжийг харах

pallet naming unification

ondratra 4 жил өмнө
parent
commit
49ed7e4989

+ 42 - 42
Cargo.lock

@@ -2363,6 +2363,7 @@ dependencies = [
  "pallet-session",
  "pallet-session-benchmarking",
  "pallet-staking",
+ "pallet-staking-handler",
  "pallet-staking-reward-curve",
  "pallet-storage",
  "pallet-sudo",
@@ -2389,7 +2390,6 @@ dependencies = [
  "sp-std",
  "sp-transaction-pool",
  "sp-version",
- "staking-handler",
  "strum 0.19.5",
  "substrate-wasm-builder-runner",
 ]
@@ -3777,6 +3777,8 @@ dependencies = [
  "frame-system",
  "pallet-balances",
  "pallet-membership",
+ "pallet-referendum",
+ "pallet-staking-handler",
  "pallet-timestamp",
  "parity-scale-codec",
  "rand 0.7.3",
@@ -3785,8 +3787,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "staking-handler",
- "substrate-referendum-module",
 ]
 
 [[package]]
@@ -3966,6 +3966,7 @@ dependencies = [
  "pallet-proposals-engine",
  "pallet-recurring-reward",
  "pallet-staking",
+ "pallet-staking-handler",
  "pallet-staking-reward-curve",
  "pallet-timestamp",
  "pallet-token-mint",
@@ -3978,7 +3979,6 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-std",
- "staking-handler",
  "strum 0.19.5",
 ]
 
@@ -4013,6 +4013,7 @@ dependencies = [
  "pallet-governance",
  "pallet-membership",
  "pallet-recurring-reward",
+ "pallet-staking-handler",
  "pallet-timestamp",
  "pallet-token-mint",
  "parity-scale-codec",
@@ -4022,7 +4023,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "staking-handler",
 ]
 
 [[package]]
@@ -4053,6 +4053,22 @@ dependencies = [
  "sp-runtime",
 ]
 
+[[package]]
+name = "pallet-referendum"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "parity-scale-codec",
+ "rand 0.7.3",
+ "serde",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+]
+
 [[package]]
 name = "pallet-service-discovery"
 version = "4.0.0"
@@ -4063,6 +4079,7 @@ dependencies = [
  "pallet-common",
  "pallet-membership",
  "pallet-recurring-reward",
+ "pallet-staking-handler",
  "pallet-timestamp",
  "pallet-token-mint",
  "pallet-working-group",
@@ -4073,7 +4090,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "staking-handler",
 ]
 
 [[package]]
@@ -4134,6 +4150,24 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "pallet-staking-handler"
+version = "1.0.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "pallet-balances",
+ "pallet-common",
+ "pallet-membership",
+ "pallet-timestamp",
+ "parity-scale-codec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
@@ -4155,6 +4189,7 @@ dependencies = [
  "pallet-common",
  "pallet-membership",
  "pallet-recurring-reward",
+ "pallet-staking-handler",
  "pallet-timestamp",
  "pallet-token-mint",
  "pallet-working-group",
@@ -4165,7 +4200,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "staking-handler",
 ]
 
 [[package]]
@@ -4288,6 +4322,7 @@ dependencies = [
  "pallet-balances",
  "pallet-common",
  "pallet-membership",
+ "pallet-staking-handler",
  "pallet-timestamp",
  "parity-scale-codec",
  "serde",
@@ -4296,7 +4331,6 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-std",
- "staking-handler",
 ]
 
 [[package]]
@@ -7212,24 +7246,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "staking-handler"
-version = "1.0.0"
-dependencies = [
- "frame-support",
- "frame-system",
- "pallet-balances",
- "pallet-common",
- "pallet-membership",
- "pallet-timestamp",
- "parity-scale-codec",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -7417,22 +7433,6 @@ dependencies = [
  "tokio 0.2.23",
 ]
 
-[[package]]
-name = "substrate-referendum-module"
-version = "1.0.0"
-dependencies = [
- "frame-support",
- "frame-system",
- "pallet-balances",
- "parity-scale-codec",
- "rand 0.7.3",
- "serde",
- "sp-arithmetic",
- "sp-core",
- "sp-io",
- "sp-runtime",
-]
-
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"

+ 2 - 2
runtime-modules/council/Cargo.toml

@@ -13,8 +13,8 @@ sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'ht
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 frame-system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 
-referendum = { package = 'substrate-referendum-module', default-features = false, path = '../referendum'}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../staking-handler'}
+referendum = { package = 'pallet-referendum', default-features = false, path = '../referendum'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../staking-handler'}
 
 [dev-dependencies]
 balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}

+ 1 - 1
runtime-modules/proposals/codex/Cargo.toml

@@ -31,7 +31,7 @@ sp-staking = { package = 'sp-staking', default-features = false, git = 'https://
 pallet-staking-reward-curve = { package = 'pallet-staking-reward-curve', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 recurring-rewards = { package = 'pallet-recurring-reward', default-features = false, path = '../../recurring-reward'}
 strum = {version = "0.19", default-features = false}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../../staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../../staking-handler'}
 
 [features]
 default = ['std']

+ 1 - 1
runtime-modules/proposals/engine/Cargo.toml

@@ -16,7 +16,7 @@ sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://
 balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 membership = { package = 'pallet-membership', default-features = false, path = '../../membership'}
 common = { package = 'pallet-common', default-features = false, path = '../../common'}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../../staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../../staking-handler'}
 
 # Benchmark dependencies.
 frame-benchmarking = { package = 'frame-benchmarking', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca', optional = true}

+ 1 - 1
runtime-modules/referendum/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = 'substrate-referendum-module'
+name = 'pallet-referendum'
 version = '1.0.0'
 authors = ['Joystream contributors']
 edition = '2018'

+ 1 - 1
runtime-modules/service-discovery/Cargo.toml

@@ -23,7 +23,7 @@ membership = { package = 'pallet-membership', default-features = false, path = '
 minting = { package = 'pallet-token-mint', default-features = false, path = '../token-minting'}
 recurringrewards = { package = 'pallet-recurring-reward', default-features = false, path = '../recurring-reward'}
 common = { package = 'pallet-common', default-features = false, path = '../common'}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../staking-handler'}
 
 [features]
 default = ['std']

+ 1 - 1
runtime-modules/staking-handler/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = 'staking-handler'
+name = 'pallet-staking-handler'
 version = '1.0.0'
 authors = ['Joystream contributors']
 edition = '2018'

+ 1 - 1
runtime-modules/storage/Cargo.toml

@@ -23,7 +23,7 @@ sp-core = { package = 'sp-core', default-features = false, git = 'https://github
 balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 minting = { package = 'pallet-token-mint', default-features = false, path = '../token-minting'}
 recurringrewards = { package = 'pallet-recurring-reward', default-features = false, path = '../recurring-reward'}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../staking-handler'}
 
 [features]
 default = ['std']

+ 1 - 1
runtime-modules/working-group/Cargo.toml

@@ -16,7 +16,7 @@ common = { package = 'pallet-common', default-features = false, path = '../commo
 membership = { package = 'pallet-membership', default-features = false, path = '../membership'}
 balances = { package = 'pallet-balances', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}
 frame-benchmarking = { package = 'frame-benchmarking', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca', optional = true}
-staking-handler = { package = 'staking-handler', default-features = false, path = '../staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../staking-handler'}
 
 [dev-dependencies]
 sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}

+ 1 - 1
runtime/Cargo.toml

@@ -77,7 +77,7 @@ proposals-discussion = { package = 'pallet-proposals-discussion', default-featur
 proposals-codex = { package = 'pallet-proposals-codex', default-features = false, path = '../runtime-modules/proposals/codex'}
 content-directory = { package = 'pallet-content-directory', default-features = false, path = '../runtime-modules/content-directory' }
 pallet_constitution = { package = 'pallet-constitution', default-features = false, path = '../runtime-modules/constitution' }
-staking-handler = { package = 'staking-handler', default-features = false, path = '../runtime-modules/staking-handler'}
+staking-handler = { package = 'pallet-staking-handler', default-features = false, path = '../runtime-modules/staking-handler'}
 
 [dev-dependencies]
 sp-io = { package = 'sp-io', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = 'a200cdb93c6af5763b9c7bf313fa708764ac88ca'}