mirror of
https://github.com/logos-storage/logos-storage-nim.git
synced 2026-01-03 22:13:12 +00:00
1cac3e2a11
* cleanup imports and logs * add BlockHandle type * revert deps * refactor: async error handling and future tracking improvements - Update async procedures to use explicit raises annotation - Modify TrackedFutures to handle futures with no raised exceptions - Replace `asyncSpawn` with explicit future tracking - Update test suites to use `unittest2` - Standardize error handling across network and async components - Remove deprecated error handling patterns This commit introduces a more robust approach to async error handling and future management, improving type safety and reducing potential runtime errors. * bump nim-serde * remove asyncSpawn * rework background downloads and prefetch * imporove logging * refactor: enhance async procedures with error handling and raise annotations * misc cleanup * misc * refactor: implement allFinishedFailed to aggregate future results with success and failure tracking * refactor: update error handling in reader procedures to raise ChunkerError and CancelledError * refactor: improve error handling in wantListHandler and accountHandler procedures * refactor: simplify LPStreamReadError creation by consolidating parameters * refactor: enhance error handling in AsyncStreamWrapper to catch unexpected errors * refactor: enhance error handling in advertiser and discovery loops to improve resilience * misc * refactor: improve code structure and readability * remove cancellation from addSlotToQueue * refactor: add assertion for unexpected errors in local store checks * refactor: prevent tracking of finished futures and improve test assertions * refactor: improve error handling in local store checks * remove usage of msgDetail * feat: add initial implementation of discovery engine and related components * refactor: improve task scheduling logic by removing unnecessary break statement * break after scheduling a task * make taskHandler cancelable * refactor: update async handlers to raise CancelledError * refactor(advertiser): streamline error handling and improve task flow in advertise loops * fix: correct spelling of "divisible" in error messages and comments * refactor(discovery): simplify discovery task loop and improve error handling * refactor(engine): filter peers before processing in cancelBlocks procedure
101 lines
2.6 KiB
Nim
101 lines
2.6 KiB
Nim
import pkg/chronos
|
|
import pkg/libp2p/routing_record
|
|
import pkg/codexdht/discv5/protocol as discv5
|
|
|
|
import pkg/codex/blockexchange
|
|
import pkg/codex/stores
|
|
import pkg/codex/chunker
|
|
import pkg/codex/discovery
|
|
import pkg/codex/blocktype as bt
|
|
import pkg/codex/manifest
|
|
|
|
import ../../../asynctest
|
|
import ../../helpers
|
|
import ../../helpers/mockdiscovery
|
|
import ../../examples
|
|
|
|
asyncchecksuite "Advertiser":
|
|
var
|
|
blockDiscovery: MockDiscovery
|
|
localStore: BlockStore
|
|
advertiser: Advertiser
|
|
advertised: seq[Cid]
|
|
let
|
|
manifest = Manifest.new(
|
|
treeCid = Cid.example, blockSize = 123.NBytes, datasetSize = 234.NBytes
|
|
)
|
|
manifestBlk =
|
|
Block.new(data = manifest.encode().tryGet(), codec = ManifestCodec).tryGet()
|
|
|
|
setup:
|
|
blockDiscovery = MockDiscovery.new()
|
|
localStore = CacheStore.new()
|
|
|
|
advertised = newSeq[Cid]()
|
|
blockDiscovery.publishBlockProvideHandler = proc(
|
|
d: MockDiscovery, cid: Cid
|
|
) {.async: (raises: [CancelledError]), gcsafe.} =
|
|
advertised.add(cid)
|
|
|
|
advertiser = Advertiser.new(localStore, blockDiscovery)
|
|
|
|
await advertiser.start()
|
|
|
|
teardown:
|
|
await advertiser.stop()
|
|
|
|
proc waitTillQueueEmpty() {.async.} =
|
|
check eventually advertiser.advertiseQueue.len == 0
|
|
|
|
test "blockStored should queue manifest Cid for advertising":
|
|
(await localStore.putBlock(manifestBlk)).tryGet()
|
|
|
|
await waitTillQueueEmpty()
|
|
|
|
check:
|
|
manifestBlk.cid in advertised
|
|
|
|
test "blockStored should queue tree Cid for advertising":
|
|
(await localStore.putBlock(manifestBlk)).tryGet()
|
|
|
|
await waitTillQueueEmpty()
|
|
|
|
check:
|
|
manifest.treeCid in advertised
|
|
|
|
test "blockStored should not queue non-manifest non-tree CIDs for discovery":
|
|
let blk = bt.Block.example
|
|
|
|
(await localStore.putBlock(blk)).tryGet()
|
|
|
|
await waitTillQueueEmpty()
|
|
|
|
check:
|
|
blk.cid notin advertised
|
|
|
|
test "Should not queue if there is already an inflight advertise request":
|
|
(await localStore.putBlock(manifestBlk)).tryGet()
|
|
(await localStore.putBlock(manifestBlk)).tryGet()
|
|
|
|
await waitTillQueueEmpty()
|
|
|
|
check eventually advertised.len == 2
|
|
check manifestBlk.cid in advertised
|
|
check manifest.treeCid in advertised
|
|
|
|
test "Should advertise existing manifests and their trees":
|
|
let newStore = CacheStore.new([manifestBlk])
|
|
|
|
await advertiser.stop()
|
|
advertiser = Advertiser.new(newStore, blockDiscovery)
|
|
await advertiser.start()
|
|
|
|
check eventually manifestBlk.cid in advertised
|
|
check eventually manifest.treeCid in advertised
|
|
|
|
test "Stop should clear onBlockStored callback":
|
|
await advertiser.stop()
|
|
|
|
check:
|
|
localStore.onBlockStored.isNone()
|