core/services/relay/evm/mercury/wsrpc: forward health and readiness f…

…rom CacheSet
smartcontractkit · Dec 16, 2023 · eb0705e · eb0705e
1 parent 3cea51d
commit eb0705e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/core/services/relay/evm/mercury/wsrpc/pool.go b/core/services/relay/evm/mercury/wsrpc/pool.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/smartcontractkit/wsrpc/credentials"
+	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services"
@@ -220,11 +221,11 @@ func (p *pool) Ready() error {
 	if p.closed {
 		return errors.New("pool is closed")
 	}
-	return nil
+	return p.cacheSet.Ready()
 }
 
 func (p *pool) HealthReport() map[string]error {
-	return map[string]error{
-		p.Name(): p.Ready(),
-	}
+	hp := map[string]error{p.Name(): p.Ready()}
+	maps.Copy(hp, p.cacheSet.HealthReport())
+	return hp
 }
diff --git a/core/web/testdata/body/health.html b/core/web/testdata/body/health.html
@@ -75,7 +75,10 @@
 <details open>
     <summary title=""><span class="">Mercury</span></summary>
     <details open>
-        <summary title="Mercury.WSRPCPool" class="noexpand"><span class="passing">WSRPCPool</span></summary>
+        <summary title="Mercury.WSRPCPool"><span class="passing">WSRPCPool</span></summary>
+        <details open>
+            <summary title="Mercury.WSRPCPool.CacheSet" class="noexpand"><span class="passing">CacheSet</span></summary>
+        </details>
     </details>
 </details>
 <details open>

diff --git a/core/web/testdata/body/health.json b/core/web/testdata/body/health.json
@@ -117,6 +117,15 @@
         "output": ""
       }
     },
+    {
+      "type": "checks",
+      "id": "Mercury.WSRPCPool.CacheSet",
+      "attributes": {
+        "name": "Mercury.WSRPCPool.CacheSet",
+        "status": "passing",
+        "output": ""
+      }
+    },
     {
       "type": "checks",
       "id": "Monitor",

diff --git a/core/web/testdata/body/health.txt b/core/web/testdata/body/health.txt
@@ -12,6 +12,7 @@
 -EVM.0.Txm.WrappedEvmEstimator
 -JobSpawner
 -Mercury.WSRPCPool
+-Mercury.WSRPCPool.CacheSet
 -Monitor
 -PipelineORM
 -PipelineRunner