Merge branch 'master' into feature/ceremony-files
This commit is contained in:
commit
3c17e130ca
|
@ -11,6 +11,7 @@ env:
|
|||
nim_version: v1.6.14
|
||||
rust_version: 1.78.0
|
||||
binary_base: codex
|
||||
nim_flags: '-d:verify_circuit=true'
|
||||
upload_to_codex: false
|
||||
|
||||
jobs:
|
||||
|
@ -74,7 +75,7 @@ jobs:
|
|||
|
||||
- name: Release - Build
|
||||
run: |
|
||||
make NIMFLAGS="--out:${{ env.binary }}"
|
||||
make NIMFLAGS="--out:${{ env.binary }} ${{ env.nim_flags }}"
|
||||
|
||||
- name: Release - Upload binaries
|
||||
uses: actions/upload-artifact@v4
|
||||
|
|
|
@ -240,14 +240,14 @@ proc streamEntireDataset(
|
|||
self: CodexNodeRef,
|
||||
manifest: Manifest,
|
||||
manifestCid: Cid,
|
||||
): ?!LPStream =
|
||||
): Future[?!LPStream] {.async.} =
|
||||
## Streams the contents of the entire dataset described by the manifest.
|
||||
##
|
||||
trace "Retrieving blocks from manifest", manifestCid
|
||||
|
||||
if manifest.protected:
|
||||
# Retrieve, decode and save to the local store all EС groups
|
||||
proc erasureJob(): Future[void] {.async.} =
|
||||
proc erasureJob(): Future[?!void] {.async.} =
|
||||
try:
|
||||
# Spawn an erasure decoding job
|
||||
let
|
||||
|
@ -258,10 +258,16 @@ proc streamEntireDataset(
|
|||
self.taskpool)
|
||||
without _ =? (await erasure.decode(manifest)), error:
|
||||
trace "Unable to erasure decode manifest", manifestCid, exc = error.msg
|
||||
except CatchableError as exc:
|
||||
# --------------------------------------------------------------------------
|
||||
# FIXME this is a HACK so that the node does not crash during the workshop.
|
||||
# We should NOT catch Defect.
|
||||
except Exception as exc:
|
||||
trace "Exception decoding manifest", manifestCid, exc = exc.msg
|
||||
return failure(exc.msg)
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
asyncSpawn erasureJob()
|
||||
if err =? (await erasureJob()).errorOption:
|
||||
return failure(err)
|
||||
|
||||
# Retrieve all blocks of the dataset sequentially from the local store or network
|
||||
trace "Creating store stream for manifest", manifestCid
|
||||
|
@ -283,7 +289,7 @@ proc retrieve*(
|
|||
|
||||
return await self.streamSingleBlock(cid)
|
||||
|
||||
self.streamEntireDataset(manifest, cid)
|
||||
await self.streamEntireDataset(manifest, cid)
|
||||
|
||||
proc store*(
|
||||
self: CodexNodeRef,
|
||||
|
|
Loading…
Reference in New Issue