From fad4e7aa652230428740371cedddd28168927ec3 Mon Sep 17 00:00:00 2001 From: lunar-mining Date: Sun, 9 Jan 2022 14:19:15 +0100 Subject: [PATCH] renamed /blockchain to /chain --- Cargo.toml | 2 +- bin/cashier/Cargo.toml | 2 +- bin/cashier/src/main.rs | 2 +- bin/darkfid/Cargo.toml | 2 +- bin/darkfid/src/main.rs | 2 +- bin/gateway/Cargo.toml | 2 +- bin/gateway/src/main.rs | 2 +- src/{blockchain => chain}/mod.rs | 0 src/{blockchain => chain}/rocks.rs | 0 src/{blockchain => chain}/slab.rs | 0 src/{blockchain => chain}/slabstore.rs | 0 src/lib.rs | 4 ++-- src/node/client.rs | 2 +- src/node/service/gateway.rs | 2 +- src/node/state.rs | 2 +- src/util/error.rs | 2 +- 16 files changed, 13 insertions(+), 13 deletions(-) rename src/{blockchain => chain}/mod.rs (100%) rename src/{blockchain => chain}/rocks.rs (100%) rename src/{blockchain => chain}/slab.rs (100%) rename src/{blockchain => chain}/slabstore.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index f33183436..880d371ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ zeromq = {version = "0.3.1", default-features = false, features = ["async-std-ru signal-hook-async-std = {version = "0.2.1", optional = true} [features] -blockchain = ["rocksdb"] +chain = ["rocksdb"] node = ["sqlx", "libsqlite3-sys", "zeromq", "signal-hook-async-std"] tui = ["termion", "libc", "crossbeam-channel"] diff --git a/bin/cashier/Cargo.toml b/bin/cashier/Cargo.toml index f83ae1c26..079db89f6 100644 --- a/bin/cashier/Cargo.toml +++ b/bin/cashier/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -darkfi = {path= "../../", features = ["node", "blockchain"]} +darkfi = {path= "../../", features = ["node", "chain"]} # Encoding and parsing serde_json = "1.0.72" diff --git a/bin/cashier/src/main.rs b/bin/cashier/src/main.rs index 605491604..1fd0cd517 100644 --- a/bin/cashier/src/main.rs +++ b/bin/cashier/src/main.rs @@ -11,7 +11,7 @@ use serde_json::{json, Value}; use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode}; use darkfi::{ - blockchain::{rocks::columns, Rocks, RocksColumn}, + chain::{rocks::columns, Rocks, RocksColumn}, cli::{CashierdConfig, CliCashierd, Config}, crypto::{ keypair::{PublicKey, SecretKey}, diff --git a/bin/darkfid/Cargo.toml b/bin/darkfid/Cargo.toml index a00444fff..9bef0534f 100644 --- a/bin/darkfid/Cargo.toml +++ b/bin/darkfid/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -darkfi = {path= "../../", features= ["node", "blockchain"] } +darkfi = {path= "../../", features= ["node", "chain"] } # Encoding and parsing serde_json = "1.0.72" diff --git a/bin/darkfid/src/main.rs b/bin/darkfid/src/main.rs index c83530eb6..d959c044d 100644 --- a/bin/darkfid/src/main.rs +++ b/bin/darkfid/src/main.rs @@ -12,7 +12,7 @@ use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode}; use url::Url; use darkfi::{ - blockchain::{rocks::columns, Rocks, RocksColumn}, + chain::{rocks::columns, Rocks, RocksColumn}, cli::{CliDarkfid, Config, DarkfidConfig}, crypto::{ keypair::{Keypair, PublicKey, SecretKey}, diff --git a/bin/gateway/Cargo.toml b/bin/gateway/Cargo.toml index 2e70b7205..4a8f99340 100644 --- a/bin/gateway/Cargo.toml +++ b/bin/gateway/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -darkfi = {path= "../../", features= ["node", "blockchain"] } +darkfi = {path= "../../", features= ["node", "chain"] } # Async async-std = "1.10.0" diff --git a/bin/gateway/src/main.rs b/bin/gateway/src/main.rs index 322e7f1af..8af574b41 100644 --- a/bin/gateway/src/main.rs +++ b/bin/gateway/src/main.rs @@ -7,7 +7,7 @@ use log::debug; use simplelog::{ColorChoice, LevelFilter, TermLogger, TerminalMode}; use darkfi::{ - blockchain::{rocks::columns, Rocks, RocksColumn}, + chain::{rocks::columns, Rocks, RocksColumn}, cli::{CliGatewayd, Config, GatewaydConfig}, node::service::gateway::GatewayService, util::{expand_path, join_config_path}, diff --git a/src/blockchain/mod.rs b/src/chain/mod.rs similarity index 100% rename from src/blockchain/mod.rs rename to src/chain/mod.rs diff --git a/src/blockchain/rocks.rs b/src/chain/rocks.rs similarity index 100% rename from src/blockchain/rocks.rs rename to src/chain/rocks.rs diff --git a/src/blockchain/slab.rs b/src/chain/slab.rs similarity index 100% rename from src/blockchain/slab.rs rename to src/chain/slab.rs diff --git a/src/blockchain/slabstore.rs b/src/chain/slabstore.rs similarity index 100% rename from src/blockchain/slabstore.rs rename to src/chain/slabstore.rs diff --git a/src/lib.rs b/src/lib.rs index 5b104a596..b7e68349f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,8 +16,8 @@ pub mod tx; #[cfg(feature = "tui")] pub mod tui; -#[cfg(feature = "blockchain")] -pub mod blockchain; +#[cfg(feature = "chain")] +pub mod chain; pub mod util; diff --git a/src/node/client.rs b/src/node/client.rs index 6734e402f..ac31ea27e 100644 --- a/src/node/client.rs +++ b/src/node/client.rs @@ -6,7 +6,7 @@ use smol::Executor; use url::Url; use crate::{ - blockchain::{rocks::columns, Rocks, RocksColumn, Slab}, + chain::{rocks::columns, Rocks, RocksColumn, Slab}, crypto::{ coin::Coin, keypair::{Keypair, PublicKey, SecretKey}, diff --git a/src/node/service/gateway.rs b/src/node/service/gateway.rs index 240450e87..43ae4fa85 100644 --- a/src/node/service/gateway.rs +++ b/src/node/service/gateway.rs @@ -10,7 +10,7 @@ use url::Url; use super::reqrep::{PeerId, Publisher, RepProtocol, Reply, ReqProtocol, Request, Subscriber}; use crate::{ - blockchain::{rocks::columns, RocksColumn, Slab, SlabStore}, + chain::{rocks::columns, RocksColumn, Slab, SlabStore}, serial::{deserialize, serialize}, Error, Result, }; diff --git a/src/node/state.rs b/src/node/state.rs index ea6a402c5..b052fa123 100644 --- a/src/node/state.rs +++ b/src/node/state.rs @@ -2,7 +2,7 @@ use incrementalmerkletree::{bridgetree::BridgeTree, Frontier, Tree}; use log::{debug, error}; use crate::{ - blockchain::{rocks::columns, RocksColumn}, + chain::{rocks::columns, RocksColumn}, crypto::{ coin::Coin, keypair::{PublicKey, SecretKey}, diff --git a/src/util/error.rs b/src/util/error.rs index a739608d3..bb140291b 100644 --- a/src/util/error.rs +++ b/src/util/error.rs @@ -171,7 +171,7 @@ impl From for Error { } } -#[cfg(feature = "blockchain")] +#[cfg(feature = "chain")] impl From for Error { fn from(err: rocksdb::Error) -> Error { Error::RocksdbError(err.to_string())