From c5d21b7502f22b4322b70a7190c510767d3cc3a4 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Thu, 30 Nov 2023 07:00:54 +0000 Subject: [PATCH] chore: remove standalone folder (#323) Co-authored-by: drewstone --- Cargo.toml | 12 ++++++------ {standalone/node => node}/Cargo.toml | 0 {standalone/node => node}/build.rs | 0 {standalone/node => node}/src/benchmarking.rs | 0 {standalone/node => node}/src/chain_spec.rs | 0 {standalone/node => node}/src/cli.rs | 0 {standalone/node => node}/src/command.rs | 2 +- .../distributions/data/discord_evm_addresses.json | 0 .../data/edgeware_genesis_participants.json | 0 .../data/edgeware_snapshot_distribution.json | 0 .../data/edgeware_snapshot_participants.json | 0 .../node => node}/src/distributions/develop.rs | 0 .../node => node}/src/distributions/mainnet.rs | 0 {standalone/node => node}/src/distributions/mod.rs | 0 .../node => node}/src/distributions/testnet.rs | 0 {standalone/node => node}/src/eth.rs | 0 {standalone/node => node}/src/lib.rs | 0 {standalone/node => node}/src/main.rs | 0 {standalone/node => node}/src/mainnet_fixtures.rs | 0 {standalone/node => node}/src/rpc/eth.rs | 0 {standalone/node => node}/src/rpc/mod.rs | 0 {standalone/node => node}/src/rpc/tracing.rs | 0 {standalone/node => node}/src/service.rs | 0 {standalone/node => node}/src/signer_cli.rs | 0 {standalone/node => node}/src/testnet_fixtures.rs | 0 {standalone/node => node}/src/utils.rs | 0 {standalone/runtime => runtime}/Cargo.toml | 0 {standalone/runtime => runtime}/build.rs | 0 .../runtime => runtime}/evm_tracer/Cargo.toml | 0 .../runtime => runtime}/evm_tracer/src/lib.rs | 0 {standalone/runtime => runtime}/src/frontier_evm.rs | 0 {standalone/runtime => runtime}/src/impls.rs | 0 {standalone/runtime => runtime}/src/lib.rs | 0 {standalone/runtime => runtime}/src/precompiles.rs | 0 {standalone/runtime => runtime}/src/voter_bags.rs | 0 35 files changed, 7 insertions(+), 7 deletions(-) rename {standalone/node => node}/Cargo.toml (100%) rename {standalone/node => node}/build.rs (100%) rename {standalone/node => node}/src/benchmarking.rs (100%) rename {standalone/node => node}/src/chain_spec.rs (100%) rename {standalone/node => node}/src/cli.rs (100%) rename {standalone/node => node}/src/command.rs (99%) rename {standalone/node => node}/src/distributions/data/discord_evm_addresses.json (100%) rename {standalone/node => node}/src/distributions/data/edgeware_genesis_participants.json (100%) rename {standalone/node => node}/src/distributions/data/edgeware_snapshot_distribution.json (100%) rename {standalone/node => node}/src/distributions/data/edgeware_snapshot_participants.json (100%) rename {standalone/node => node}/src/distributions/develop.rs (100%) rename {standalone/node => node}/src/distributions/mainnet.rs (100%) rename {standalone/node => node}/src/distributions/mod.rs (100%) rename {standalone/node => node}/src/distributions/testnet.rs (100%) rename {standalone/node => node}/src/eth.rs (100%) rename {standalone/node => node}/src/lib.rs (100%) rename {standalone/node => node}/src/main.rs (100%) rename {standalone/node => node}/src/mainnet_fixtures.rs (100%) rename {standalone/node => node}/src/rpc/eth.rs (100%) rename {standalone/node => node}/src/rpc/mod.rs (100%) rename {standalone/node => node}/src/rpc/tracing.rs (100%) rename {standalone/node => node}/src/service.rs (100%) rename {standalone/node => node}/src/signer_cli.rs (100%) rename {standalone/node => node}/src/testnet_fixtures.rs (100%) rename {standalone/node => node}/src/utils.rs (100%) rename {standalone/runtime => runtime}/Cargo.toml (100%) rename {standalone/runtime => runtime}/build.rs (100%) rename {standalone/runtime => runtime}/evm_tracer/Cargo.toml (100%) rename {standalone/runtime => runtime}/evm_tracer/src/lib.rs (100%) rename {standalone/runtime => runtime}/src/frontier_evm.rs (100%) rename {standalone/runtime => runtime}/src/impls.rs (100%) rename {standalone/runtime => runtime}/src/lib.rs (100%) rename {standalone/runtime => runtime}/src/precompiles.rs (100%) rename {standalone/runtime => runtime}/src/voter_bags.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 0b511507d..a53339216 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,11 +15,11 @@ members = [ "client/rpc/*", "client/rpc-core/*", "client/voter", - "standalone/node", - "standalone/runtime", - "standalone/runtime/evm_tracer", + "node", + "runtime", + "runtime/evm_tracer", "pallets/*", - "pallets/roles", + "pallets/roles", "pallets/jobs/rpc", "pallets/jobs/rpc/runtime-api", "precompiles/utils", @@ -80,7 +80,7 @@ dkg-primitives = { git = "https://github.com/webb-tools/dkg-substrate.git", tag webb-relayer-gadget = { git = "https://github.com/webb-tools/dkg-substrate.git", tag = "v0.4.7" } webb-relayer-gadget-cli = { git = "https://github.com/webb-tools/dkg-substrate.git", tag = "v0.4.7" } -tangle-runtime = { package = "tangle-standalone-runtime", path = "standalone/runtime" } +tangle-runtime = { package = "tangle-standalone-runtime", path = "runtime" } # Tangle Dependencies pallet-ecdsa-claims = { path = "pallets/claims", default-features = false } @@ -307,7 +307,7 @@ rpc-core-types = { path = "client/rpc-core/types" } rpc-debug = { path = "client/rpc/debug" } rpc-trace = { path = "client/rpc/trace" } rpc-txpool = { path = "client/rpc/txpool" } -evm-tracer = { path = "standalone/runtime/evm_tracer", default-features = false } +evm-tracer = { path = "runtime/evm_tracer", default-features = false } [profile.release] panic = "unwind" diff --git a/standalone/node/Cargo.toml b/node/Cargo.toml similarity index 100% rename from standalone/node/Cargo.toml rename to node/Cargo.toml diff --git a/standalone/node/build.rs b/node/build.rs similarity index 100% rename from standalone/node/build.rs rename to node/build.rs diff --git a/standalone/node/src/benchmarking.rs b/node/src/benchmarking.rs similarity index 100% rename from standalone/node/src/benchmarking.rs rename to node/src/benchmarking.rs diff --git a/standalone/node/src/chain_spec.rs b/node/src/chain_spec.rs similarity index 100% rename from standalone/node/src/chain_spec.rs rename to node/src/chain_spec.rs diff --git a/standalone/node/src/cli.rs b/node/src/cli.rs similarity index 100% rename from standalone/node/src/cli.rs rename to node/src/cli.rs diff --git a/standalone/node/src/command.rs b/node/src/command.rs similarity index 99% rename from standalone/node/src/command.rs rename to node/src/command.rs index 1c698c040..5317bf64b 100644 --- a/standalone/node/src/command.rs +++ b/node/src/command.rs @@ -57,7 +57,7 @@ impl SubstrateCli for Cli { // generates the spec for mainnet "mainnet" => Box::new(chain_spec::tangle_mainnet_config(4006)?), "tangle-testnet" => Box::new(chain_spec::ChainSpec::from_json_bytes( - &include_bytes!("../../../chainspecs/testnet/tangle-standalone.json")[..], + &include_bytes!("../../chainspecs/testnet/tangle-standalone.json")[..], )?), path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?), diff --git a/standalone/node/src/distributions/data/discord_evm_addresses.json b/node/src/distributions/data/discord_evm_addresses.json similarity index 100% rename from standalone/node/src/distributions/data/discord_evm_addresses.json rename to node/src/distributions/data/discord_evm_addresses.json diff --git a/standalone/node/src/distributions/data/edgeware_genesis_participants.json b/node/src/distributions/data/edgeware_genesis_participants.json similarity index 100% rename from standalone/node/src/distributions/data/edgeware_genesis_participants.json rename to node/src/distributions/data/edgeware_genesis_participants.json diff --git a/standalone/node/src/distributions/data/edgeware_snapshot_distribution.json b/node/src/distributions/data/edgeware_snapshot_distribution.json similarity index 100% rename from standalone/node/src/distributions/data/edgeware_snapshot_distribution.json rename to node/src/distributions/data/edgeware_snapshot_distribution.json diff --git a/standalone/node/src/distributions/data/edgeware_snapshot_participants.json b/node/src/distributions/data/edgeware_snapshot_participants.json similarity index 100% rename from standalone/node/src/distributions/data/edgeware_snapshot_participants.json rename to node/src/distributions/data/edgeware_snapshot_participants.json diff --git a/standalone/node/src/distributions/develop.rs b/node/src/distributions/develop.rs similarity index 100% rename from standalone/node/src/distributions/develop.rs rename to node/src/distributions/develop.rs diff --git a/standalone/node/src/distributions/mainnet.rs b/node/src/distributions/mainnet.rs similarity index 100% rename from standalone/node/src/distributions/mainnet.rs rename to node/src/distributions/mainnet.rs diff --git a/standalone/node/src/distributions/mod.rs b/node/src/distributions/mod.rs similarity index 100% rename from standalone/node/src/distributions/mod.rs rename to node/src/distributions/mod.rs diff --git a/standalone/node/src/distributions/testnet.rs b/node/src/distributions/testnet.rs similarity index 100% rename from standalone/node/src/distributions/testnet.rs rename to node/src/distributions/testnet.rs diff --git a/standalone/node/src/eth.rs b/node/src/eth.rs similarity index 100% rename from standalone/node/src/eth.rs rename to node/src/eth.rs diff --git a/standalone/node/src/lib.rs b/node/src/lib.rs similarity index 100% rename from standalone/node/src/lib.rs rename to node/src/lib.rs diff --git a/standalone/node/src/main.rs b/node/src/main.rs similarity index 100% rename from standalone/node/src/main.rs rename to node/src/main.rs diff --git a/standalone/node/src/mainnet_fixtures.rs b/node/src/mainnet_fixtures.rs similarity index 100% rename from standalone/node/src/mainnet_fixtures.rs rename to node/src/mainnet_fixtures.rs diff --git a/standalone/node/src/rpc/eth.rs b/node/src/rpc/eth.rs similarity index 100% rename from standalone/node/src/rpc/eth.rs rename to node/src/rpc/eth.rs diff --git a/standalone/node/src/rpc/mod.rs b/node/src/rpc/mod.rs similarity index 100% rename from standalone/node/src/rpc/mod.rs rename to node/src/rpc/mod.rs diff --git a/standalone/node/src/rpc/tracing.rs b/node/src/rpc/tracing.rs similarity index 100% rename from standalone/node/src/rpc/tracing.rs rename to node/src/rpc/tracing.rs diff --git a/standalone/node/src/service.rs b/node/src/service.rs similarity index 100% rename from standalone/node/src/service.rs rename to node/src/service.rs diff --git a/standalone/node/src/signer_cli.rs b/node/src/signer_cli.rs similarity index 100% rename from standalone/node/src/signer_cli.rs rename to node/src/signer_cli.rs diff --git a/standalone/node/src/testnet_fixtures.rs b/node/src/testnet_fixtures.rs similarity index 100% rename from standalone/node/src/testnet_fixtures.rs rename to node/src/testnet_fixtures.rs diff --git a/standalone/node/src/utils.rs b/node/src/utils.rs similarity index 100% rename from standalone/node/src/utils.rs rename to node/src/utils.rs diff --git a/standalone/runtime/Cargo.toml b/runtime/Cargo.toml similarity index 100% rename from standalone/runtime/Cargo.toml rename to runtime/Cargo.toml diff --git a/standalone/runtime/build.rs b/runtime/build.rs similarity index 100% rename from standalone/runtime/build.rs rename to runtime/build.rs diff --git a/standalone/runtime/evm_tracer/Cargo.toml b/runtime/evm_tracer/Cargo.toml similarity index 100% rename from standalone/runtime/evm_tracer/Cargo.toml rename to runtime/evm_tracer/Cargo.toml diff --git a/standalone/runtime/evm_tracer/src/lib.rs b/runtime/evm_tracer/src/lib.rs similarity index 100% rename from standalone/runtime/evm_tracer/src/lib.rs rename to runtime/evm_tracer/src/lib.rs diff --git a/standalone/runtime/src/frontier_evm.rs b/runtime/src/frontier_evm.rs similarity index 100% rename from standalone/runtime/src/frontier_evm.rs rename to runtime/src/frontier_evm.rs diff --git a/standalone/runtime/src/impls.rs b/runtime/src/impls.rs similarity index 100% rename from standalone/runtime/src/impls.rs rename to runtime/src/impls.rs diff --git a/standalone/runtime/src/lib.rs b/runtime/src/lib.rs similarity index 100% rename from standalone/runtime/src/lib.rs rename to runtime/src/lib.rs diff --git a/standalone/runtime/src/precompiles.rs b/runtime/src/precompiles.rs similarity index 100% rename from standalone/runtime/src/precompiles.rs rename to runtime/src/precompiles.rs diff --git a/standalone/runtime/src/voter_bags.rs b/runtime/src/voter_bags.rs similarity index 100% rename from standalone/runtime/src/voter_bags.rs rename to runtime/src/voter_bags.rs