Refactor paths and runtime names (#507)

chore: refactor for consistant naming of the crates and paths of the runtimes * tests: ignore folder created by the tests * chore: refactoring * Update polkadot-parachains/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
paritytech · Sep 1, 2021 · 3219b42 · 3219b42
1 parent 1994ab2
commit 3219b42
Show file tree

Hide file tree

Showing 51 changed files with 102 additions and 102 deletions.
diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml
@@ -29,7 +29,7 @@ jobs:
         uses: chevdor/srtool-actions@v0.1.0
         with:
           chain: ${{ matrix.chain }}
-          runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime
+          runtime_dir: polkadot-parachains/${{ matrix.chain }}
       - name: Summary
         run: |
           echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json

diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@
 .vscode
 .DS_Store
 /.cargo/config
-
+polkadot_argument_parsing
 **/node_modules
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,12 +22,12 @@ members = [
 	"polkadot-parachains/",
 	"polkadot-parachains/pallets/parachain-info",
 	"polkadot-parachains/pallets/ping",
-	"polkadot-parachains/rococo-runtime",
-	"polkadot-parachains/shell-runtime",
+	"polkadot-parachains/rococo",
+	"polkadot-parachains/shell",
 	"polkadot-parachains/statemint-common",
-	"polkadot-parachains/statemint-runtime",
-	"polkadot-parachains/statemine-runtime",
-	"polkadot-parachains/westmint-runtime",
+	"polkadot-parachains/statemint",
+	"polkadot-parachains/statemine",
+	"polkadot-parachains/westmint",
 	"test/runtime",
 	"test/runtime-upgrade",
 	"test/client",

diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml
@@ -23,11 +23,11 @@ hex-literal = "0.2.1"
 async-trait = "0.1.42"
 
 # Parachain runtimes
-rococo-parachain-runtime = { package = "cumulus-rococo-parachain-runtime", path = "rococo-runtime" }
-shell-runtime = { package = "cumulus-shell-runtime", path = "shell-runtime" }
-statemint-runtime = { path = "statemint-runtime" }
-statemine-runtime = { path = "statemine-runtime" }
-westmint-runtime = { path = "westmint-runtime" }
+rococo-parachain-runtime = { package = "rococo-runtime", path = "rococo" }
+shell-runtime = { path = "shell" }
+statemint-runtime = { path = "statemint" }
+statemine-runtime = { path = "statemine" }
+westmint-runtime = { path = "westmint" }
 statemint-common = { path = "statemint-common" }
 
 # Substrate dependencies

diff --git a/...adot-parachains/rococo-runtime/Cargo.toml → polkadot-parachains/rococo/Cargo.toml b/...adot-parachains/rococo-runtime/Cargo.toml → polkadot-parachains/rococo/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'cumulus-rococo-parachain-runtime'
+name = 'rococo-runtime'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = '2018'

diff --git a/polkadot-parachains/rococo-runtime/build.rs → polkadot-parachains/rococo/build.rs b/polkadot-parachains/rococo-runtime/build.rs → polkadot-parachains/rococo/build.rs
diff --git a/...adot-parachains/rococo-runtime/src/lib.rs → polkadot-parachains/rococo/src/lib.rs b/...adot-parachains/rococo-runtime/src/lib.rs → polkadot-parachains/rococo/src/lib.rs
diff --git a/polkadot-parachains/shell-runtime/Cargo.toml → polkadot-parachains/shell/Cargo.toml b/polkadot-parachains/shell-runtime/Cargo.toml → polkadot-parachains/shell/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = 'cumulus-shell-runtime'
+name = 'shell-runtime'
 version = '0.1.0'
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = '2018'

diff --git a/polkadot-parachains/shell-runtime/build.rs → polkadot-parachains/shell/build.rs b/polkadot-parachains/shell-runtime/build.rs → polkadot-parachains/shell/build.rs
diff --git a/polkadot-parachains/shell-runtime/src/lib.rs → polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell-runtime/src/lib.rs → polkadot-parachains/shell/src/lib.rs
diff --git a/...t-parachains/statemine-runtime/Cargo.toml → polkadot-parachains/statemine/Cargo.toml b/...t-parachains/statemine-runtime/Cargo.toml → polkadot-parachains/statemine/Cargo.toml
diff --git a/...dot-parachains/statemine-runtime/build.rs → polkadot-parachains/statemine/build.rs b/...dot-parachains/statemine-runtime/build.rs → polkadot-parachains/statemine/build.rs
diff --git a/...chains/statemine-runtime/src/constants.rs → ...dot-parachains/statemine/src/constants.rs b/...chains/statemine-runtime/src/constants.rs → ...dot-parachains/statemine/src/constants.rs
diff --git a/...t-parachains/statemine-runtime/src/lib.rs → polkadot-parachains/statemine/src/lib.rs b/...t-parachains/statemine-runtime/src/lib.rs → polkadot-parachains/statemine/src/lib.rs
diff --git a/...ains/statemine-runtime/src/weights/mod.rs → ...t-parachains/statemine/src/weights/mod.rs b/...ains/statemine-runtime/src/weights/mod.rs → ...t-parachains/statemine/src/weights/mod.rs
diff --git a/...mine-runtime/src/weights/pallet_assets.rs → ...ns/statemine/src/weights/pallet_assets.rs b/...mine-runtime/src/weights/pallet_assets.rs → ...ns/statemine/src/weights/pallet_assets.rs
diff --git a/...ne-runtime/src/weights/pallet_balances.rs → .../statemine/src/weights/pallet_balances.rs b/...ne-runtime/src/weights/pallet_balances.rs → .../statemine/src/weights/pallet_balances.rs
diff --git a/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs b/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs
diff --git a/...ne-runtime/src/weights/pallet_multisig.rs → .../statemine/src/weights/pallet_multisig.rs b/...ne-runtime/src/weights/pallet_multisig.rs → .../statemine/src/weights/pallet_multisig.rs
diff --git a/...emine-runtime/src/weights/pallet_proxy.rs → ...ins/statemine/src/weights/pallet_proxy.rs b/...emine-runtime/src/weights/pallet_proxy.rs → ...ins/statemine/src/weights/pallet_proxy.rs
diff --git a/...ine-runtime/src/weights/pallet_session.rs → ...s/statemine/src/weights/pallet_session.rs b/...ine-runtime/src/weights/pallet_session.rs → ...s/statemine/src/weights/pallet_session.rs
diff --git a/...e-runtime/src/weights/pallet_timestamp.rs → ...statemine/src/weights/pallet_timestamp.rs b/...e-runtime/src/weights/pallet_timestamp.rs → ...statemine/src/weights/pallet_timestamp.rs
diff --git a/...ine-runtime/src/weights/pallet_uniques.rs → ...s/statemine/src/weights/pallet_uniques.rs b/...ine-runtime/src/weights/pallet_uniques.rs → ...s/statemine/src/weights/pallet_uniques.rs
diff --git a/...ine-runtime/src/weights/pallet_utility.rs → ...s/statemine/src/weights/pallet_utility.rs b/...ine-runtime/src/weights/pallet_utility.rs → ...s/statemine/src/weights/pallet_utility.rs
diff --git a/...t-parachains/statemint-runtime/Cargo.toml → polkadot-parachains/statemint/Cargo.toml b/...t-parachains/statemint-runtime/Cargo.toml → polkadot-parachains/statemint/Cargo.toml
diff --git a/...dot-parachains/statemint-runtime/build.rs → polkadot-parachains/statemint/build.rs b/...dot-parachains/statemint-runtime/build.rs → polkadot-parachains/statemint/build.rs
diff --git a/...chains/statemint-runtime/src/constants.rs → ...dot-parachains/statemint/src/constants.rs b/...chains/statemint-runtime/src/constants.rs → ...dot-parachains/statemint/src/constants.rs
diff --git a/...t-parachains/statemint-runtime/src/lib.rs → polkadot-parachains/statemint/src/lib.rs b/...t-parachains/statemint-runtime/src/lib.rs → polkadot-parachains/statemint/src/lib.rs
diff --git a/...ains/statemint-runtime/src/weights/mod.rs → ...t-parachains/statemint/src/weights/mod.rs b/...ains/statemint-runtime/src/weights/mod.rs → ...t-parachains/statemint/src/weights/mod.rs
diff --git a/...mint-runtime/src/weights/pallet_assets.rs → ...ns/statemint/src/weights/pallet_assets.rs b/...mint-runtime/src/weights/pallet_assets.rs → ...ns/statemint/src/weights/pallet_assets.rs
diff --git a/...nt-runtime/src/weights/pallet_balances.rs → .../statemint/src/weights/pallet_balances.rs b/...nt-runtime/src/weights/pallet_balances.rs → .../statemint/src/weights/pallet_balances.rs
diff --git a/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs b/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs
diff --git a/...nt-runtime/src/weights/pallet_multisig.rs → .../statemint/src/weights/pallet_multisig.rs b/...nt-runtime/src/weights/pallet_multisig.rs → .../statemint/src/weights/pallet_multisig.rs
diff --git a/...emint-runtime/src/weights/pallet_proxy.rs → ...ins/statemint/src/weights/pallet_proxy.rs b/...emint-runtime/src/weights/pallet_proxy.rs → ...ins/statemint/src/weights/pallet_proxy.rs
diff --git a/...int-runtime/src/weights/pallet_session.rs → ...s/statemint/src/weights/pallet_session.rs b/...int-runtime/src/weights/pallet_session.rs → ...s/statemint/src/weights/pallet_session.rs
diff --git a/...t-runtime/src/weights/pallet_timestamp.rs → ...statemint/src/weights/pallet_timestamp.rs b/...t-runtime/src/weights/pallet_timestamp.rs → ...statemint/src/weights/pallet_timestamp.rs
diff --git a/...int-runtime/src/weights/pallet_utility.rs → ...s/statemint/src/weights/pallet_utility.rs b/...int-runtime/src/weights/pallet_utility.rs → ...s/statemint/src/weights/pallet_utility.rs
diff --git a/...ot-parachains/westmint-runtime/Cargo.toml → polkadot-parachains/westmint/Cargo.toml b/...ot-parachains/westmint-runtime/Cargo.toml → polkadot-parachains/westmint/Cargo.toml
diff --git a/...adot-parachains/westmint-runtime/build.rs → polkadot-parachains/westmint/build.rs b/...adot-parachains/westmint-runtime/build.rs → polkadot-parachains/westmint/build.rs
diff --git a/...achains/westmint-runtime/src/constants.rs → ...adot-parachains/westmint/src/constants.rs b/...achains/westmint-runtime/src/constants.rs → ...adot-parachains/westmint/src/constants.rs
diff --git a/...ot-parachains/westmint-runtime/src/lib.rs → polkadot-parachains/westmint/src/lib.rs b/...ot-parachains/westmint-runtime/src/lib.rs → polkadot-parachains/westmint/src/lib.rs
diff --git a/...hains/westmint-runtime/src/weights/mod.rs → ...ot-parachains/westmint/src/weights/mod.rs b/...hains/westmint-runtime/src/weights/mod.rs → ...ot-parachains/westmint/src/weights/mod.rs
diff --git a/...mint-runtime/src/weights/pallet_assets.rs → ...ins/westmint/src/weights/pallet_assets.rs b/...mint-runtime/src/weights/pallet_assets.rs → ...ins/westmint/src/weights/pallet_assets.rs
diff --git a/...nt-runtime/src/weights/pallet_balances.rs → ...s/westmint/src/weights/pallet_balances.rs b/...nt-runtime/src/weights/pallet_balances.rs → ...s/westmint/src/weights/pallet_balances.rs
diff --git a/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs b/.../src/weights/pallet_collator_selection.rs → .../src/weights/pallet_collator_selection.rs
diff --git a/...nt-runtime/src/weights/pallet_multisig.rs → ...s/westmint/src/weights/pallet_multisig.rs b/...nt-runtime/src/weights/pallet_multisig.rs → ...s/westmint/src/weights/pallet_multisig.rs
diff --git a/...tmint-runtime/src/weights/pallet_proxy.rs → ...ains/westmint/src/weights/pallet_proxy.rs b/...tmint-runtime/src/weights/pallet_proxy.rs → ...ains/westmint/src/weights/pallet_proxy.rs
diff --git a/...int-runtime/src/weights/pallet_session.rs → ...ns/westmint/src/weights/pallet_session.rs b/...int-runtime/src/weights/pallet_session.rs → ...ns/westmint/src/weights/pallet_session.rs
diff --git a/...t-runtime/src/weights/pallet_timestamp.rs → .../westmint/src/weights/pallet_timestamp.rs b/...t-runtime/src/weights/pallet_timestamp.rs → .../westmint/src/weights/pallet_timestamp.rs
diff --git a/...int-runtime/src/weights/pallet_utility.rs → ...ns/westmint/src/weights/pallet_utility.rs b/...int-runtime/src/weights/pallet_utility.rs → ...ns/westmint/src/weights/pallet_utility.rs