diff --git a/Cargo.lock b/Cargo.lock index 3571187..f653124 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -676,7 +676,7 @@ dependencies = [ [[package]] name = "duniter-bc-reader" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "anyhow", "dubp", @@ -722,7 +722,7 @@ dependencies = [ [[package]] name = "duniter-conf" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "dubp", "serde", @@ -731,12 +731,11 @@ dependencies = [ [[package]] name = "duniter-core" version = "1.8.1" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "duniter-bc-reader", "duniter-conf", "duniter-dbs", - "duniter-dbs-write-ops", "duniter-global", "duniter-mempools", "duniter-module", @@ -745,7 +744,7 @@ dependencies = [ [[package]] name = "duniter-dbs" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "arrayvec", "bincode", @@ -768,7 +767,7 @@ dependencies = [ [[package]] name = "duniter-dbs-write-ops" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "chrono", "dubp", @@ -783,7 +782,7 @@ dependencies = [ [[package]] name = "duniter-global" version = "1.8.1" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "async-rwlock", "dubp", @@ -834,7 +833,6 @@ dependencies = [ "chrono", "dubp", "duniter-core", - "kv_typed", "parking_lot", "paste", "serde", @@ -902,7 +900,7 @@ dependencies = [ [[package]] name = "duniter-mempools" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "dubp", "duniter-bc-reader", @@ -915,7 +913,7 @@ dependencies = [ [[package]] name = "duniter-module" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "anyhow", "async-trait", @@ -1418,7 +1416,7 @@ dependencies = [ [[package]] name = "kv_typed" version = "0.1.0" -source = "git+https://git.duniter.org/nodes/rust/duniter-core#2b71d3e8f0bd223f84a010e500e2d47a99c0c4eb" +source = "git+https://git.duniter.org/nodes/rust/duniter-core#f9abadd0145d848ba4df2ab545639355c7f20386" dependencies = [ "byteorder", "cfg-if 0.1.10", diff --git a/db/Cargo.toml b/db/Cargo.toml index 5296953..98ffcdf 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -15,7 +15,6 @@ bincode = "1.2.1" chrono = { version = "0.4.15", optional = true } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core" } dubp = { version = "0.51.0", features = ["duniter"] } -kv_typed = { git = "https://git.duniter.org/nodes/rust/duniter-core", default-features = false, features = ["sled_backend"] } parking_lot = "0.11.0" paste = "1.0.2" serde = { version = "1.0.105", features = ["derive"] } @@ -28,5 +27,5 @@ zerocopy = "0.3.0" [features] #default = ["explorer"] -explorer = ["chrono", "duniter-core/explorer", "kv_typed/explorer"] -leveldb_backend = ["kv_typed/leveldb_backend"] +explorer = ["chrono", "duniter-core/explorer"] +leveldb_backend = ["duniter-core/leveldb_backend"] diff --git a/db/src/lib.rs b/db/src/lib.rs index d1113e6..e704870 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -34,12 +34,13 @@ pub use values::wallet_script_array::WalletScriptArrayV2; pub(crate) use dubp::common::prelude::*; pub(crate) use dubp::crypto::hashs::Hash; pub(crate) use dubp::wallet::prelude::*; +pub(crate) use duniter_core::dbs::kv_typed; +pub(crate) use duniter_core::dbs::kv_typed::db_schema; +pub(crate) use duniter_core::dbs::kv_typed::prelude::*; pub(crate) use duniter_core::dbs::smallvec::SmallVec; pub(crate) use duniter_core::dbs::{ CorruptedBytes, HashKeyV2, PubKeyKeyV2, SourceAmountValV2, ToDumpString, WalletConditionsV2, }; -pub(crate) use kv_typed::db_schema; -pub(crate) use kv_typed::prelude::*; pub(crate) use serde::{Deserialize, Serialize}; pub(crate) use std::collections::BTreeSet;