Switch to using version/author/edition from the workspace

chevdor · Jan 13, 2023 · 996b6d9 · 996b6d9
1 parent 0c94c3c
commit 996b6d9
Show file tree

Hide file tree

Showing 11 changed files with 443 additions and 357 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,9 @@
-[workspace]
-resolver = "2"
+[workspace.package]
+version = "1.0.0-alpha5"
+authors = ["chevdor <chevdor@gmail.com>", "Wilfried Kopp <wilfried@parity.io>"]
+edition = "2021"
 
+[workspace]
 members = [
     "cli",
     "lib",

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
-authors = ["Chevdor <chevdor@gmail.com>", "Wilfried Kopp <wilfried@parity.io>"]
+name = "subwasm-cli"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 description = "subwasm is a utility that works on WASM Runtime of Substrate based chains"
-edition = "2021"
 homepage = "https://github.com/chevdor/subwasm"
 keywords = [
   "wasm",
@@ -13,10 +15,8 @@ keywords = [
   "kusama",
 ]
 license = "MIT"
-name = "subwasm"
 readme = "README.md"
 repository = "https://github.com/chevdor/subwasm"
-version = "1.0.0-alpha3"
 
 [dependencies]
 assert_cmd = "2.0"
@@ -32,12 +32,12 @@ clap = { version = "4.0", features = [
   "suggestions",
 ] }
 color-eyre = "0.6"
-env_logger = "0.9"
+env_logger = "0.10"
 log = "0.4"
-substrate-runtime-proposal-hash = { version = "0.18.0", path = "../libs/substrate-runtime-proposal-hash", optional = true }
-subwasmlib = { version = "0.18.0", path = "../lib" }
-wasm-loader = { version = "0.18.0", path = "../libs/wasm-loader" }
-wasm-testbed = { version = "0.18.0", path = "../libs/wasm-testbed" }
+substrate-runtime-proposal-hash = { version = "1.0.0-alpha5", path = "../libs/substrate-runtime-proposal-hash", optional = true }
+subwasmlib = { version = "1.0.0-alpha5", path = "../lib" }
+wasm-loader = { version = "1.0.0-alpha5", path = "../libs/wasm-loader" }
+wasm-testbed = { version = "1.0.0-alpha5", path = "../libs/wasm-testbed" }
 serde_json = "1.0"
 text-style = { version = "0.3", features = ["termion"] }
 sp-runtime = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -1,6 +1,9 @@
 [package]
-authors = ["chevdor <chevdor@gmail.com>"]
-edition = "2021"
+name = "subwasmlib"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
 homepage = "https://github.com/chevdor/subwasm"
 keywords = [
     "wasm",
@@ -12,10 +15,8 @@ keywords = [
     "kusama",
 ]
 license = "MIT"
-name = "subwasmlib"
 readme = "README.md"
 repository = "https://github.com/chevdor/subwasm"
-version = "0.18.0"
 
 [dependencies]
 calm_io = "0.1"
@@ -26,7 +27,7 @@ frame-metadata = { version = "15", package = "frame-metadata", features = [
     "v14",
     "std",
 ] }
-ipfs-hasher = { version = "0.18.0", path = "../libs/ipfs-hasher" }
+ipfs-hasher = { version = "1.0.0-alpha5", path = "../libs/ipfs-hasher" }
 log = "0.4"
 num-format = "0.4"
 rand = "0.8"
@@ -35,7 +36,7 @@ scale-info = { version = "2.1", default-features = false, features = [
 ] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-substrate-differ = { version = "1.0.0-alpha3", path = "../libs/substrate-differ" }
-wasm-loader = { version = "0.18.0", path = "../libs/wasm-loader" }
-wasm-testbed = { version = "0.18.0", path = "../libs/wasm-testbed" }
+substrate-differ = { version = "1.0.0-alpha5", path = "../libs/substrate-differ" }
+wasm-loader = { version = "1.0.0-alpha5", path = "../libs/wasm-loader" }
+wasm-testbed = { version = "1.0.0-alpha5", path = "../libs/wasm-testbed" }
 sp-version = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }
diff --git a/libs/ipfs-hasher/Cargo.toml b/libs/ipfs-hasher/Cargo.toml
@@ -1,14 +1,15 @@
 [package]
-authors = ["Wilfried Kopp <wilfried@parity.io>"]
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
 license = "MIT"
 name = "ipfs-hasher"
-version = "0.18.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 ipfs-unixfs = "0.2"
 
 [dev-dependencies]
-wasm-loader = { version = "0.18", path = "../wasm-loader" }
+wasm-loader = { version = "1.0.0-alpha5", path = "../wasm-loader" }
diff --git a/libs/substrate-differ/Cargo.toml b/libs/substrate-differ/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
-edition = "2021"
-license = "MIT"
 name = "substrate-differ"
-version = "1.0.0-alpha3"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+license = "MIT"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -21,7 +22,7 @@ treediff = { version = "4.0", features = [
     "with-serde-json",
     "with-rustc-serialize",
 ] }
-wasm-testbed = { version = "0.18.0", path = "../wasm-testbed" }
+wasm-testbed = { version = "1.0.0-alpha5", path = "../wasm-testbed" }
 scale-info = { version = "2.1.2", default-features = false, features = [
     "derive",
     "std",
@@ -31,7 +32,7 @@ document-features = { version = "0.2" }
 comparable = { version = ">=0.5.3", features = ["derive", "serde"] }
 
 [dev-dependencies]
-wasm-loader = { version = "0.18", path = "../wasm-loader" }
+wasm-loader = { version = "1.0.0-alpha5", path = "../wasm-loader" }
 
 [features]
 ## The default feature currently hides feature that are deprecated

diff --git a/libs/substrate-differ/src/differs/reduced/reduced_extrinsic.rs b/libs/substrate-differ/src/differs/reduced/reduced_extrinsic.rs
@@ -1,9 +1,9 @@
-use super::calls::{prelude::PalletId, *};
 use comparable::Comparable;
-use frame_metadata::PalletMetadata;
-use scale_info::form::PortableForm;
 use serde::Serialize;
-use std::{collections::BTreeMap, fmt::Display};
+// use super::calls::{prelude::PalletId, *};
+// use frame_metadata::PalletMetadata;
+// use scale_info::form::PortableForm;
+// use std::{collections::BTreeMap, fmt::Display};
 
 /// A [ReducedPallet] could be a `Vec` or [PalletItem] but it ends
 /// but providing a much more useful output after diffing when using

diff --git a/libs/substrate-differ/src/differs/reduced/reduced_runtime.rs b/libs/substrate-differ/src/differs/reduced/reduced_runtime.rs
@@ -142,9 +142,9 @@ impl ReducedRuntime {
 		let registry = &v14.types;
 
 		// TODO: deal with extrinsic as well
-		let _extrinsics = &v14.extrinsic;
+		// let extrinsics = &v14.extrinsic;
 
-		println!("_extrinsics = {:#?}", _extrinsics);
+		// println!("extrinsics = {:#?}", extrinsics);
 
 		let pallets = &v14.pallets;
 		let reduced_pallets: HashMap<PalletId, ReducedPallet> = pallets

diff --git a/libs/substrate-runtime-proposal-hash/Cargo.toml b/libs/substrate-runtime-proposal-hash/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
-authors = ["chevdor <chevdor@gmail.com>"]
-edition = "2021"
+name = "substrate-runtime-proposal-hash"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 homepage = "https://github.com/chevdor/subwasm"
 keywords = [
     "wasm",
@@ -12,13 +14,16 @@ keywords = [
     "kusama",
 ]
 license = "MIT"
-name = "substrate-runtime-proposal-hash"
 readme = "README.md"
 repository = "https://github.com/chevdor/subwasm"
-version = "0.18.0"
 
 [dependencies]
-frame-metadata = {package = "frame-metadata", git = "https://github.com/paritytech/frame-metadata", branch = "main", features = ["v12", "v13", "v14", "std"] }
+frame-metadata = { package = "frame-metadata", git = "https://github.com/paritytech/frame-metadata", branch = "main", features = [
+    "v12",
+    "v13",
+    "v14",
+    "std",
+] }
 blake2 = "0.10"
 codec = { version = "3.1", package = "parity-scale-codec" }
 sp-core = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }

diff --git a/libs/wasm-loader/Cargo.toml b/libs/wasm-loader/Cargo.toml
@@ -1,6 +1,9 @@
 [package]
-authors = ["chevdor <chevdor@gmail.com>"]
-edition = "2021"
+name = "wasm-loader"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+
 homepage = "https://github.com/chevdor/subwasm"
 keywords = [
     "wasm",
@@ -12,19 +15,17 @@ keywords = [
     "kusama",
 ]
 license = "MIT"
-name = "wasm-loader"
 readme = "README.md"
 repository = "https://github.com/chevdor/subwasm"
-version = "0.18.0"
 
 [dependencies]
 hex = "0.4"
-jsonrpsee = { version = "0.15", git = "https://github.com/paritytech/jsonrpsee", features = [
+jsonrpsee = { version = "0.16", git = "https://github.com/paritytech/jsonrpsee", features = [
     "client",
 ] }
 log = "0.4"
 multibase = "0.9"
-multihash = "0.16"
+multihash = "0.18"
 serde = { version = "1.0", features = ["derive"] }
 sp-maybe-compressed-blob = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate/" }
 tokio = { version = "1.19", features = ["full"] }
diff --git a/libs/wasm-testbed/Cargo.toml b/libs/wasm-testbed/Cargo.toml
@@ -1,6 +1,8 @@
 [package]
-authors = ["chevdor <chevdor@gmail.com>"]
-edition = "2021"
+name = "wasm-testbed"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 homepage = "https://github.com/chevdor/subwasm"
 keywords = [
     "wasm",
@@ -12,10 +14,8 @@ keywords = [
     "kusama",
 ]
 license = "MIT"
-name = "wasm-testbed"
 readme = "README.md"
 repository = "https://github.com/chevdor/subwasm"
-version = "0.18.0"
 
 [dependencies]
 scale-info = { version = "2.1", default-features = false, features = [
@@ -37,6 +37,6 @@ sp-io = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrat
 sp-runtime = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }
 sp-state-machine = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }
 sp-wasm-interface = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }
-substrate-runtime-proposal-hash = { version = "0.18.0", path = "../substrate-runtime-proposal-hash" }
-wasm-loader = { version = "0.18.0", path = "../wasm-loader" }
+substrate-runtime-proposal-hash = { version = "1.0.0-alpha5", path = "../substrate-runtime-proposal-hash" }
+wasm-loader = { version = "1.0.0-alpha5", path = "../wasm-loader" }
 sp-version = { tag = "monthly-2022-07", git = "https://github.com/paritytech/substrate" }