change the range type

Author: Zoran Cvetkov

graph/src/components/store/mod.rs

@@ -1042,7 +1042,7 @@ impl ReadStore for EmptyStore {
     fn get_range(
         &self,
         _entity_type: &EntityType,
-        _block_range: Range<u32>,
+        _block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         Ok(BTreeMap::new())
     }

graph/src/components/store/traits.rs

@@ -232,7 +232,7 @@ pub trait ReadStore: Send + Sync + 'static {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError>;
 
     /// Reverse lookup
@@ -260,7 +260,7 @@ impl<T: ?Sized + ReadStore> ReadStore for Arc<T> {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         (**self).get_range(entity_type, block_range)
     }

store/postgres/src/block_range.rs

@@ -140,10 +140,10 @@ pub enum EntityBlockRange {
 }
 
 impl EntityBlockRange {
-    pub fn new(immutable: bool, block_range: std::ops::Range<u32>) -> Self {
-        let st: Bound<BlockNumber> = Bound::Included(block_range.start.try_into().unwrap());
-        let en: Bound<BlockNumber> = Bound::Excluded(block_range.end.try_into().unwrap());
-        let block_range: BlockRange = BlockRange(st, en);
+    pub fn new(immutable: bool, block_range: std::ops::Range<BlockNumber>) -> Self {
+        let start: Bound<BlockNumber> = Bound::Included(block_range.start);
+        let end: Bound<BlockNumber> = Bound::Excluded(block_range.end);
+        let block_range: BlockRange = BlockRange(start, end);
         if immutable {
             Self::Immutable(block_range)
         } else {

store/postgres/src/deployment_store.rs

@@ -1060,7 +1060,7 @@ impl DeploymentStore {
         &self,
         site: Arc<Site>,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         let mut conn = self.get_conn()?;
         let layout = self.layout(&mut conn, site)?;

store/postgres/src/relational.rs

@@ -519,7 +519,7 @@ impl Layout {
         &self,
         conn: &mut PgConnection,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         let table = self.table_for_entity(entity_type)?;
         let mut entities: BTreeMap<BlockNumber, Vec<Entity>> = BTreeMap::new();

store/postgres/src/relational_queries.rs

@@ -2013,7 +2013,7 @@ pub struct FindRangeQuery<'a> {
 }
 
 impl<'a> FindRangeQuery<'a> {
-    pub fn new(table: &'a Table, block_range: Range<u32>) -> Self {
+    pub fn new(table: &'a Table, block_range: Range<BlockNumber>) -> Self {
         let eb_range = EntityBlockRange::new(table.immutable, block_range);
         Self { table, eb_range }
     }

store/postgres/src/writable.rs

@@ -355,7 +355,7 @@ impl SyncStore {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         retry::forever(&self.logger, "get_range", || {
             self.writable
@@ -1231,9 +1231,8 @@ impl Queue {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
-        // TODO: implemet read from the queue
         self.store.get_range(entity_type, block_range)
     }
 
@@ -1452,7 +1451,7 @@ impl Writer {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         match self {
             Writer::Sync(store) => store.get_range(entity_type, block_range),
@@ -1591,7 +1590,7 @@ impl ReadStore for WritableStore {
     fn get_range(
         &self,
         entity_type: &EntityType,
-        block_range: Range<u32>,
+        block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         self.writer.get_range(entity_type, block_range)
     }

store/test-store/tests/graph/entity_cache.rs

@@ -70,7 +70,7 @@ impl ReadStore for MockStore {
     fn get_range(
         &self,
         _entity_type: &EntityType,
-        _block_range: Range<u32>,
+        _block_range: Range<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<Entity>>, StoreError> {
         todo!()
     }

store/test-store/tests/postgres/writable.rs

@@ -346,7 +346,7 @@ async fn read_range(
     }
     writable.flush().await.unwrap();
 
-    let br: Range<u32> = 4..8;
+    let br: Range<BlockNumber> = 4..8;
     let et: &EntityType = if mutable {
         &COUNTER_TYPE
     } else {