From 79547a0d34861aac28a80ba4bf7470423f9a8f82 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Tue, 30 May 2023 18:20:16 +0200
Subject: [PATCH] Change duniter-core version
---
Cargo.toml | 4 ++--
dbs-reader/src/txs_history.rs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index b29c4ed..8768304 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ async-mutex = "1.4.0"
async-trait = "0.1.41"
bytes = "1.0"
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-db = { path = "./db" }
duniter-gva-dbs-reader = { path = "./dbs-reader" }
@@ -32,7 +32,7 @@ tokio = { version = "1.2", features = ["io-util", "rt-multi-thread"] }
warp = "0.3"
[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"
mockall = "0.9.1"
rusty-hook = "0.11.2"
diff --git a/dbs-reader/src/txs_history.rs b/dbs-reader/src/txs_history.rs
index 3d3b443..69f4a0d 100644
--- a/dbs-reader/src/txs_history.rs
+++ b/dbs-reader/src/txs_history.rs
@@ -474,11 +474,11 @@ pub fn get_txs_history_bma_by_blocks<GvaDb: GvaV1DbReadable>(
let from = from.unwrap_or(0);
let to = to.unwrap_or(u32::MAX);
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
.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();
for hash in hashs {
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>(
let received = gva_db_ro
.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();
for hash in hashs {
if let Some(tx_db) = gva_db_ro.txs().get(HashKeyV2::from_ref(hash))? {
--
GitLab