Cleanup/updates.

standardweb3 · Dec 13, 2021 · 084a905 · 084a905
1 parent 03f5276
commit 084a905
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 428 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/opportunity/Cargo.toml b/node/opportunity/Cargo.toml
@@ -15,45 +15,16 @@ name = 'opportunity-standalone'
 [package.metadata.docs.rs]
 targets = [ 'x86_64-unknown-linux-gnu' ]
 
-[lib]
-crate-type = ["cdylib", "rlib"]
-
 [build-dependencies]
 substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
 
 [features]
-default = [ ]
-# default = [ "cli", "full-node" ]
-
-# browser = [
-# 	"substrate-browser-utils",
-# 	"wasm-bindgen",
-# 	"wasm-bindgen-futures",
-# 	"libp2p-wasm-ext",
-# ]
-
-# cli = [
-# 	"node-inspect",
-# 	"sc-cli",
-# 	"frame-benchmarking-cli",
-# 	"substrate-frame-cli",
-# 	"sc-service/db",
-# 	"structopt",
-# 	"substrate-build-script-utils",
-# 	"try-runtime-cli",
-# ]
+default = []
 
 runtime-benchmarks = [
 	"opportunity-runtime/runtime-benchmarks",
 ]
 
-# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
-# in the near future.
-# try-runtime = [
-# 	"opportunity-runtime/try-runtime",
-# 	"try-runtime-cli",
-# ]
-
 [dependencies]
 structopt = { version = "0.3.8" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }

diff --git a/node/opportunity/src/command.rs b/node/opportunity/src/command.rs
@@ -21,7 +21,7 @@ use crate::{
 	service,
 };
 use primitives::Block;
-use sc_cli::{ChainSpec, Role, RuntimeVersion, SubstrateCli};
+use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
 use sc_service::PartialComponents;
 
 impl SubstrateCli for Cli {
@@ -70,16 +70,6 @@ pub fn run() -> sc_cli::Result<()> {
 	let cli = Cli::from_args();
 
 	match &cli.subcommand {
-		None => {
-			let runner = cli.create_runner(&cli.run)?;
-			runner.run_node_until_exit(|config| async move {
-				match config.role {
-					Role::Light => service::new_light(config),
-					_ => service::new_full(config),
-				}
-				.map_err(sc_cli::Error::Service)
-			})
-		},
 		Some(Subcommand::Key(cmd)) => cmd.run(&cli),
 		Some(Subcommand::Sign(cmd)) => cmd.run(),
 		Some(Subcommand::Verify(cmd)) => cmd.run(),
@@ -140,5 +130,11 @@ pub fn run() -> sc_cli::Result<()> {
 				You can enable it with `--features runtime-benchmarks`."
 					.into())
 			},
+		None => {
+			let runner = cli.create_runner(&cli.run)?;
+			runner.run_node_until_exit(|config| async move {
+				service::new_full(config).map_err(sc_cli::Error::Service)
+			})
+		},
 	}
 }
diff --git a/node/opportunity/src/lib.rs b/node/opportunity/src/lib.rs
diff --git a/node/opportunity/src/rpc.rs b/node/opportunity/src/rpc.rs
@@ -52,18 +52,6 @@ use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
 use sp_keystore::SyncCryptoStorePtr;
 
-/// Light client extra dependencies.
-pub struct LightDeps<C, F, P> {
-	/// The client instance to use.
-	pub client: Arc<C>,
-	/// Transaction pool instance.
-	pub pool: Arc<P>,
-	/// Remote access to the blockchain (async).
-	pub remote_blockchain: Arc<dyn sc_client_api::light::RemoteBlockchain<Block>>,
-	/// Fetcher instance.
-	pub fetcher: Arc<F>,
-}
-
 /// Extra dependencies for BABE.
 pub struct BabeDeps {
 	/// BABE protocol config.
@@ -180,26 +168,3 @@ where
 
 	Ok(io)
 }
-
-/// Instantiate all Light RPC extensions.
-pub fn create_light<C, P, M, F>(deps: LightDeps<C, F, P>) -> jsonrpc_core::IoHandler<M>
-where
-	C: sp_blockchain::HeaderBackend<Block>,
-	C: Send + Sync + 'static,
-	F: sc_client_api::light::Fetcher<Block> + 'static,
-	P: TransactionPool + 'static,
-	M: jsonrpc_core::Metadata + Default,
-{
-	use substrate_frame_rpc_system::{LightSystem, SystemApi};
-
-	let LightDeps { client, pool, remote_blockchain, fetcher } = deps;
-	let mut io = jsonrpc_core::IoHandler::default();
-	io.extend_with(SystemApi::<Hash, AccountId, Index>::to_delegate(LightSystem::new(
-		client,
-		remote_blockchain,
-		fetcher,
-		pool,
-	)));
-
-	io
-}