status-im
/
nim-dagger
mirror of https://github.com/status-im/nim-dagger.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes raceconditions in testadvertiser (#1008)

This commit is contained in:
Ben Bierens 2024-12-05 10:30:01 +01:00 committed by GitHub
parent 8e29939cf8
commit f51eae30fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/codex/blockexchange/engine/testadvertiser.nim
View File

@ -22,6 +22,7 @@ asyncchecksuite "Advertiser":
blockDiscovery: MockDiscovery blockDiscovery: MockDiscovery
localStore: BlockStore localStore: BlockStore
advertiser: Advertiser advertiser: Advertiser
advertised: seq[Cid]
let let
manifest = Manifest.new( manifest = Manifest.new(
treeCid = Cid.example, treeCid = Cid.example,
@ -33,6 +34,11 @@ asyncchecksuite "Advertiser":
blockDiscovery = MockDiscovery.new() blockDiscovery = MockDiscovery.new()
localStore = CacheStore.new() localStore = CacheStore.new()
advertised = newSeq[Cid]()
blockDiscovery.publishBlockProvideHandler =
proc(d: MockDiscovery, cid: Cid) {.async, gcsafe.} =
advertised.add(cid)
advertiser = Advertiser.new( advertiser = Advertiser.new(
localStore, localStore,
blockDiscovery blockDiscovery
@ -43,47 +49,44 @@ asyncchecksuite "Advertiser":
teardown: teardown:
await advertiser.stop() await advertiser.stop()
proc waitTillQueueEmpty() {.async.} =
check eventually advertiser.advertiseQueue.len == 0
test "blockStored should queue manifest Cid for advertising": test "blockStored should queue manifest Cid for advertising":
(await localStore.putBlock(manifestBlk)).tryGet() (await localStore.putBlock(manifestBlk)).tryGet()
await waitTillQueueEmpty()
check: check:
manifestBlk.cid in advertiser.advertiseQueue manifestBlk.cid in advertised
test "blockStored should queue tree Cid for advertising": test "blockStored should queue tree Cid for advertising":
(await localStore.putBlock(manifestBlk)).tryGet() (await localStore.putBlock(manifestBlk)).tryGet()
await waitTillQueueEmpty()
check: check:
manifest.treeCid in advertiser.advertiseQueue manifest.treeCid in advertised
test "blockStored should not queue non-manifest non-tree CIDs for discovery": test "blockStored should not queue non-manifest non-tree CIDs for discovery":
let blk = bt.Block.example let blk = bt.Block.example
(await localStore.putBlock(blk)).tryGet() (await localStore.putBlock(blk)).tryGet()
await waitTillQueueEmpty()
check: check:
blk.cid notin advertiser.advertiseQueue blk.cid notin advertised
test "Should not queue if there is already an inflight advertise request": test "Should not queue if there is already an inflight advertise request":
var
reqs = newFuture[void]()
manifestCount = 0
treeCount = 0
blockDiscovery.publishBlockProvideHandler =
proc(d: MockDiscovery, cid: Cid) {.async, gcsafe.} =
if cid == manifestBlk.cid:
inc manifestCount
if cid == manifest.treeCid:
inc treeCount
await reqs # queue the request
(await localStore.putBlock(manifestBlk)).tryGet() (await localStore.putBlock(manifestBlk)).tryGet()
(await localStore.putBlock(manifestBlk)).tryGet() (await localStore.putBlock(manifestBlk)).tryGet()
reqs.complete() await waitTillQueueEmpty()
check eventually manifestCount == 1
check eventually treeCount == 1 check eventually advertised.len == 2
check manifestBlk.cid in advertised
check manifest.treeCid in advertised
test "Should advertise existing manifests and their trees": test "Should advertise existing manifests and their trees":
let let
@ -96,8 +99,8 @@ asyncchecksuite "Advertiser":
) )
await advertiser.start() await advertiser.start()
check eventually manifestBlk.cid in advertiser.advertiseQueue check eventually manifestBlk.cid in advertised
check eventually manifest.treeCid in advertiser.advertiseQueue check eventually manifest.treeCid in advertised
test "Stop should clear onBlockStored callback": test "Stop should clear onBlockStored callback":
await advertiser.stop() await advertiser.stop()