graph, store: Move looking up ENS names into its own trait

Author: lutter

graph/src/components/store.rs

@@ -912,12 +912,18 @@ impl Display for DeploymentLocator {
     }
 }
 
+/// A special trait to handle looking up ENS names from special rainbow
+/// tables that need to be manually loaded into the system
+pub trait EnsLookup: Send + Sync + 'static {
+    /// Find the reverse of keccak256 for `hash` through looking it up in the
+    /// rainbow table.
+    fn find_name(&self, hash: &str) -> Result<Option<String>, StoreError>;
+}
+
 /// Common trait for store implementations.
 #[async_trait]
 pub trait SubgraphStore: Send + Sync + 'static {
-    /// Find the reverse of keccak256 for `hash` through looking it up in the
-    /// rainbow table.
-    fn find_ens_name(&self, _hash: &str) -> Result<Option<String>, StoreError>;
+    fn ens_lookup(&self) -> Arc<dyn EnsLookup>;
 
     /// Check if the store is accepting queries for the specified subgraph.
     /// May return true even if the specified subgraph is not currently assigned to an indexing
@@ -1121,7 +1127,7 @@ pub type PoolWaitStats = Arc<RwLock<MovingStats>>;
 // The store trait must be implemented manually because mockall does not support async_trait, nor borrowing from arguments.
 #[async_trait]
 impl SubgraphStore for MockStore {
-    fn find_ens_name(&self, _hash: &str) -> Result<Option<String>, StoreError> {
+    fn ens_lookup(&self) -> Arc<dyn EnsLookup> {
         unimplemented!()
     }
 

store/postgres/src/subgraph_store.rs

@@ -12,7 +12,10 @@ use graph::{
     cheap_clone::CheapClone,
     components::{
         server::index_node::VersionInfo,
-        store::{self, DeploymentLocator, EntityType, WritableStore as WritableStoreTrait},
+        store::{
+            self, DeploymentLocator, EnsLookup as EnsLookupTrait, EntityType,
+            WritableStore as WritableStoreTrait,
+        },
     },
     constraint_violation,
     data::query::QueryTarget,
@@ -944,10 +947,23 @@ impl SubgraphStoreInner {
     }
 }
 
+struct EnsLookup {
+    primary: ConnectionPool,
+}
+
+impl EnsLookupTrait for EnsLookup {
+    fn find_name(&self, hash: &str) -> Result<Option<String>, StoreError> {
+        let conn = self.primary.get()?;
+        primary::Connection::new(conn).find_ens_name(hash)
+    }
+}
+
 #[async_trait::async_trait]
 impl SubgraphStoreTrait for SubgraphStore {
-    fn find_ens_name(&self, hash: &str) -> Result<Option<String>, StoreError> {
-        self.primary_conn()?.find_ens_name(hash)
+    fn ens_lookup(&self) -> Arc<dyn EnsLookupTrait> {
+        Arc::new(EnsLookup {
+            primary: self.mirror.primary().clone(),
+        })
     }
 
     // FIXME: This method should not get a node_id