fix: nil chain checks (#34)

sygmaprotocol · Sep 16, 2024 · aa7e4eb · aa7e4eb
1 parent b4b6389
commit aa7e4eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/chains/evm/chain.go b/chains/evm/chain.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"math/big"
+	"reflect"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -52,7 +53,7 @@ func NewEVMChain(listener EventListener, messageHandler MessageHandler, executor
 // PollEvents is the goroutine that polls blocks and searches Deposit events in them.
 // Events are then sent to eventsChan.
 func (c *EVMChain) PollEvents(ctx context.Context) {
-	if c.listener == nil {
+	if reflect.ValueOf(c.listener).IsNil() {
 		return
 	}
 
@@ -61,15 +62,15 @@ func (c *EVMChain) PollEvents(ctx context.Context) {
 }
 
 func (c *EVMChain) ReceiveMessage(m *message.Message) (*proposal.Proposal, error) {
-	if c.messageHandler == nil {
+	if reflect.ValueOf(c.messageHandler).IsNil() {
 		return nil, fmt.Errorf("message handler not configured")
 	}
 
 	return c.messageHandler.HandleMessage(m)
 }
 
 func (c *EVMChain) Write(props []*proposal.Proposal) error {
-	if c.executor == nil {
+	if reflect.ValueOf(c.executor).IsNil() {
 		return fmt.Errorf("executor not configured")
 	}
 

diff --git a/chains/substrate/chain.go b/chains/substrate/chain.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math/big"
+	"reflect"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -47,7 +48,7 @@ func NewSubstrateChain(listener EventListener, messageHandler MessageHandler, ex
 // PollEvents is the goroutine that polls blocks and searches Deposit events in them.
 // Events are then sent to eventsChan.
 func (c *SubstrateChain) PollEvents(ctx context.Context) {
-	if c.listener == nil {
+	if reflect.ValueOf(c.listener).IsNil() {
 		return
 	}
 
@@ -56,15 +57,15 @@ func (c *SubstrateChain) PollEvents(ctx context.Context) {
 }
 
 func (c *SubstrateChain) ReceiveMessage(m *message.Message) (*proposal.Proposal, error) {
-	if c.messageHandler == nil {
+	if reflect.ValueOf(c.messageHandler).IsNil() {
 		return nil, fmt.Errorf("message handler not configured")
 	}
 
 	return c.messageHandler.HandleMessage(m)
 }
 
 func (c *SubstrateChain) Write(props []*proposal.Proposal) error {
-	if c.executor == nil {
+	if reflect.ValueOf(c.executor).IsNil() {
 		return fmt.Errorf("executor not configured")
 	}