[cleanup] move account/lib to account

starcoinorg · Mar 24, 2021 · 211488c · 211488c
1 parent fcef2c4
commit 211488c
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,7 +60,7 @@ members = [
     "network-rpc/core",
     "network-rpc/api",
     "account/api",
-    "account/lib",
+    "account",
     "account/service",
     "rpc/api",
     "rpc/middleware",
@@ -149,7 +149,7 @@ default-members = [
     "network-rpc/core",
     "network-rpc/api",
     "account/api",
-    "account/lib",
+    "account",
     "account/service",
     "rpc/api",
     "rpc/middleware",

diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "starcoin-account"
+version = "1.0.0-alpha.1"
+authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0.39"
+futures = "0.3.12"
+async-trait = "0.1"
+rand = "0.8.3"
+parking_lot = "0.11"
+serde = "1.0.125"
+rand_core = { version = "0.6.2", default-features = false }
+starcoin-account-api = {path = "./api"}
+bcs-ext ={package= "bcs-ext", path = "../commons/bcs_ext" }
+starcoin-types = { path = "../types"}
+starcoin-config = { path = "../config"}
+starcoin-crypto = { path = "../commons/crypto"}
+starcoin-decrypt = {path = "../commons/decrypt"}
+starcoin-storage = {path = "../storage"}
+starcoin-logger = {path = "../commons/logger"}
+
+[dev-dependencies]
+hex= "0.4.3"
+tempfile="3"
diff --git a/account/lib/Cargo.toml b/account/lib/Cargo.toml
diff --git a/account/service/Cargo.toml b/account/service/Cargo.toml
@@ -16,14 +16,12 @@ bcs-ext = { package = "bcs-ext", path = "../../commons/bcs_ext" }
 starcoin-config = { path = "../../config" }
 starcoin-service-registry = { path = "../../commons/service-registry" }
 starcoin-account-api = { path = "../api", features = ["mock"] }
-starcoin-account-lib = { path = "../lib" }
+starcoin-account = { path = "../" }
 starcoin-crypto = { path = "../../commons/crypto" }
 starcoin-chain-notify = { path = "../../chain/chain-notify" }
 
 
 [dev-dependencies]
 stest = { path = "../../commons/stest" }
-starcoin-types = { path = "../../types" }
 tempfile = "3"
-tokio = { version = "0.2", features = ["full"] }
 
diff --git a/account/service/src/account_events.rs b/account/service/src/account_events.rs
@@ -1,5 +1,5 @@
 use anyhow::{Error, Result};
-use starcoin_account_lib::account_storage::AccountStorage;
+use starcoin_account::account_storage::AccountStorage;
 use starcoin_chain_notify::message::ContractEventNotification;
 use starcoin_logger::prelude::*;
 use starcoin_service_registry::{ActorService, EventHandler, ServiceContext, ServiceFactory};

diff --git a/account/service/src/lib.rs b/account/service/src/lib.rs
@@ -6,4 +6,4 @@ mod service;
 
 pub use account_events::AccountEventService;
 pub use service::AccountService;
-pub use starcoin_account_lib::account_storage::AccountStorage;
+pub use starcoin_account::account_storage::AccountStorage;
diff --git a/account/service/src/service.rs b/account/service/src/service.rs
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Result;
+use starcoin_account::{account_storage::AccountStorage, AccountManager};
 use starcoin_account_api::message::{AccountRequest, AccountResponse};
-use starcoin_account_lib::{account_storage::AccountStorage, AccountManager};
 use starcoin_config::NodeConfig;
 use starcoin_crypto::ValidCryptoMaterial;
 use starcoin_logger::prelude::*;

diff --git a/account/lib/src/account.rs → account/src/account.rs b/account/lib/src/account.rs → account/src/account.rs
diff --git a/account/lib/src/account_manager.rs → account/src/account_manager.rs b/account/lib/src/account_manager.rs → account/src/account_manager.rs
diff --git a/account/lib/src/account_storage.rs → account/src/account_storage.rs b/account/lib/src/account_storage.rs → account/src/account_storage.rs
diff --git a/account/lib/src/account_test.rs → account/src/account_test.rs b/account/lib/src/account_test.rs → account/src/account_test.rs
diff --git a/account/lib/src/lib.rs → account/src/lib.rs b/account/lib/src/lib.rs → account/src/lib.rs
diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml
@@ -22,7 +22,7 @@ starcoin-crypto = { path = "../../commons/crypto" }
 starcoin-storage = { path = "../../storage" }
 starcoin-genesis = { path = "../../genesis" }
 starcoin-account-api = { path = "../../account/api" }
-starcoin-account-lib = { path = "../../account/lib" }
+starcoin-account = { path = "../../account" }
 starcoin-chain = { path = "../../chain" }
 starcoin-chain-mock = { path = "../../chain/mock" }
 

diff --git a/cmd/generator/src/lib.rs b/cmd/generator/src/lib.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::{bail, Result};
+use starcoin_account::account_storage::AccountStorage;
+use starcoin_account::AccountManager;
 use starcoin_account_api::AccountInfo;
-use starcoin_account_lib::account_storage::AccountStorage;
-use starcoin_account_lib::AccountManager;
 use starcoin_config::{NodeConfig, StarcoinOpt};
 use starcoin_genesis::Genesis;
 use starcoin_storage::cache_storage::CacheStorage;

diff --git a/genesis/tests/generated_files.rs b/genesis/tests/generated_files.rs
@@ -28,7 +28,7 @@ fn test_that_generated_file_are_up_to_date_in_git() {
     assert_that_version_control_has_no_unstaged_changes();
 
     assert!(Command::new("cargo")
-        .current_dir("../..")
+        .current_dir("../")
         .arg("run")
         .arg("-p")
         .arg("starcoin-genesis")