fix: Rearrange pallets in runtime construction macro (#60)

* fix: Rearrange pallets in runtime construction macro * chore: Remove unused imports * style: Reformat
NoirHQ · Dec 1, 2023 · ff2df54 · ff2df54
1 parent a553427
commit ff2df54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/node/src/eth.rs b/node/src/eth.rs
@@ -18,7 +18,6 @@
 
 use crate::client::{FullBackend, FullClient};
 pub use fc_consensus::FrontierBlockImport;
-pub use fc_db::kv::frontier_database_dir;
 use fc_rpc::{EthTask, OverrideHandle};
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 use futures::{future, prelude::*};

diff --git a/node/src/rpc/eth.rs b/node/src/rpc/eth.rs
@@ -16,10 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-pub use fc_rpc::{
-	EthBlockDataCacheTask, EthConfig, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,
-	SchemaV2Override, SchemaV3Override, StorageOverride,
-};
+pub use fc_rpc::{EthBlockDataCacheTask, EthConfig, OverrideHandle};
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 pub use fc_storage::overrides_handle;
 use fp_rpc::{ConvertTransaction, ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi};

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -653,20 +653,20 @@ impl pallet_cosmos::Config for Runtime {
 // TODO: rearrange pallets
 construct_runtime!(
 	pub struct Runtime {
-		Alias: pallet_alias,
+		System: frame_system,
+		Timestamp: pallet_timestamp,
 		Aura: pallet_aura,
+		Grandpa: pallet_grandpa,
 		Balances: pallet_balances,
-		BaseFee: pallet_base_fee,
-		Cosmos: pallet_cosmos,
-		DynamicFee: pallet_dynamic_fee,
+		TransactionPayment: pallet_transaction_payment,
+		Sudo: pallet_sudo,
+		Alias: pallet_alias,
 		Ethereum: pallet_ethereum,
 		EVM: pallet_evm,
 		EVMChainId: pallet_evm_chain_id,
-		Grandpa: pallet_grandpa,
-		Sudo: pallet_sudo,
-		System: frame_system,
-		Timestamp: pallet_timestamp,
-		TransactionPayment: pallet_transaction_payment,
+		Cosmos: pallet_cosmos,
+		DynamicFee: pallet_dynamic_fee,
+		BaseFee: pallet_base_fee,
 	}
 );