wip: more fixing err not found in beacondb package

berachain · Oct 11, 2024 · 0108886 · 0108886
1 parent 7bfea6b
commit 0108886
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 15 deletions.
diff --git a/mod/state-transition/pkg/core/state_processor_payload.go b/mod/state-transition/pkg/core/state_processor_payload.go
@@ -22,7 +22,6 @@ package core
 
 import (
 	"context"
-	"fmt"
 
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/errors"
@@ -140,7 +139,7 @@ func (sp *StateProcessor[
 
 	lph, err := st.GetLatestExecutionPayloadHeader()
 	if err != nil {
-		return fmt.Errorf("failed retrieving latest payload header: %w", err)
+		return err
 	}
 
 	// Check chain canonicity

diff --git a/mod/state-transition/pkg/core/state_processor_randao.go b/mod/state-transition/pkg/core/state_processor_randao.go
@@ -107,12 +107,14 @@ func (sp *StateProcessor[
 	}
 
 	epoch := sp.cs.SlotToEpoch(slot)
+
 	mix, err := st.GetRandaoMixAtIndex(
 		epoch.Unwrap() % sp.cs.EpochsPerHistoricalVector(),
 	)
 	if err != nil {
 		return err
 	}
+
 	return st.UpdateRandaoMixAtIndex(
 		(epoch.Unwrap()+1)%sp.cs.EpochsPerHistoricalVector(),
 		mix,

diff --git a/mod/state-transition/pkg/core/state_processor_staking.go b/mod/state-transition/pkg/core/state_processor_staking.go
@@ -47,7 +47,7 @@ func (sp *StateProcessor[
 	}
 	eth1Data, err := st.GetEth1Data()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed retrieving eth1 data, %w", err)
 	}
 	depositCount := min(
 		sp.cs.MaxDepositsPerBlock(),

diff --git a/mod/storage/pkg/beacondb/eth1.go b/mod/storage/pkg/beacondb/eth1.go
@@ -34,10 +34,10 @@ func (kv *KVStore[
 ]) GetLatestExecutionPayloadHeader() (
 	ExecutionPayloadHeaderT, error,
 ) {
-	forkVersion, err := kv.latestExecutionPayloadVersion.Get(kv.ctx)
+	v, err := kv.latestExecutionPayloadVersion.Get(kv.ctx)
 	switch {
 	case err == nil:
-		kv.latestExecutionPayloadCodec.SetActiveForkVersion(forkVersion)
+		kv.latestExecutionPayloadCodec.SetActiveForkVersion(v)
 		return kv.latestExecutionPayloadHeader.Get(kv.ctx)
 	case errors.Is(err, collections.ErrNotFound):
 		var t ExecutionPayloadHeaderT
@@ -98,7 +98,15 @@ func (kv *KVStore[
 	BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT,
 	ForkT, ValidatorT, ValidatorsT,
 ]) GetEth1Data() (Eth1DataT, error) {
-	return kv.eth1Data.Get(kv.ctx)
+	d, err := kv.eth1Data.Get(kv.ctx)
+	switch {
+	case err == nil:
+		return d, nil
+	case errors.Is(err, collections.ErrNotFound):
+		return d, ErrNotFound
+	default:
+		return d, err
+	}
 }
 
 // SetEth1Data sets the eth1 data in the beacon state.

diff --git a/mod/storage/pkg/beacondb/fork.go b/mod/storage/pkg/beacondb/fork.go
@@ -20,6 +20,12 @@
 
 package beacondb
 
+import (
+	"errors"
+
+	"cosmossdk.io/collections"
+)
+
 // SetFork sets the fork version for the given epoch.
 func (kv *KVStore[
 	BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT,
@@ -35,5 +41,13 @@ func (kv *KVStore[
 	BeaconBlockHeaderT, Eth1DataT, ExecutionPayloadHeaderT,
 	ForkT, ValidatorT, ValidatorsT,
 ]) GetFork() (ForkT, error) {
-	return kv.fork.Get(kv.ctx)
+	f, err := kv.fork.Get(kv.ctx)
+	switch {
+	case err == nil:
+		return f, nil
+	case errors.Is(err, collections.ErrNotFound):
+		return f, ErrNotFound
+	default:
+		return f, err
+	}
 }
diff --git a/mod/storage/pkg/beacondb/history.go b/mod/storage/pkg/beacondb/history.go
@@ -20,7 +20,12 @@
 
 package beacondb
 
-import "github.com/berachain/beacon-kit/mod/primitives/pkg/common"
+import (
+	"errors"
+
+	"cosmossdk.io/collections"
+	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
+)
 
 // UpdateBlockRootAtIndex sets a block root in the BeaconStore.
 func (kv *KVStore[
@@ -41,10 +46,14 @@ func (kv *KVStore[
 	index uint64,
 ) (common.Root, error) {
 	bz, err := kv.blockRoots.Get(kv.ctx, index)
-	if err != nil {
+	switch {
+	case err == nil:
+		return common.Root(bz), nil
+	case errors.Is(err, collections.ErrNotFound):
+		return common.Root{}, ErrNotFound
+	default:
 		return common.Root{}, err
 	}
-	return common.Root(bz), nil
 }
 
 // SetLatestBlockHeader sets the latest block header in the BeaconStore.
@@ -64,7 +73,15 @@ func (kv *KVStore[
 ]) GetLatestBlockHeader() (
 	BeaconBlockHeaderT, error,
 ) {
-	return kv.latestBlockHeader.Get(kv.ctx)
+	h, err := kv.latestBlockHeader.Get(kv.ctx)
+	switch {
+	case err == nil:
+		return h, nil
+	case errors.Is(err, collections.ErrNotFound):
+		return h, ErrNotFound
+	default:
+		return h, err
+	}
 }
 
 // UpdateStateRootAtIndex updates the state root at the given slot.

diff --git a/mod/storage/pkg/beacondb/randao.go b/mod/storage/pkg/beacondb/randao.go
@@ -20,7 +20,13 @@
 
 package beacondb
 
-import "github.com/berachain/beacon-kit/mod/primitives/pkg/common"
+import (
+	"errors"
+	"fmt"
+
+	"cosmossdk.io/collections"
+	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
+)
 
 // UpdateRandaoMixAtIndex sets the current RANDAO mix in the store.
 func (kv *KVStore[
@@ -41,8 +47,20 @@ func (kv *KVStore[
 	index uint64,
 ) (common.Bytes32, error) {
 	bz, err := kv.randaoMix.Get(kv.ctx, index)
-	if err != nil {
-		return common.Bytes32{}, err
+	switch {
+	case err == nil:
+		return common.Bytes32(bz), nil
+	case errors.Is(err, collections.ErrNotFound):
+		return common.Bytes32{}, fmt.Errorf(
+			"failed retrieving randao mix at index %d: %w",
+			index,
+			ErrNotFound,
+		)
+	default:
+		return common.Bytes32{}, fmt.Errorf(
+			"failed retrieving randao mix at index %d: %w",
+			index,
+			err,
+		)
 	}
-	return common.Bytes32(bz), nil
 }