lunar-mining 4 лет назад
Родитель
Сommit
fad4e7aa65

+ 1 - 1
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"]
 

+ 1 - 1
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"

+ 1 - 1
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},

+ 1 - 1
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"

+ 1 - 1
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},

+ 1 - 1
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"

+ 1 - 1
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},

+ 0 - 0
src/blockchain/mod.rs → src/chain/mod.rs


+ 0 - 0
src/blockchain/rocks.rs → src/chain/rocks.rs


+ 0 - 0
src/blockchain/slab.rs → src/chain/slab.rs


+ 0 - 0
src/blockchain/slabstore.rs → src/chain/slabstore.rs


+ 2 - 2
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;
 

+ 1 - 1
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},

+ 1 - 1
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,
 };

+ 1 - 1
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},

+ 1 - 1
src/util/error.rs

@@ -171,7 +171,7 @@ impl From<zeromq::ZmqError> for Error {
     }
 }
 
-#[cfg(feature = "blockchain")]
+#[cfg(feature = "chain")]
 impl From<rocksdb::Error> for Error {
     fn from(err: rocksdb::Error) -> Error {
         Error::RocksdbError(err.to_string())