Pull parity frontier master latest commits

client/cli/src/frontier_db_cmd/mapping_db.rs

@@ -16,15 +16,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use std::sync::Arc;
+
 use ethereum_types::H256;
 use serde::Deserialize;
-use std::sync::Arc;
+// Substrate
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+// Frontier
+use fp_rpc::EthereumRuntimeRPCApi;
 
 use super::{utils::FrontierDbMessage, Column, FrontierDbCmd, Operation};
 
-use fp_rpc::EthereumRuntimeRPCApi;
-use sp_runtime::{generic::BlockId, traits::Block as BlockT};
-
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum MappingValue<H> {

client/cli/src/frontier_db_cmd/meta_db.rs

@@ -16,18 +16,19 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use ethereum_types::H256;
-use serde::Deserialize;
 use std::{
 	collections::HashMap,
 	str::{self, FromStr},
 	sync::Arc,
 };
 
-use super::{utils::FrontierDbMessage, FrontierDbCmd, Operation};
-
+use ethereum_types::H256;
+use serde::Deserialize;
+// Substrate
 use sp_runtime::traits::Block as BlockT;
 
+use super::{utils::FrontierDbMessage, FrontierDbCmd, Operation};
+
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum MetaValue<H> {

client/cli/src/frontier_db_cmd/mod.rs

@@ -21,17 +21,19 @@ mod meta_db;
 mod tests;
 pub(crate) mod utils;
 
-use mapping_db::{MappingDb, MappingKey, MappingValue};
-use meta_db::{MetaDb, MetaKey, MetaValue};
+use std::{path::PathBuf, str::FromStr, sync::Arc};
 
 use clap::ArgEnum;
-use sc_cli::{PruningParams, SharedParams};
+use ethereum_types::H256;
 use serde::Deserialize;
-use std::{path::PathBuf, str::FromStr, sync::Arc};
-
+// Substrate
+use sc_cli::{PruningParams, SharedParams};
 use sp_runtime::traits::Block as BlockT;
 
-use ethereum_types::H256;
+use self::{
+	mapping_db::{MappingDb, MappingKey, MappingValue},
+	meta_db::{MetaDb, MetaKey, MetaValue},
+};
 
 /// Cli tool to interact with the Frontier backend db
 #[derive(Debug, Clone, clap::Parser)]