From bed588760c6266edd00989dc9705b467b7143485 Mon Sep 17 00:00:00 2001
From: Gustavo Inacio <incio.gusta@gmail.com>
Date: Tue, 21 Mar 2023 12:34:48 -0300
Subject: [PATCH] runtime,graph: fix warnings and rebase types

runtime: fix rebase problem
---
 Cargo.lock                             | 1 +
 graph/src/data/schema.rs               | 2 +-
 store/postgres/src/deployment_store.rs | 4 ++--
 store/postgres/src/writable.rs         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2eccc35d7cd..5f2b4fa8999 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1580,6 +1580,7 @@ dependencies = [
  "stable-hash 0.4.2",
  "strum",
  "strum_macros",
+ "test-store",
  "thiserror",
  "tiny-keccak 1.5.0",
  "tokio",
diff --git a/graph/src/data/schema.rs b/graph/src/data/schema.rs
index a34f4c4f574..dc0f026f77b 100644
--- a/graph/src/data/schema.rs
+++ b/graph/src/data/schema.rs
@@ -1,5 +1,5 @@
 use crate::cheap_clone::CheapClone;
-use crate::components::store::{EntityKey, EntityType, LoadRelatedRequest, SubgraphStore};
+use crate::components::store::{EntityKey, EntityType, LoadRelatedRequest};
 use crate::data::graphql::ext::{DirectiveExt, DirectiveFinder, DocumentExt, TypeExt, ValueExt};
 use crate::data::graphql::ObjectTypeExt;
 use crate::data::store::{self, ValueType};
diff --git a/store/postgres/src/deployment_store.rs b/store/postgres/src/deployment_store.rs
index 724f4a24bdc..32e040f95e4 100644
--- a/store/postgres/src/deployment_store.rs
+++ b/store/postgres/src/deployment_store.rs
@@ -6,8 +6,8 @@ use diesel::r2d2::{ConnectionManager, PooledConnection};
 use graph::anyhow::Context;
 use graph::blockchain::block_stream::FirehoseCursor;
 use graph::components::store::{
-    EntityDerived, EntityKey, EntityType, PrunePhase, PruneReporter, PruneRequest, PruningStrategy,
-    StoredDynamicDataSource, VersionStats,
+    DerivedEntityQuery, EntityKey, EntityType, PrunePhase, PruneReporter, PruneRequest,
+    PruningStrategy, StoredDynamicDataSource, VersionStats,
 };
 use graph::components::versions::VERSIONS;
 use graph::data::query::Trace;
diff --git a/store/postgres/src/writable.rs b/store/postgres/src/writable.rs
index 2227a6e7a9c..a5127aa715b 100644
--- a/store/postgres/src/writable.rs
+++ b/store/postgres/src/writable.rs
@@ -256,7 +256,7 @@ impl SyncStore {
         block: BlockNumber,
         excluded_keys: Vec<EntityKey>,
     ) -> Result<BTreeMap<EntityKey, Entity>, StoreError> {
-        self.retry("get_derived", || {
+        retry::forever(&self.logger, "get_derived", || {
             self.writable
                 .get_derived(self.site.cheap_clone(), key, block, &excluded_keys)
         })