From d71eae1ea3a892ef6d052d78dfc6e89e286fa519 Mon Sep 17 00:00:00 2001
From: drewstone <drewstone329@gmail.com>
Date: Wed, 13 Dec 2023 11:07:30 -0700
Subject: [PATCH] Fix clippy deprecated warning + feature issues (#345)

---
 Cargo.lock                    |  1 +
 node/Cargo.toml               |  1 +
 node/src/cli.rs               |  2 +-
 node/src/service.rs           | 41 +++++++++++++++++++----------------
 relayer-gadget/cli/src/lib.rs |  4 ++--
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index edc39cb3d..f2765d927 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15233,6 +15233,7 @@ dependencies = [
  "sc-transaction-pool-api",
  "serde_json",
  "sp-api",
+ "sp-application-crypto 23.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus-aura",
diff --git a/node/Cargo.toml b/node/Cargo.toml
index d013668b5..30e411494 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -71,6 +71,7 @@ sc-chain-spec = { workspace = true }
 sc-consensus-manual-seal = { workspace = true }
 sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }
+sp-application-crypto = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-blockchain = { workspace = true }
diff --git a/node/src/cli.rs b/node/src/cli.rs
index 9d5a6a4c4..f0d60fdbb 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -33,7 +33,7 @@ pub struct Cli {
 
 	#[cfg(feature = "relayer")]
 	#[clap(flatten)]
-	pub relayer_cmd: webb_relayer_gadget_cli::WebbRelayerCmd,
+	pub relayer_cmd: tangle_relayer_gadget_cli::RelayerCmd,
 
 	#[cfg(feature = "light-client")]
 	#[clap(flatten)]
diff --git a/node/src/service.rs b/node/src/service.rs
index 59cb3e5ac..7f17123ba 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -302,7 +302,7 @@ pub struct RunFullParams {
 	pub rpc_config: RpcConfig,
 	pub debug_output: Option<std::path::PathBuf>,
 	#[cfg(feature = "relayer")]
-	pub relayer_cmd: webb_relayer_gadget_cli::WebbRelayerCmd,
+	pub relayer_cmd: tangle_relayer_gadget_cli::RelayerCmd,
 	#[cfg(feature = "light-client")]
 	pub light_client_relayer_cmd:
 		pallet_eth2_light_client_relayer_gadget_cli::LightClientRelayerCmd,
@@ -550,7 +550,7 @@ pub async fn new_full(
 	if role.is_authority() {
 		// setup relayer gadget params
 		#[cfg(feature = "relayer")]
-		let relayer_params = webb_relayer_gadget::WebbRelayerParams {
+		let relayer_params = tangle_relayer_gadget::RelayerParams {
 			local_keystore: keystore_container.local_keystore(),
 			config_dir: relayer_cmd.relayer_config_dir,
 			database_path: config
@@ -566,26 +566,29 @@ pub async fn new_full(
 		task_manager.spawn_handle().spawn(
 			"relayer-gadget",
 			None,
-			webb_relayer_gadget::start_relayer_gadget(relayer_params),
+			tangle_relayer_gadget::start_relayer_gadget(
+				relayer_params,
+				sp_application_crypto::KeyTypeId(*b"role"),
+			),
 		);
 
 		// Start Eth2 Light client Relayer Gadget - (MAINNET RELAYER)
-		// #[cfg(feature = "light-client")]
-		// task_manager.spawn_handle().spawn(
-		// 	"mainnet-relayer-gadget",
-		// 	None,
-		// 	pallet_eth2_light_client_relayer_gadget::start_gadget(
-		// 		pallet_eth2_light_client_relayer_gadget::Eth2LightClientParams {
-		// 			lc_relay_config_path: light_client_relayer_cmd
-		// 				.light_client_relay_config_path
-		// 				.clone(),
-		// 			lc_init_config_path: light_client_relayer_cmd
-		// 				.light_client_init_pallet_config_path
-		// 				.clone(),
-		// 			eth2_chain_id: webb_proposals::TypedChainId::Evm(1),
-		// 		},
-		// 	),
-		// );
+		#[cfg(feature = "light-client")]
+		task_manager.spawn_handle().spawn(
+			"mainnet-relayer-gadget",
+			None,
+			pallet_eth2_light_client_relayer_gadget::start_gadget(
+				pallet_eth2_light_client_relayer_gadget::Eth2LightClientParams {
+					lc_relay_config_path: light_client_relayer_cmd
+						.light_client_relay_config_path
+						.clone(),
+					lc_init_config_path: light_client_relayer_cmd
+						.light_client_init_pallet_config_path
+						.clone(),
+					eth2_chain_id: webb_proposals::TypedChainId::Evm(1),
+				},
+			),
+		);
 	}
 	let params = sc_service::SpawnTasksParams {
 		network: network.clone(),
diff --git a/relayer-gadget/cli/src/lib.rs b/relayer-gadget/cli/src/lib.rs
index 381dcd4b6..b33388371 100644
--- a/relayer-gadget/cli/src/lib.rs
+++ b/relayer-gadget/cli/src/lib.rs
@@ -2,8 +2,8 @@ use std::path::PathBuf;
 
 /// Cli tool to interact with Webb Relayer CLI
 #[derive(Debug, Clone, clap::Parser)]
-#[clap(next_help_heading = "Webb Relayer")]
-pub struct WebbRelayerCmd {
+#[command(next_help_heading = "Webb Relayer")]
+pub struct RelayerCmd {
 	/// Directory that contains configration files for the relayer.
 	#[arg(long, value_name = "PATH")]
 	pub relayer_config_dir: Option<PathBuf>,