status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-24 04:08:32 +00:00
Code Issues Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Agnish Ghosh 2025-01-22 17:45:09 +05:30 committed by Agnish Ghosh
parent d527648610
commit 2f5e216039
2 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
beacon_chain/sync/sync_queue.nim
View File

@ -644,24 +644,15 @@ func getOpt(data_columns: Opt[seq[DataColumnSidecars]], i: int): Opt[DataColumnS
Opt.none DataColumnSidecars Opt.none DataColumnSidecars
iterator blocks[T](sq: SyncQueue[T], iterator blocks[T](sq: SyncQueue[T],
sr: SyncResult[T]): (ref ForkedSignedBeaconBlock, Opt[BlobSidecars]) = sr: SyncResult[T]): (ref ForkedSignedBeaconBlock, Opt[BlobSidecars],
Opt[DataColumnSidecars]) =
case sq.kind case sq.kind
of SyncQueueKind.Forward: of SyncQueueKind.Forward:
for i in countup(0, len(sr.data) - 1): for i in countup(0, len(sr.data) - 1):
yield (sr.data[i], sr.blobs.getOpt(i)) yield (sr.data[i], sr.blobs.getOpt(i), sr.dataColumns.getOpt(i))
of SyncQueueKind.Backward: of SyncQueueKind.Backward:
for i in countdown(len(sr.data) - 1, 0): for i in countdown(len(sr.data) - 1, 0):
yield (sr.data[i], sr.blobs.getOpt(i)) yield (sr.data[i], sr.blobs.getOpt(i), sr.dataColumns.getOpt(i))
iterator das_blocks[T](sq: SyncQueue[T],
sr: SyncResult[T]): (ref ForkedSignedBeaconBlock, Opt[DataColumnSidecars]) =
case sq.kind
of SyncQueueKind.Forward:
for i in countup(0, len(sr.data) - 1):
yield (sr.data[i], sr.data_columns.getOpt(i))
of SyncQueueKind.Backward:
for i in countdown(len(sr.data) - 1, 0):
yield (sr.data[i], sr.data_columns.getOpt(i))
proc advanceOutput*[T](sq: SyncQueue[T], number: uint64) = proc advanceOutput*[T](sq: SyncQueue[T], number: uint64) =
case sq.kind case sq.kind
@ -795,8 +786,8 @@ proc push*[T](sq: SyncQueue[T], sr: SyncRequest[T],
res: Result[void, VerifierError] res: Result[void, VerifierError]
var i=0 var i=0
for blk, blb in sq.blocks(item): for blk, blb, cols in sq.blocks(item):
res = await sq.blockVerifier(blk[], blb, Opt.none(DataColumnSidecars), maybeFinalized) res = await sq.blockVerifier(blk[], blb, cols, maybeFinalized)
inc(i) inc(i)
if res.isOk(): if res.isOk():
@ -826,39 +817,6 @@ proc push*[T](sq: SyncQueue[T], sr: SyncRequest[T],
req.item.updateScore(PeerScoreBadValues) req.item.updateScore(PeerScoreBadValues)
break break
var counter = 0
for blk, col in sq.das_blocks(item):
res =
await sq.blockVerifier(blk[], Opt.none(BlobSidecars), col, maybeFinalized)
inc counter
if res.isOk:
goodBlock = some(blk[].slot)
else:
case res.error()
of VerifierError.MissingParent:
missingParentSlot = some(blk[].slot)
break
of VerifierError.Duplicate:
# Keep going, happens naturally
discard
of VerifierError.UnviableFork:
# Keep going so as to register other unviable blocks with the
# quarantine
if unviableBlock.isNone:
# Remember the first unviable block, so we can log it
unviableBlock = some((blk[].root, blk[].slot))
of VerifierError.Invalid:
hasInvalidBlock = true
let req = item.request
notice "Received invalid sequence of blocks", request = req,
blocks_count = len(item.data),
blocks_map = getShortMap(req, item.data)
req.item.updateScore(PeerScoreBadValues)
break
# When errors happen while processing blocks, we retry the same request # When errors happen while processing blocks, we retry the same request
# with, hopefully, a different peer # with, hopefully, a different peer
let retryRequest = let retryRequest =

1
tests/test_sync_manager.nim
View File

@ -399,7 +399,6 @@ suite "SyncManager test suite":
Opt.none(seq[BlobSidecars]), Opt.none(seq[BlobSidecars]),
Opt.none(seq[DataColumnSidecars])) Opt.none(seq[DataColumnSidecars]))
await validatorFut.cancelAndWait() await validatorFut.cancelAndWait()
waitFor runSmokeTest() waitFor runSmokeTest()
case kkind case kkind
of SyncQueueKind.Forward: of SyncQueueKind.Forward: