From a53eb56f611e7ba656b47dea7a78f9bd28be7435 Mon Sep 17 00:00:00 2001 From: Ron Kuris Date: Mon, 28 Aug 2023 16:42:11 +0000 Subject: [PATCH] Remove some trait bounds Per review --- firewood/src/v2/api.rs | 6 +++--- firewood/src/v2/db.rs | 2 +- firewood/src/v2/emptydb.rs | 2 +- firewood/src/v2/propose.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firewood/src/v2/api.rs b/firewood/src/v2/api.rs index 08e8b6c9c..74444e992 100644 --- a/firewood/src/v2/api.rs +++ b/firewood/src/v2/api.rs @@ -69,7 +69,7 @@ pub enum Error { /// A range proof, consisting of a proof of the first key and the last key, /// and a vector of all key/value pairs #[derive(Debug)] -pub struct RangeProof + Send> { +pub struct RangeProof { pub first_key: Proof, pub last_key: Proof, pub middle: Vec<(K, V)>, @@ -79,7 +79,7 @@ pub struct RangeProof + Send> { /// /// The generic N represents the storage for the node data #[derive(Debug)] -pub struct Proof(pub HashMap); +pub struct Proof(pub HashMap); /// The database interface, which includes a type for a static view of /// the database (the DbView). The most common implementation of the DbView @@ -147,7 +147,7 @@ pub trait DbView { /// * `last_key` - If None, continue to the end of the database /// * `limit` - The maximum number of keys in the range proof /// - async fn range_proof + Send>( + async fn range_proof( &self, first_key: Option, last_key: Option, diff --git a/firewood/src/v2/db.rs b/firewood/src/v2/db.rs index 6e22d4c86..31b21eb57 100644 --- a/firewood/src/v2/db.rs +++ b/firewood/src/v2/db.rs @@ -83,7 +83,7 @@ impl api::DbView for DbView { todo!() } - async fn range_proof + Send>( + async fn range_proof( &self, _first_key: Option, _last_key: Option, diff --git a/firewood/src/v2/emptydb.rs b/firewood/src/v2/emptydb.rs index 86b37d4c7..8b6e07deb 100644 --- a/firewood/src/v2/emptydb.rs +++ b/firewood/src/v2/emptydb.rs @@ -65,7 +65,7 @@ impl DbView for HistoricalImpl { Ok(None) } - async fn range_proof + Send>( + async fn range_proof( &self, _first_key: Option, _last_key: Option, diff --git a/firewood/src/v2/propose.rs b/firewood/src/v2/propose.rs index 14a9065d3..4520173a2 100644 --- a/firewood/src/v2/propose.rs +++ b/firewood/src/v2/propose.rs @@ -125,7 +125,7 @@ impl api::DbView for Proposal { todo!() } - async fn range_proof + Send>( + async fn range_proof( &self, _first_key: Option, _last_key: Option,