forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 21:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/txpool/blobpool: fix TestGetBlobs if no conversion

Browse source 
Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
This commit is contained in:
Csaba Kiraly 2025-09-19 10:18:29 +02:00
parent 940a68359e
commit 9e6c5c3683
No known key found for this signature in database
GPG key ID: 0FE274EE8C95166E
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/txpool/blobpool/blobpool_test.go
View file

@ -1922,8 +1922,8 @@ func TestGetBlobs(t *testing.T) {
cases := []struct { cases := []struct {
start int start int
limit int limit int
fillRandom bool fillRandom bool // Whether to randomly fill some of the requested blobs with unknowns
version byte version byte // Blob sidecar version to request
}{ }{
{ {
start: 0, limit: 6, start: 0, limit: 6,
@ -2010,7 +2010,7 @@ func TestGetBlobs(t *testing.T) {
filled[len(vhashes)] = struct{}{} filled[len(vhashes)] = struct{}{}
vhashes = append(vhashes, testrand.Hash()) vhashes = append(vhashes, testrand.Hash())
} }
blobs, _, proofs, err := pool.GetBlobs(vhashes, c.version, true) blobs, _, proofs, err := pool.GetBlobs(vhashes, c.version, false)
if err != nil { if err != nil {
t.Errorf("Unexpected error for case %d, %v", i, err) t.Errorf("Unexpected error for case %d, %v", i, err)
} }
@ -2025,6 +2025,7 @@ func TestGetBlobs(t *testing.T) {
var unknown int var unknown int
for j := 0; j < len(blobs); j++ { for j := 0; j < len(blobs); j++ {
testBlobIndex := c.start + j - unknown
if _, exist := filled[j]; exist { if _, exist := filled[j]; exist {
if blobs[j] != nil || proofs[j] != nil { if blobs[j] != nil || proofs[j] != nil {
t.Errorf("Unexpected blob and proof, item %d", j) t.Errorf("Unexpected blob and proof, item %d", j)
@ -2034,17 +2035,21 @@ func TestGetBlobs(t *testing.T) {
} }
// If an item is missing, but shouldn't, error // If an item is missing, but shouldn't, error
if blobs[j] == nil || proofs[j] == nil { if blobs[j] == nil || proofs[j] == nil {
t.Errorf("tracked blob retrieval failed: item %d, hash %x", j, vhashes[j]) // This is only an error if there was no version mismatch
if (c.version == types.BlobSidecarVersion1 && 6 <= testBlobIndex && testBlobIndex < 12) ||
(c.version == types.BlobSidecarVersion0 && (testBlobIndex < 6 || 12 <= testBlobIndex)) {
t.Errorf("tracked blob retrieval failed: item %d, hash %x", j, vhashes[j])
}
continue continue
} }
// Item retrieved, make sure the blob matches the expectation // Item retrieved, make sure the blob matches the expectation
if *blobs[j] != *testBlobs[c.start+j-unknown] { if *blobs[j] != *testBlobs[testBlobIndex] {
t.Errorf("retrieved blob mismatch: item %d, hash %x", j, vhashes[j]) t.Errorf("retrieved blob mismatch: item %d, hash %x", j, vhashes[j])
continue continue
} }
// Item retrieved, make sure the proof matches the expectation // Item retrieved, make sure the proof matches the expectation
if c.version == types.BlobSidecarVersion0 { if c.version == types.BlobSidecarVersion0 {
if proofs[j][0] != testBlobProofs[c.start+j-unknown] { if proofs[j][0] != testBlobProofs[testBlobIndex] {
t.Errorf("retrieved proof mismatch: item %d, hash %x", j, vhashes[j]) t.Errorf("retrieved proof mismatch: item %d, hash %x", j, vhashes[j])
} }
} else { } else {