fix rebase

Author: Zoran Cvetkov

store/postgres/src/relational.rs

@@ -559,10 +559,10 @@ impl Layout {
         let mut lower_now = lower_iter.next();
         let mut upper_now = upper_iter.next();
         // A closure to convert the entity data from the database into entity operation.
-        let transform = |ede: EntityDataExt,
+        let transform = |ede: &EntityDataExt,
                          entity_op: EntityOperationKind|
          -> Result<(EntitySourceOperation, BlockNumber), StoreError> {
-            let e = EntityData::new(ede.entity, ede.data);
+            let e = EntityData::new(ede.entity.clone(), ede.data.clone());
             let block = ede.block_number;
             let entity_type = e.entity_type(&self.input_schema);
             let entity = e.deserialize_with_layout::<Entity>(self, None)?;

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

@@ -399,7 +399,7 @@ fn read_immutable_only_range_test() {
         writable.deployment_synced().unwrap();
         let br: Range<BlockNumber> = 0..18;
         let entity_types = vec![COUNTER2_TYPE.clone()];
-        let e: BTreeMap<i32, Vec<EntityWithType>> = sourceable
+        let e: BTreeMap<i32, Vec<EntitySourceOperation>> = sourceable
             .get_range(entity_types.clone(), CausalityRegion::ONCHAIN, br.clone())
             .unwrap();
         assert_eq!(e.len(), 4);