Add node type to api + proofs (#225)

ava-labs · Aug 28, 2023 · 0e48de6 · 0e48de6
1 parent 42111f1
commit 0e48de6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/firewood/src/v2/api.rs b/firewood/src/v2/api.rs
@@ -69,17 +69,17 @@ 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<K: KeyType, V: ValueType> {
-    pub first_key: Proof<V>,
-    pub last_key: Proof<V>,
+pub struct RangeProof<K, V, N> {
+    pub first_key: Proof<N>,
+    pub last_key: Proof<N>,
     pub middle: Vec<(K, V)>,
 }
 
 /// A proof that a single key is present
 ///
 /// The generic N represents the storage for the node data
 #[derive(Debug)]
-pub struct Proof<N: Send>(pub HashMap<HashKey, N>);
+pub struct Proof<N>(pub HashMap<HashKey, N>);
 
 /// The database interface, which includes a type for a static view of
 /// the database (the DbView). The most common implementation of the DbView
@@ -147,12 +147,12 @@ 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<K: KeyType, V: ValueType>(
+    async fn range_proof<K: KeyType, V, N>(
         &self,
         first_key: Option<K>,
         last_key: Option<K>,
         limit: usize,
-    ) -> Result<Option<RangeProof<K, V>>, Error>;
+    ) -> Result<Option<RangeProof<K, V, N>>, Error>;
 }
 
 /// A proposal for a new revision of the database.

diff --git a/firewood/src/v2/db.rs b/firewood/src/v2/db.rs
@@ -83,12 +83,12 @@ impl api::DbView for DbView {
         todo!()
     }
 
-    async fn range_proof<K: KeyType, V: ValueType>(
+    async fn range_proof<K: KeyType, V, N>(
         &self,
         _first_key: Option<K>,
         _last_key: Option<K>,
         _limit: usize,
-    ) -> Result<Option<api::RangeProof<K, V>>, api::Error> {
+    ) -> Result<Option<api::RangeProof<K, V, N>>, api::Error> {
         todo!()
     }
 }
diff --git a/firewood/src/v2/emptydb.rs b/firewood/src/v2/emptydb.rs
@@ -65,12 +65,12 @@ impl DbView for HistoricalImpl {
         Ok(None)
     }
 
-    async fn range_proof<K: KeyType, V: ValueType>(
+    async fn range_proof<K: KeyType, V, N>(
         &self,
         _first_key: Option<K>,
         _last_key: Option<K>,
         _limit: usize,
-    ) -> Result<Option<RangeProof<K, V>>, Error> {
+    ) -> Result<Option<RangeProof<K, V, N>>, Error> {
         Ok(None)
     }
 }

diff --git a/firewood/src/v2/propose.rs b/firewood/src/v2/propose.rs
@@ -125,12 +125,12 @@ impl<T: api::DbView + Send + Sync> api::DbView for Proposal<T> {
         todo!()
     }
 
-    async fn range_proof<KT: KeyType, VT: ValueType>(
+    async fn range_proof<KT: KeyType, VT, NT>(
         &self,
         _first_key: Option<KT>,
         _last_key: Option<KT>,
         _limit: usize,
-    ) -> Result<Option<api::RangeProof<KT, VT>>, api::Error> {
+    ) -> Result<Option<api::RangeProof<KT, VT, NT>>, api::Error> {
         todo!()
     }
 }