[all resource export] cargo fmt

Author: welbon

cmd/resource-code-exporter/src/export.rs

@@ -112,7 +112,6 @@ mod test {
             // println!("Record: {:?}", record);
             has_data = true;
         }
-
         assert!(has_data, "CSV should contain exported data");
         Ok(())
     }

cmd/resource-code-exporter/src/import.rs

@@ -8,7 +8,7 @@ use starcoin_types::{
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-pub fn import_from_db_path(db_path: &PathBuf, csv_path: &PathBuf) -> anyhow::Result<()> {
+pub fn import(csv_path: &PathBuf, db_path: &PathBuf) -> anyhow::Result<()> {
     let db_storage = DBStorage::open_with_cfs(
         &db_path,
         StorageVersion::current_version()
@@ -21,11 +21,11 @@ pub fn import_from_db_path(db_path: &PathBuf, csv_path: &PathBuf) -> anyhow::Res
     let storage = Storage::new(StorageInstance::new_db_instance(db_storage))?;
     let storage = Arc::new(storage);
     let statedb = ChainStateDB::new(storage.clone(), None);
-    import(&statedb, csv_path)
+    import_from_statedb(&statedb, csv_path)
 }
 
 /// Import resources and code from CSV file to a new statedb
-pub fn import(statedb: &ChainStateDB, csv_path: &Path) -> anyhow::Result<()> {
+pub fn import_from_statedb(statedb: &ChainStateDB, csv_path: &Path) -> anyhow::Result<()> {
     // Read CSV file
     let mut csv_reader = csv::Reader::from_path(csv_path)?;
     let mut expected_state_root = None;

cmd/resource-code-exporter/src/main.rs

@@ -6,12 +6,12 @@ mod import;
 
 use clap::{Parser, Subcommand};
 use std::path::PathBuf;
-use starcoin_storage::{db_storage::DBStorage, storage::StorageInstance, Storage, StorageVersion};
-use starcoin_statedb::ChainStateDB;
-use std::sync::Arc;
 
 #[derive(Parser)]
-#[clap(name = "resource-code-exporter", about = "Export and import state data")]
+#[clap(
+    name = "resource-code-exporter",
+    about = "Export and import state data"
+)]
 struct Cli {
     #[clap(subcommand)]
     command: Commands,
@@ -24,7 +24,7 @@ enum Commands {
         #[clap(long, short = 'o', parse(from_os_str))]
         /// Output file path, e.g. accounts.csv
         output: PathBuf,
-        
+
         #[clap(long, short = 'i', parse(from_os_str))]
         /// Starcoin node db path, e.g. ~/.starcoin/barnard/starcoindb/db/starcoindb
         db_path: PathBuf,
@@ -37,9 +37,9 @@ enum Commands {
     Import {
         #[clap(long, short = 'i', parse(from_os_str))]
         /// Input CSV file path
-        input: PathBuf,
-        
-        #[clap(long, short = 'o', parse(from_os_str))]
+        csv_input: PathBuf,
+
+        #[clap(long, short = 'd', parse(from_os_str))]
         /// Output database path
         db_path: PathBuf,
     },
@@ -54,29 +54,10 @@ fn main() -> anyhow::Result<()> {
             db_path,
             block_id,
         } => {
-            export::export(
-                db_path.display().to_string().as_str(),
-                &output,
-                block_id,
-            )?;
+            export::export(db_path.display().to_string().as_str(), &output, block_id)?;
         }
-        Commands::Import { input, db_path } => {
-            // Create new statedb for import
-            let db_storage = DBStorage::open_with_cfs(
-                &db_path,
-                StorageVersion::current_version()
-                    .get_column_family_names()
-                    .to_vec(),
-                false,
-                Default::default(),
-                None,
-            )?;
-            let storage = Storage::new(StorageInstance::new_db_instance(db_storage))?;
-            let storage = Arc::new(storage);
-            let statedb = ChainStateDB::new(storage.clone(), None);
-            
-            // Import data
-            import::import(&statedb, &input)?;
+        Commands::Import { csv_input, db_path } => {
+            import::import(&csv_input, &db_path)?;
         }
     }