From 260dad51109cf30764a210688c69300e3a591116 Mon Sep 17 00:00:00 2001 From: Branislav Kontur Date: Thu, 18 Aug 2022 14:16:58 +0200 Subject: [PATCH] Bko cosmetics (#1550) * Bump log version to 0.4.17 * Removed unnecesseray dependency + rename BridgeGrandpaMillauCall to BridgeGrandpaCall --- bridges/bin/millau/runtime/Cargo.toml | 2 +- bridges/bin/rialto-parachain/node/Cargo.toml | 2 +- bridges/bin/rialto-parachain/runtime/Cargo.toml | 2 +- bridges/bin/rialto/runtime/Cargo.toml | 2 +- bridges/bin/rialto/runtime/src/lib.rs | 2 +- bridges/bin/runtime-common/Cargo.toml | 2 +- bridges/modules/grandpa/Cargo.toml | 2 +- bridges/modules/messages/Cargo.toml | 2 +- bridges/modules/parachains/Cargo.toml | 2 +- bridges/modules/relayers/Cargo.toml | 2 +- bridges/relays/bin-substrate/Cargo.toml | 4 +--- bridges/relays/bin-substrate/src/cli/init_bridge.rs | 4 +--- bridges/relays/client-millau/Cargo.toml | 1 - bridges/relays/client-substrate/Cargo.toml | 2 +- bridges/relays/finality/Cargo.toml | 2 +- bridges/relays/lib-substrate-relay/Cargo.toml | 2 +- bridges/relays/messages/Cargo.toml | 2 +- bridges/relays/parachains/Cargo.toml | 2 +- bridges/relays/utils/Cargo.toml | 2 +- 19 files changed, 18 insertions(+), 23 deletions(-) diff --git a/bridges/bin/millau/runtime/Cargo.toml b/bridges/bin/millau/runtime/Cargo.toml index 33bdcca35cf7..e3c04e4d7a07 100644 --- a/bridges/bin/millau/runtime/Cargo.toml +++ b/bridges/bin/millau/runtime/Cargo.toml @@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" hex-literal = "0.3" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] } diff --git a/bridges/bin/rialto-parachain/node/Cargo.toml b/bridges/bin/rialto-parachain/node/Cargo.toml index 26b91019c1e0..5a5d307aeb52 100644 --- a/bridges/bin/rialto-parachain/node/Cargo.toml +++ b/bridges/bin/rialto-parachain/node/Cargo.toml @@ -19,7 +19,7 @@ runtime-benchmarks = ['rialto-parachain-runtime/runtime-benchmarks'] [dependencies] clap = { version = "3.1", features = ["derive"] } derive_more = '0.99.2' -log = '0.4.14' +log = '0.4.17' codec = { package = 'parity-scale-codec', version = '3.0.0' } serde = { version = '1.0', features = ['derive'] } hex-literal = '0.3.1' diff --git a/bridges/bin/rialto-parachain/runtime/Cargo.toml b/bridges/bin/rialto-parachain/runtime/Cargo.toml index 6c3d838196a4..a72b284daf6f 100644 --- a/bridges/bin/rialto-parachain/runtime/Cargo.toml +++ b/bridges/bin/rialto-parachain/runtime/Cargo.toml @@ -11,7 +11,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [dependencies] codec = { package = 'parity-scale-codec', version = '3.0.0', default-features = false, features = ['derive']} -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = '1.0', optional = true, features = ['derive'] } diff --git a/bridges/bin/rialto/runtime/Cargo.toml b/bridges/bin/rialto/runtime/Cargo.toml index a29560a65d9a..b2ba7da2febe 100644 --- a/bridges/bin/rialto/runtime/Cargo.toml +++ b/bridges/bin/rialto/runtime/Cargo.toml @@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } hex-literal = "0.3" libsecp256k1 = { version = "0.7", optional = true, default-features = false, features = ["hmac"] } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] } diff --git a/bridges/bin/rialto/runtime/src/lib.rs b/bridges/bin/rialto/runtime/src/lib.rs index 56cbca221d45..acca140d325d 100644 --- a/bridges/bin/rialto/runtime/src/lib.rs +++ b/bridges/bin/rialto/runtime/src/lib.rs @@ -70,7 +70,7 @@ pub use frame_support::{ pub use frame_system::Call as SystemCall; pub use pallet_balances::Call as BalancesCall; -pub use pallet_bridge_grandpa::Call as BridgeGrandpaMillauCall; +pub use pallet_bridge_grandpa::Call as BridgeGrandpaCall; pub use pallet_bridge_messages::Call as MessagesCall; pub use pallet_sudo::Call as SudoCall; pub use pallet_timestamp::Call as TimestampCall; diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml index 121ef318fbb0..1d09192ced55 100644 --- a/bridges/bin/runtime-common/Cargo.toml +++ b/bridges/bin/runtime-common/Cargo.toml @@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } hash-db = { version = "0.15.2", default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } num-traits = { version = "0.2", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } static_assertions = { version = "1.1", optional = true } diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml index f4a64758aa92..89cfb5e16404 100644 --- a/bridges/modules/grandpa/Cargo.toml +++ b/bridges/modules/grandpa/Cargo.toml @@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } finality-grandpa = { version = "0.15.0", default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } num-traits = { version = "0.2", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true } diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml index 5f98523266f7..b6fc8c604bc3 100644 --- a/bridges/modules/messages/Cargo.toml +++ b/bridges/modules/messages/Cargo.toml @@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] bitvec = { version = "1", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } num-traits = { version = "0.2", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } diff --git a/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml index 8636c7a40b6d..2a8ab1d09d13 100644 --- a/bridges/modules/parachains/Cargo.toml +++ b/bridges/modules/parachains/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml index ef689f55918b..b3f5475d429b 100644 --- a/bridges/modules/relayers/Cargo.toml +++ b/bridges/modules/relayers/Cargo.toml @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.17", default-features = false } num-traits = { version = "0.2", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } diff --git a/bridges/relays/bin-substrate/Cargo.toml b/bridges/relays/bin-substrate/Cargo.toml index 56d669e49735..b780c33ead09 100644 --- a/bridges/relays/bin-substrate/Cargo.toml +++ b/bridges/relays/bin-substrate/Cargo.toml @@ -12,7 +12,7 @@ async-trait = "0.1" codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.12" hex = "0.4" -log = "0.4.14" +log = "0.4.17" num-format = "0.4" num-traits = "0.2" paste = "1.0" @@ -35,7 +35,6 @@ bridge-runtime-common = { path = "../../bin/runtime-common" } finality-relay = { path = "../finality" } messages-relay = { path = "../messages" } millau-runtime = { path = "../../bin/millau/runtime" } -pallet-bridge-grandpa = { path = "../../modules/grandpa" } pallet-bridge-messages = { path = "../../modules/messages" } pallet-bridge-parachains = { path = "../../modules/parachains" } parachains-relay = { path = "../parachains" } @@ -70,7 +69,6 @@ xcm = { git = "https://github.com/paritytech/polkadot", branch = "gav-xcm-v3", d [dev-dependencies] bp-test-utils = { path = "../../primitives/test-utils" } hex-literal = "0.3" -pallet-bridge-grandpa = { path = "../../modules/grandpa" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } tempfile = "3.2" finality-grandpa = { version = "0.15.0" } diff --git a/bridges/relays/bin-substrate/src/cli/init_bridge.rs b/bridges/relays/bin-substrate/src/cli/init_bridge.rs index 971512f2111b..150c55d9c6c6 100644 --- a/bridges/relays/bin-substrate/src/cli/init_bridge.rs +++ b/bridges/relays/bin-substrate/src/cli/init_bridge.rs @@ -112,9 +112,7 @@ impl BridgeInitializer for MillauToRialtoCliBridge { init_data: >::InitializationData, ) -> ::Call { rialto_runtime::SudoCall::sudo { - call: Box::new( - rialto_runtime::BridgeGrandpaMillauCall::initialize { init_data }.into(), - ), + call: Box::new(rialto_runtime::BridgeGrandpaCall::initialize { init_data }.into()), } .into() } diff --git a/bridges/relays/client-millau/Cargo.toml b/bridges/relays/client-millau/Cargo.toml index ab342f63ad9a..989324334551 100644 --- a/bridges/relays/client-millau/Cargo.toml +++ b/bridges/relays/client-millau/Cargo.toml @@ -15,7 +15,6 @@ relay-utils = { path = "../utils" } bp-messages = { path = "../../primitives/messages" } bp-millau = { path = "../../primitives/chain-millau" } millau-runtime = { path = "../../bin/millau/runtime" } -pallet-bridge-grandpa = { path = "../../modules/grandpa" } # Substrate Dependencies diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml index 91fd8eb10a0e..ab6c9f9536fe 100644 --- a/bridges/relays/client-substrate/Cargo.toml +++ b/bridges/relays/client-substrate/Cargo.toml @@ -11,7 +11,7 @@ async-trait = "0.1" codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.7" jsonrpsee = { version = "0.15", features = ["macros", "ws-client"] } -log = "0.4.11" +log = "0.4.17" num-traits = "0.2" rand = "0.7" serde = { version = "1.0" } diff --git a/bridges/relays/finality/Cargo.toml b/bridges/relays/finality/Cargo.toml index 692e902ace42..ae4be5b5524d 100644 --- a/bridges/relays/finality/Cargo.toml +++ b/bridges/relays/finality/Cargo.toml @@ -12,7 +12,7 @@ async-trait = "0.1" backoff = "0.2" bp-header-chain = { path = "../../primitives/header-chain" } futures = "0.3.5" -log = "0.4.11" +log = "0.4.17" num-traits = "0.2" relay-utils = { path = "../utils" } diff --git a/bridges/relays/lib-substrate-relay/Cargo.toml b/bridges/relays/lib-substrate-relay/Cargo.toml index a74ebf3e183b..70b319854883 100644 --- a/bridges/relays/lib-substrate-relay/Cargo.toml +++ b/bridges/relays/lib-substrate-relay/Cargo.toml @@ -13,7 +13,7 @@ async-trait = "0.1" codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.12" num-traits = "0.2" -log = "0.4.14" +log = "0.4.17" # Bridge dependencies diff --git a/bridges/relays/messages/Cargo.toml b/bridges/relays/messages/Cargo.toml index af967f34acda..02e453b1c32a 100644 --- a/bridges/relays/messages/Cargo.toml +++ b/bridges/relays/messages/Cargo.toml @@ -10,7 +10,7 @@ async-std = { version = "1.6.5", features = ["attributes"] } async-trait = "0.1" futures = "0.3.5" hex = "0.4" -log = "0.4.11" +log = "0.4.17" num-traits = "0.2" parking_lot = "0.11.0" diff --git a/bridges/relays/parachains/Cargo.toml b/bridges/relays/parachains/Cargo.toml index e5c0cea137bf..6115a2d6ce28 100644 --- a/bridges/relays/parachains/Cargo.toml +++ b/bridges/relays/parachains/Cargo.toml @@ -11,7 +11,7 @@ async-trait = "0.1.40" backoff = "0.2" futures = "0.3.5" linked-hash-map = "0.5.3" -log = "0.4.11" +log = "0.4.17" num-traits = "0.2" parking_lot = "0.11.0" relay-utils = { path = "../utils" } diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml index af5baa5ccf00..ebbfa74c6ff8 100644 --- a/bridges/relays/utils/Cargo.toml +++ b/bridges/relays/utils/Cargo.toml @@ -15,7 +15,7 @@ isahc = "1.2" env_logger = "0.8.2" futures = "0.3.5" jsonpath_lib = "0.2" -log = "0.4.11" +log = "0.4.17" num-traits = "0.2" serde_json = "1.0" sysinfo = "0.15"