From 65c98ff6960dc8acaa61527fb78f30fa143a3d5c Mon Sep 17 00:00:00 2001 From: nidhi-singh02 Date: Fri, 14 Jun 2024 16:41:19 +0530 Subject: [PATCH 1/2] tests for other scenarios Signed-off-by: nidhi-singh02 --- contracts/lib/forge-std | 2 +- contracts/lib/solady | 2 +- mod/consensus-types/pkg/types/block_test.go | 15 +++++++++ .../pkg/engine-primitives/requests_test.go | 33 ++++++++++++++----- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std index 6e05729b76..52715a217d 160000 --- a/contracts/lib/forge-std +++ b/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 6e05729b76f1ae0d437e74951aef1ca987788ab3 +Subproject commit 52715a217dc51d0de15877878ab8213f6cbbbab5 diff --git a/contracts/lib/solady b/contracts/lib/solady index 7bba1eece2..bfff552c0d 160000 --- a/contracts/lib/solady +++ b/contracts/lib/solady @@ -1 +1 @@ -Subproject commit 7bba1eece2712a9e6cb8bedf3285b05d9e6d739a +Subproject commit bfff552c0d282c15258cab9377a7d4c5247d0434 diff --git a/mod/consensus-types/pkg/types/block_test.go b/mod/consensus-types/pkg/types/block_test.go index 3379825a88..d86bdae8ed 100644 --- a/mod/consensus-types/pkg/types/block_test.go +++ b/mod/consensus-types/pkg/types/block_test.go @@ -157,6 +157,21 @@ func TestBeaconBlockEmpty(t *testing.T) { require.IsType(t, &types.BeaconBlockDeneb{}, emptyBlock.RawBeaconBlock) } +func TestBeaconBlock_IsNil(t *testing.T) { + var block *types.BeaconBlock + require.True(t, block.IsNil()) + + // Test when RawBeaconBlock is nil + block = &types.BeaconBlock{} + require.True(t, block.IsNil()) + + // Test when BeaconBlock and RawBeaconBlock are not nil + block = &types.BeaconBlock{ + RawBeaconBlock: &types.BeaconBlockDeneb{}, + } + require.False(t, block.IsNil()) +} + func TestNewWithVersion(t *testing.T) { slot := math.Slot(10) proposerIndex := math.ValidatorIndex(5) diff --git a/mod/engine-primitives/pkg/engine-primitives/requests_test.go b/mod/engine-primitives/pkg/engine-primitives/requests_test.go index 0d623e7abb..3febba4e0e 100644 --- a/mod/engine-primitives/pkg/engine-primitives/requests_test.go +++ b/mod/engine-primitives/pkg/engine-primitives/requests_test.go @@ -146,7 +146,18 @@ func TestBuildForkchoiceUpdateRequest(t *testing.T) { require.Equal(t, forkVersion, request.ForkVersion) } -func TestHasValidVersionedAndBlockHashesError(t *testing.T) { +func TestBuildGetPayloadRequest(t *testing.T) { + payloadID := engineprimitives.PayloadID{} + forkVersion := uint32(1) + + request := engineprimitives.BuildGetPayloadRequest(payloadID, forkVersion) + + require.NotNil(t, request) + require.Equal(t, payloadID, request.PayloadID) + require.Equal(t, forkVersion, request.ForkVersion) +} + +func TestHasValidVersionedAndBlockHashesPayloadError(t *testing.T) { executionPayload := MockExecutionPayload{} versionedHashes := []common.ExecutionHash{} parentBeaconBlockRoot := primitives.Root{} @@ -163,13 +174,19 @@ func TestHasValidVersionedAndBlockHashesError(t *testing.T) { require.ErrorIs(t, err, engineprimitives.ErrPayloadBlockHashMismatch) } -func TestBuildGetPayloadRequest(t *testing.T) { - payloadID := engineprimitives.PayloadID{} - forkVersion := uint32(1) +func TestHasValidVersionedAndBlockHashesMismatchedHashes(t *testing.T) { + executionPayload := MockExecutionPayload{} + versionedHashes := []common.ExecutionHash{common.ExecutionHash{}} + parentBeaconBlockRoot := primitives.Root{} + optimistic := false - request := engineprimitives.BuildGetPayloadRequest(payloadID, forkVersion) + request := engineprimitives.BuildNewPayloadRequest( + executionPayload, + versionedHashes, + &parentBeaconBlockRoot, + optimistic, + ) - require.NotNil(t, request) - require.Equal(t, payloadID, request.PayloadID) - require.Equal(t, forkVersion, request.ForkVersion) + err := request.HasValidVersionedAndBlockHashes() + require.ErrorIs(t, err, engineprimitives.ErrMismatchedNumVersionedHashes) } From abc2c23c89828d18f1a88bbdd9d4ad515965eced Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Fri, 14 Jun 2024 09:51:12 -0400 Subject: [PATCH 2/2] forge update --- contracts/lib/forge-std | 2 +- contracts/lib/solady | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std index 52715a217d..6e05729b76 160000 --- a/contracts/lib/forge-std +++ b/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 52715a217dc51d0de15877878ab8213f6cbbbab5 +Subproject commit 6e05729b76f1ae0d437e74951aef1ca987788ab3 diff --git a/contracts/lib/solady b/contracts/lib/solady index bfff552c0d..678c916355 160000 --- a/contracts/lib/solady +++ b/contracts/lib/solady @@ -1 +1 @@ -Subproject commit bfff552c0d282c15258cab9377a7d4c5247d0434 +Subproject commit 678c9163550810b08f0ffb09624c9f7532392303