chore: update shouldTriggerDecryption to return an error and update tests

Author: blockchainluffy

rolling-shutter/keyperimpl/shutterservice/newblock.go

@@ -81,7 +81,11 @@ func (kpr *Keyper) prepareTimeBasedTriggers(ctx context.Context, block *synceven
 
 	eventsToDecrypt := make([]servicedatabase.IdentityRegisteredEvent, 0)
 	for _, event := range nonTriggeredEvents {
-		if kpr.shouldTriggerDecryption(ctx, event, block) {
+		trigger, err := kpr.shouldTriggerDecryption(ctx, event, block)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to check if should trigger decryption for event %d", event.Eon)
+		}
+		if trigger {
 			eventsToDecrypt = append(eventsToDecrypt, event)
 		}
 	}
@@ -93,7 +97,7 @@ func (kpr *Keyper) shouldTriggerDecryption(
 	ctx context.Context,
 	event servicedatabase.IdentityRegisteredEvent,
 	triggeredBlock *syncevent.LatestBlock,
-) bool {
+) (bool, error) {
 	coreKeyperDB := corekeyperdatabase.New(kpr.dbpool)
 	isKeyper, err := coreKeyperDB.GetKeyperStateForEon(ctx, corekeyperdatabase.GetKeyperStateForEonParams{
 		Eon:           event.Eon,
@@ -104,27 +108,26 @@ func (kpr *Keyper) shouldTriggerDecryption(
 			log.Info().
 				Int64("eon", event.Eon).
 				Msg("skipping event as no eon has been found for it")
+			return false, nil
 		} else {
-			log.Err(err).Msgf("failed to query keyper state for eon %d", event.Eon)
+			return false, errors.Wrapf(err, "failed to query keyper state for eon %d", event.Eon)
 		}
-		return false
 	}
 
 	eon, err := coreKeyperDB.GetEon(ctx, event.Eon)
 	if err != nil {
-		log.Err(err).Msgf("failed to get eon %d", event.Eon)
-		return false
+		return false, errors.Wrapf(err, "failed to get eon %d", event.Eon)
 	}
 	if eon.ActivationBlockNumber > triggeredBlock.Header.Number.Int64() {
 		log.Info().
 			Int64("eon", event.Eon).
 			Int64("block-number", triggeredBlock.Header.Number.Int64()).
 			Msg("skipping event as eon activation block number is greater than triggered block number")
-		return false
+		return false, nil
 	}
 
 	if event.Timestamp >= int64(triggeredBlock.Header.Time) {
-		return false
+		return false, nil
 	}
 
 	// don't trigger if we're not part of the keyper set
@@ -135,9 +138,9 @@ func (kpr *Keyper) shouldTriggerDecryption(
 			Str("identity", string(event.Identity)).
 			Str("address", kpr.config.GetAddress().Hex()).
 			Msg("skipping event as not part of keyper set")
-		return false
+		return false, nil
 	}
-	return true
+	return true, nil
 }
 
 func (kpr *Keyper) createTriggersFromIdentityRegisteredEvents(

rolling-shutter/keyperimpl/shutterservice/newblock_test.go

@@ -172,7 +172,7 @@ func TestShouldTriggerDecryption(t *testing.T) {
 	})
 	assert.NilError(t, err)
 
-	trigger := kpr.shouldTriggerDecryption(
+	trigger, err := kpr.shouldTriggerDecryption(
 		ctx,
 		servicedatabase.IdentityRegisteredEvent{
 			Eon:         int64(eon),
@@ -189,6 +189,7 @@ func TestShouldTriggerDecryption(t *testing.T) {
 			},
 		},
 	)
+	assert.NilError(t, err)
 	assert.Equal(t, trigger, true)
 }
 
@@ -209,14 +210,6 @@ func TestShouldNotTriggerDecryption(t *testing.T) {
 	blockNumber := 100
 	blockTimestamp := time.Now().Unix()
 
-	if blockTimestamp < 0 {
-		t.Fatalf("blockTimestamp is negative: %d", blockTimestamp)
-	}
-
-	if eventTimestamp < 0 {
-		t.Fatalf("eventTimestamp is negative: %d", eventTimestamp)
-	}
-
 	kpr := &Keyper{
 		dbpool: dbpool,
 		config: &Config{
@@ -231,7 +224,7 @@ func TestShouldNotTriggerDecryption(t *testing.T) {
 		decryptionTriggerChannel: decryptionTriggerChannel,
 	}
 
-	trigger := kpr.shouldTriggerDecryption(
+	trigger, err := kpr.shouldTriggerDecryption(
 		ctx,
 		servicedatabase.IdentityRegisteredEvent{
 			Timestamp: eventTimestamp,
@@ -246,7 +239,7 @@ func TestShouldNotTriggerDecryption(t *testing.T) {
 			},
 		},
 	)
-
+	assert.NilError(t, err)
 	assert.Equal(t, trigger, false)
 }
 
@@ -270,10 +263,6 @@ func TestShouldTriggerDecryptionDifferentEon(t *testing.T) {
 	blockNumber := 100
 	blockTimestamp := time.Now().Add(5 * time.Second).Unix()
 
-	if blockTimestamp < 0 {
-		t.Fatalf("blockTimestamp is negative: %d", blockTimestamp)
-	}
-
 	kpr := &Keyper{
 		dbpool: dbpool,
 		config: &Config{
@@ -319,7 +308,7 @@ func TestShouldTriggerDecryptionDifferentEon(t *testing.T) {
 	assert.NilError(t, err)
 
 	// Test with event from eon 0, but current block is in eon 1
-	trigger := kpr.shouldTriggerDecryption(
+	trigger, err := kpr.shouldTriggerDecryption(
 		ctx,
 		servicedatabase.IdentityRegisteredEvent{
 			Eon:         int64(eon), // Event from eon 0
@@ -331,11 +320,12 @@ func TestShouldTriggerDecryptionDifferentEon(t *testing.T) {
 				Int: big.NewInt(int64(blockNumber + 100)), // Block in eon 1
 			},
 			Header: &types.Header{
-				Time:   uint64(blockTimestamp),
+				Time:   uint64(blockTimestamp), //nolint:gosec
 				Number: big.NewInt(int64(blockNumber + 100)),
 			},
 		},
 	)
+	assert.NilError(t, err)
 	assert.Equal(t, trigger, true)
 }
 
@@ -359,14 +349,6 @@ func TestShouldNotTriggerDecryptionBeforeActivation(t *testing.T) {
 	blockNumber := 150 // Current block is 150, before activation
 	blockTimestamp := time.Now().Add(5 * time.Second).Unix()
 
-	if blockTimestamp < 0 {
-		t.Fatalf("blockTimestamp is negative: %d", blockTimestamp)
-	}
-
-	if eventTimestamp < 0 {
-		t.Fatalf("eventTimestamp is negative: %d", eventTimestamp)
-	}
-
 	kpr := &Keyper{
 		dbpool: dbpool,
 		config: &Config{
@@ -403,7 +385,7 @@ func TestShouldNotTriggerDecryptionBeforeActivation(t *testing.T) {
 	assert.NilError(t, err)
 
 	// Test with event from eon 0, but current block (150) is before activation (200)
-	trigger := kpr.shouldTriggerDecryption(
+	trigger, err := kpr.shouldTriggerDecryption(
 		ctx,
 		servicedatabase.IdentityRegisteredEvent{
 			Eon:         int64(eon), // Event from eon 0
@@ -415,10 +397,11 @@ func TestShouldNotTriggerDecryptionBeforeActivation(t *testing.T) {
 				Int: big.NewInt(int64(blockNumber)), // Block 150, before activation at 200
 			},
 			Header: &types.Header{
-				Time:   uint64(blockTimestamp),
+				Time:   uint64(blockTimestamp), //nolint:gosec
 				Number: big.NewInt(int64(blockNumber)),
 			},
 		},
 	)
+	assert.NilError(t, err)
 	assert.Equal(t, trigger, false)
 }