logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-02-26 16:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implements out-of-range check for slot index

Browse Source
This commit is contained in:
benbierens 2023-11-22 14:33:20 +01:00 committed by Dmitriy Ryajov
parent b17202c8a7
commit 975d4ce65f
No known key found for this signature in database
GPG Key ID: DA8C680CE7C657A4
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
codex/proof/slotblocks.nim
View File

@ -32,12 +32,21 @@ proc getIndexForSlotBlock*(slot: Slot, blockSize: NBytes, slotBlockIndex: int):
blocksInSlot = slotSize div blockSize.uint64
slotIndex = slot.slotIndex.truncate(uint64)
return (slotIndex * blocksInSlot) + slotBlockIndex.uint64
datasetIndex = (slotIndex * blocksInSlot) + slotBlockIndex.uint64
trace "Converted slotBlockIndex to datasetIndex", slotBlockIndex, datasetIndex
return datasetIndex
proc getSlotBlock*(slot: Slot, blockstore: BlockStore, slotBlockIndex: int): Future[?!Block] {.async.} =
without manifest =? (await getManifestForSlot(slot, blockstore)), err:
error "Failed to get manifest for slot"
return failure(err)
let datasetIndex = getIndexForSlotBlock(slot, manifest.blockSize, slotBlockIndex)
let
blocksInManifest = (manifest.datasetSize div manifest.blockSize).uint64
datasetIndex = getIndexForSlotBlock(slot, manifest.blockSize, slotBlockIndex)
if datasetIndex >= blocksInManifest:
return failure("Found slotBlockIndex that is out-of-range: " & $datasetIndex)
return await blockstore.getBlock(manifest.treeCid, datasetIndex)

30
tests/codex/proof/testslotblocks.nim
View File

@ -1,25 +1,12 @@
import std/os
import std/strutils
import std/sequtils
import std/sugar
import pkg/questionable
import pkg/questionable/results
import pkg/constantine/math/arithmetic
import pkg/poseidon2/types
import pkg/poseidon2
import pkg/chronos
import pkg/asynctest
import pkg/stew/byteutils
import pkg/stew/endians2
import pkg/datastore
import pkg/codex/rng
import pkg/codex/stores/cachestore
import pkg/codex/chunker
import pkg/codex/stores
import pkg/codex/blocktype as bt
import pkg/codex/clock
import pkg/codex/utils/asynciter
import pkg/codex/contracts/requests
import pkg/codex/contracts
import pkg/codex/merkletree
@ -31,7 +18,7 @@ import ../examples
let
bytesPerBlock = 64 * 1024
numberOfSlotBlocks = 16
numberOfSlotBlocks = 4
slotIndex = 3
asyncchecksuite "Test slotblocks - manifest":
@ -157,11 +144,11 @@ asyncchecksuite "Test slotblocks - slot blocks by index":
check:
getIndex(0) == getExpected(0)
getIndex(0) == 48
getIndex(0) == 12
getIndex(1) == getExpected(1)
getIndex(1) == 49
getIndex(1) == 13
getIndex(10) == getExpected(10)
getIndex(10) == 58
getIndex(10) == 22
test "Can get slot block by index":
proc getBlocks(i: int): Future[(bt.Block, bt.Block)] {.async.} =
@ -185,3 +172,12 @@ asyncchecksuite "Test slotblocks - slot blocks by index":
slotBlockLast5.data == expectedBlockLast5.data
slotBlockLast.cid == expectedBlockLast.cid
slotBlockLast.data == expectedBlockLast.data
test "Can fail to get block when index is out of range":
let
b1 = await getSlotBlock(slot, localStore, numberOfSlotBlocks)
b2 = await getSlotBlock(slot, localStore, numberOfSlotBlocks + 1)
check:
b1.isErr
b2.isErr