de-duplicate imports

prysmaticlabs · May 22, 2024 · bc22b4a · bc22b4a
1 parent 2d66bff
commit bc22b4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/api/client/builder/client_test.go b/api/client/builder/client_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/api/server/structs"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	types "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/encoding/bytesutil"
 	v1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
@@ -201,7 +200,7 @@ func TestClient_GetHeader(t *testing.T) {
 		require.Equal(t, uint64(1), bidHeader.GasUsed())
 		value, err := stringToUint256("652312848583266388373324160190187140051835877600158453279131187530910662656")
 		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf("%#x", value.Bytes()), fmt.Sprintf("%#x", primitives.WeiToBigInt(bid.WeiValue()).Bytes()))
+		require.Equal(t, fmt.Sprintf("%#x", value.Bytes()), fmt.Sprintf("%#x", types.WeiToBigInt(bid.WeiValue()).Bytes()))
 		bidValue := bytesutil.ReverseByteOrder(bid.Value())
 		require.DeepEqual(t, bidValue, value.Bytes())
 		require.DeepEqual(t, big.NewInt(0).SetBytes(bidValue), value.Int)

diff --git a/consensus-types/blocks/get_payload.go b/consensus-types/blocks/get_payload.go
@@ -3,7 +3,6 @@ package blocks
 import (
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	enginev1 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	pb "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	"google.golang.org/protobuf/proto"
 )
@@ -12,7 +11,7 @@ import (
 // GetPayloadResponseV(1|2|3|4) value.
 type GetPayloadResponse struct {
 	ExecutionData   interfaces.ExecutionData
-	BlobsBundle     *enginev1.BlobsBundle
+	BlobsBundle     *pb.BlobsBundle
 	OverrideBuilder bool
 	// todo: should we convert this to Gwei up front?
 	Bid primitives.Wei