fix merge conflict

This commit is contained in:
Mark Spanbroek 2024-02-28 16:42:06 +01:00
parent 5e9307204a
commit 8a6155dddb
No known key found for this signature in database
GPG Key ID: FBE3E9548D427C00
1 changed files with 1 additions and 1 deletions

View File

@ -278,7 +278,7 @@ asyncchecksuite "NetworkStore - multiple nodes":
# As soon as we connect the downloader to the blockHolder, the block should
# propagate to the downloader...
await connectNodes(@[downloader, blockHolder])
check (await blockRequest).cid == aBlock.cid
check (await blockRequest).tryGet().cid == aBlock.cid
check (await downloader.engine.localStore.hasBlock(aBlock.cid)).tryGet()
# ... and the bystander should have cancelled the want-have