From a97d9fb6aac3b2310d1ce380024fc68ab6680299 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 15 Feb 2022 22:21:34 +0100
Subject: [PATCH] Mark sync_state_genSyncSpec JSON-RPC as safe (#10832)

* Mark sync_state_genSyncSpec JSON-RPC as safe

* Note that parameter is unused

* Ideally I'd wait for compilation to be finished before pushing, but it's really taking a long time

* Remove deny_unsafe parameter

* Remove unused dependency
---
 Cargo.lock                       | 1 -
 bin/node/rpc/src/lib.rs          | 1 -
 client/sync-state-rpc/Cargo.toml | 1 -
 client/sync-state-rpc/src/lib.rs | 8 +-------
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e97c90e49236a..635ca97cd1e52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8808,7 +8808,6 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-finality-grandpa",
- "sc-rpc-api",
  "serde",
  "serde_json",
  "sp-blockchain",
diff --git a/bin/node/rpc/src/lib.rs b/bin/node/rpc/src/lib.rs
index 30f7a0fdf023c..31f2f41086885 100644
--- a/bin/node/rpc/src/lib.rs
+++ b/bin/node/rpc/src/lib.rs
@@ -165,7 +165,6 @@ where
 			client,
 			shared_authority_set,
 			shared_epoch_changes,
-			deny_unsafe,
 		)?,
 	));
 
diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml
index b413446c321f2..3e064685488d4 100644
--- a/client/sync-state-rpc/Cargo.toml
+++ b/client/sync-state-rpc/Cargo.toml
@@ -22,7 +22,6 @@ sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-consensus-babe = { version = "0.10.0-dev", path = "../consensus/babe" }
 sc-consensus-epochs = { version = "0.10.0-dev", path = "../consensus/epochs" }
 sc-finality-grandpa = { version = "0.10.0-dev", path = "../finality-grandpa" }
-sc-rpc-api = { version = "0.10.0-dev", path = "../rpc-api" }
 serde_json = "1.0.74"
 serde = { version = "1.0.136", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
diff --git a/client/sync-state-rpc/src/lib.rs b/client/sync-state-rpc/src/lib.rs
index f416b3a0e8f73..6fc0d17800fed 100644
--- a/client/sync-state-rpc/src/lib.rs
+++ b/client/sync-state-rpc/src/lib.rs
@@ -134,7 +134,6 @@ pub struct SyncStateRpcHandler<Block: BlockT, Backend> {
 	client: Arc<Backend>,
 	shared_authority_set: SharedAuthoritySet<Block>,
 	shared_epoch_changes: SharedEpochChanges<Block>,
-	deny_unsafe: sc_rpc_api::DenyUnsafe,
 }
 
 impl<Block, Backend> SyncStateRpcHandler<Block, Backend>
@@ -148,12 +147,11 @@ where
 		client: Arc<Backend>,
 		shared_authority_set: SharedAuthoritySet<Block>,
 		shared_epoch_changes: SharedEpochChanges<Block>,
-		deny_unsafe: sc_rpc_api::DenyUnsafe,
 	) -> Result<Self, Error<Block>> {
 		if sc_chain_spec::get_extension::<LightSyncStateExtension>(chain_spec.extensions())
 			.is_some()
 		{
-			Ok(Self { chain_spec, client, shared_authority_set, shared_epoch_changes, deny_unsafe })
+			Ok(Self { chain_spec, client, shared_authority_set, shared_epoch_changes })
 		} else {
 			Err(Error::<Block>::LightSyncStateExtensionNotFound)
 		}
@@ -185,10 +183,6 @@ where
 	Backend: HeaderBackend<Block> + sc_client_api::AuxStore + 'static,
 {
 	fn system_gen_sync_spec(&self, raw: bool) -> jsonrpc_core::Result<jsonrpc_core::Value> {
-		if let Err(err) = self.deny_unsafe.check_if_safe() {
-			return Err(err.into())
-		}
-
 		let mut chain_spec = self.chain_spec.cloned_box();
 
 		let sync_state = self.build_sync_state().map_err(map_error::<Block, Error<Block>>)?;