Skip to content
Snippets Groups Projects
Commit 79547a0d authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Change duniter-core version

parent 085e5020
No related branches found
No related tags found
No related merge requests found
Pipeline #32089 failed
...@@ -14,7 +14,7 @@ async-mutex = "1.4.0" ...@@ -14,7 +14,7 @@ async-mutex = "1.4.0"
async-trait = "0.1.41" async-trait = "0.1.41"
bytes = "1.0" bytes = "1.0"
duniter-bda = { path = "./bda" } duniter-bda = { path = "./bda" }
duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core" } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", branch = "master" }
duniter-gva-conf = { path = "./conf" } duniter-gva-conf = { path = "./conf" }
duniter-gva-db = { path = "./db" } duniter-gva-db = { path = "./db" }
duniter-gva-dbs-reader = { path = "./dbs-reader" } duniter-gva-dbs-reader = { path = "./dbs-reader" }
...@@ -32,7 +32,7 @@ tokio = { version = "1.2", features = ["io-util", "rt-multi-thread"] } ...@@ -32,7 +32,7 @@ tokio = { version = "1.2", features = ["io-util", "rt-multi-thread"] }
warp = "0.3" warp = "0.3"
[dev-dependencies] [dev-dependencies]
duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["mem"] } duniter-core = { git = "https://git.duniter.org/nodes/rust/duniter-core", features = ["mem"], branch = "master" }
once_cell = "1.7" once_cell = "1.7"
mockall = "0.9.1" mockall = "0.9.1"
rusty-hook = "0.11.2" rusty-hook = "0.11.2"
......
...@@ -474,11 +474,11 @@ pub fn get_txs_history_bma_by_blocks<GvaDb: GvaV1DbReadable>( ...@@ -474,11 +474,11 @@ pub fn get_txs_history_bma_by_blocks<GvaDb: GvaV1DbReadable>(
let from = from.unwrap_or(0); let from = from.unwrap_or(0);
let to = to.unwrap_or(u32::MAX); let to = to.unwrap_or(u32::MAX);
let start_k = WalletHashWithBnV1Db::new(script_hash, BlockNumber(from)); let start_k = WalletHashWithBnV1Db::new(script_hash, BlockNumber(from));
let end_k = WalletHashWithBnV1Db::new(script_hash, BlockNumber(to.saturating_add(1))); let end_k = WalletHashWithBnV1Db::new(script_hash, BlockNumber(to));
let sent = gva_db_ro let sent = gva_db_ro
.txs_by_issuer() .txs_by_issuer()
.iter_ref_slice(start_k..end_k, |_k, hashs| { .iter_ref_slice(start_k..=end_k, |_k, hashs| {
let mut sent = SmallVec::<[GvaTxDbV1; 2]>::new(); let mut sent = SmallVec::<[GvaTxDbV1; 2]>::new();
for hash in hashs { for hash in hashs {
if let Some(tx_db) = gva_db_ro.txs().get(HashKeyV2::from_ref(hash))? { if let Some(tx_db) = gva_db_ro.txs().get(HashKeyV2::from_ref(hash))? {
...@@ -492,7 +492,7 @@ pub fn get_txs_history_bma_by_blocks<GvaDb: GvaV1DbReadable>( ...@@ -492,7 +492,7 @@ pub fn get_txs_history_bma_by_blocks<GvaDb: GvaV1DbReadable>(
let received = gva_db_ro let received = gva_db_ro
.txs_by_recipient() .txs_by_recipient()
.iter_ref_slice(start_k..end_k, |_k, hashs| { .iter_ref_slice(start_k..=end_k, |_k, hashs| {
let mut sent = SmallVec::<[GvaTxDbV1; 2]>::new(); let mut sent = SmallVec::<[GvaTxDbV1; 2]>::new();
for hash in hashs { for hash in hashs {
if let Some(tx_db) = gva_db_ro.txs().get(HashKeyV2::from_ref(hash))? { if let Some(tx_db) = gva_db_ro.txs().get(HashKeyV2::from_ref(hash))? {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment