Skip to content

[FIX] Block fetcher failing test fix #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2021
Merged

[FIX] Block fetcher failing test fix #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherState.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ case class BlockFetcherState(
.withKnownTopAt(block.number)
Right(newState)
} else if (isExistInWaitingHeaders(block.header.parentHash)) {
// ignore already requested bodies
val newFetchingBodiesState =
if (fetchingBodiesState == AwaitingBodies) AwaitingBodiesToBeIgnored else fetchingBodiesState
val newState = copy(
waitingHeaders = waitingHeaders.takeWhile(_.number < block.number).enqueue(block.header)
waitingHeaders = waitingHeaders.takeWhile(_.number < block.number).enqueue(block.header),
fetchingBodiesState = newFetchingBodiesState
)
.withKnownTopAt(block.number)
Right(newState)
Expand Down
20 changes: 14 additions & 6 deletions src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,17 +320,25 @@ class BlockFetcherSpec

handleFirstBlockBatchBodies()

// second bodies request
val secondGetBlockBodiesRequest = GetBlockBodies(secondBlocksBatch.map(_.hash))
peersClient.expectMsgPF() { case PeersClient.Request(msg, _, _) if msg == secondGetBlockBodiesRequest => ()}

// send old checkpoint block
blockFetcher ! MessageFromPeer(PV64.NewBlock(checkpointBlock, ChainWeight(checkpointBlock.number, checkpointBlock.header.difficulty)), fakePeer.id)

// Second bodies request
val secondGetBlockBodiesRequest = GetBlockBodies(alternativeSecondBlocksBatch.map(_.hash))
peersClient.expectMsgPF() { case PeersClient.Request(msg, _, _) if msg == secondGetBlockBodiesRequest => () }

// Second bodies response
val secondGetBlockBodiesResponse = BlockBodies(alternativeSecondBlocksBatch.map(_.body))
// second bodies response
val secondGetBlockBodiesResponse = BlockBodies(secondBlocksBatch.map(_.body))
peersClient.reply(PeersClient.Response(fakePeer, secondGetBlockBodiesResponse))

// third bodies request after adding checkpoint into the waiting headers queue
val thirdGetBlockBodiesRequest = GetBlockBodies(alternativeSecondBlocksBatch.map(_.hash))
peersClient.expectMsgPF() { case PeersClient.Request(msg, _, _) if msg == thirdGetBlockBodiesRequest => ()}

// third bodies response
val thirdGetBlockBodiesResponse = BlockBodies(alternativeSecondBlocksBatch.map(_.body))
peersClient.reply(PeersClient.Response(fakePeer, thirdGetBlockBodiesResponse))

// We need to wait a while in order to allow fetcher to process all the blocks
system.scheduler.scheduleOnce(Timeouts.shortTimeout) {
importer.send(blockFetcher, PickBlocks(syncConfig.blocksBatchSize * 2))
Expand Down