From 211488c68c0da2b0d9b38990970e29dbda8ac759 Mon Sep 17 00:00:00 2001 From: jolestar Date: Wed, 24 Mar 2021 13:54:00 +0800 Subject: [PATCH] [cleanup] move account/lib to account --- Cargo.lock | 31 ++++++++++++------------ Cargo.toml | 4 +-- account/Cargo.toml | 28 +++++++++++++++++++++ account/lib/Cargo.toml | 28 --------------------- account/service/Cargo.toml | 4 +-- account/service/src/account_events.rs | 2 +- account/service/src/lib.rs | 2 +- account/service/src/service.rs | 2 +- account/{lib => }/src/account.rs | 0 account/{lib => }/src/account_manager.rs | 0 account/{lib => }/src/account_storage.rs | 0 account/{lib => }/src/account_test.rs | 0 account/{lib => }/src/lib.rs | 0 cmd/generator/Cargo.toml | 2 +- cmd/generator/src/lib.rs | 4 +-- genesis/tests/generated_files.rs | 2 +- 16 files changed, 53 insertions(+), 56 deletions(-) create mode 100644 account/Cargo.toml delete mode 100644 account/lib/Cargo.toml rename account/{lib => }/src/account.rs (100%) rename account/{lib => }/src/account_manager.rs (100%) rename account/{lib => }/src/account_storage.rs (100%) rename account/{lib => }/src/account_test.rs (100%) rename account/{lib => }/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 91d999ba16..bf1ddb7bd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6930,44 +6930,44 @@ dependencies = [ ] [[package]] -name = "starcoin-account-api" +name = "starcoin-account" version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", + "bcs-ext", "futures 0.3.12", "hex", + "parking_lot 0.11.1", "rand 0.8.3", "rand_core 0.6.2", "serde", - "serde_bytes", + "starcoin-account-api", + "starcoin-config", "starcoin-crypto", - "starcoin-service-registry", + "starcoin-decrypt", + "starcoin-logger", + "starcoin-storage", "starcoin-types", - "thiserror", + "tempfile", ] [[package]] -name = "starcoin-account-lib" +name = "starcoin-account-api" version = "1.0.0-alpha.1" dependencies = [ "anyhow", "async-trait", - "bcs-ext", "futures 0.3.12", "hex", - "parking_lot 0.11.1", "rand 0.8.3", "rand_core 0.6.2", "serde", - "starcoin-account-api", - "starcoin-config", + "serde_bytes", "starcoin-crypto", - "starcoin-decrypt", - "starcoin-logger", - "starcoin-storage", + "starcoin-service-registry", "starcoin-types", - "tempfile", + "thiserror", ] [[package]] @@ -6978,8 +6978,8 @@ dependencies = [ "async-trait", "bcs-ext", "futures 0.3.12", + "starcoin-account", "starcoin-account-api", - "starcoin-account-lib", "starcoin-chain-notify", "starcoin-config", "starcoin-crypto", @@ -6988,7 +6988,6 @@ dependencies = [ "starcoin-types", "stest", "tempfile", - "tokio 0.2.25", ] [[package]] @@ -7464,8 +7463,8 @@ dependencies = [ "scmd", "serde", "serde_json", + "starcoin-account", "starcoin-account-api", - "starcoin-account-lib", "starcoin-chain", "starcoin-chain-mock", "starcoin-config", diff --git a/Cargo.toml b/Cargo.toml index e35fcd2d64..47a5dcdc61 100644 --- 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 new file mode 100644 index 0000000000..47bb219909 --- /dev/null +++ b/account/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "starcoin-account" +version = "1.0.0-alpha.1" +authors = ["Starcoin Core Dev "] +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 deleted file mode 100644 index 280e31ea9e..0000000000 --- a/account/lib/Cargo.toml +++ /dev/null @@ -1,28 +0,0 @@ -[package] -name = "starcoin-account-lib" -version = "1.0.0-alpha.1" -authors = ["Starcoin Core Dev "] -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",package = "starcoin-account-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/service/Cargo.toml b/account/service/Cargo.toml index 206347c74b..7b03e9228d 100644 --- 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 index a9fd6334ed..6f05b33c70 100644 --- 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 index f52f11181e..0db592ce93 100644 --- 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 index 3dd388b09d..4d10fd51de 100644 --- 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 b/account/src/account.rs similarity index 100% rename from account/lib/src/account.rs rename to account/src/account.rs diff --git a/account/lib/src/account_manager.rs b/account/src/account_manager.rs similarity index 100% rename from account/lib/src/account_manager.rs rename to account/src/account_manager.rs diff --git a/account/lib/src/account_storage.rs b/account/src/account_storage.rs similarity index 100% rename from account/lib/src/account_storage.rs rename to account/src/account_storage.rs diff --git a/account/lib/src/account_test.rs b/account/src/account_test.rs similarity index 100% rename from account/lib/src/account_test.rs rename to account/src/account_test.rs diff --git a/account/lib/src/lib.rs b/account/src/lib.rs similarity index 100% rename from account/lib/src/lib.rs rename to account/src/lib.rs diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml index 05136fe64a..7fe3422cc0 100644 --- 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 index 5a3ce549ee..0baa46d450 100644 --- 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 index e128ae72ef..627662950f 100644 --- 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")