deep equal

rollkit · Oct 17, 2024 · e273568 · e273568
1 parent 642cf03
commit e273568
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sequencing/sequencer.go b/sequencing/sequencer.go
@@ -7,6 +7,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"reflect"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -597,9 +598,7 @@ func (c *Sequencer) GetNextBatch(ctx context.Context, req sequencing.GetNextBatc
 	lastBatchHash := c.lastBatchHash
 	c.lastBatchHashMutex.RUnlock()
 
-	if (lastBatchHash == nil && req.LastBatchHash != nil) || (lastBatchHash != nil && req.LastBatchHash == nil) {
-		return nil, fmt.Errorf("nil mismatch: lastBatchHash = %v, req.LastBatchHash = %v", lastBatchHash, req.LastBatchHash)
-	} else if lastBatchHash != nil && !bytes.Equal(lastBatchHash, req.LastBatchHash) {
+	if !reflect.DeepEqual(lastBatchHash, req.LastBatchHash) {
 		return nil, fmt.Errorf("batch hash mismatch: lastBatchHash = %x, req.LastBatchHash = %x", lastBatchHash, req.LastBatchHash)
 	}
 

diff --git a/sequencing/sequencer_test.go b/sequencing/sequencer_test.go
@@ -159,7 +159,7 @@ func TestSequencer_GetNextBatch_LastBatchNilMismatch(t *testing.T) {
 
 	// Test case where lastBatchHash is nil but seq.lastBatchHash is not
 	res, err := seq.GetNextBatch(context.Background(), sequencing.GetNextBatchRequest{RollupId: seq.rollupId, LastBatchHash: nil})
-	assert.ErrorContains(t, err, "nil mismatch")
+	assert.ErrorContains(t, err, "batch hash mismatch")
 	assert.Nil(t, res)
 }