codex-storage/nim-codex
1
0
Fork 0
mirror of https://github.com/codex-storage/nim-codex.git synced 2025-03-04 06:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove getMHash

Browse Source
This commit is contained in:
Dmitriy Ryajov 2023-12-22 17:14:18 -06:00
parent e68073966f
commit b5051b1421
No known key found for this signature in database
GPG Key ID: DA8C680CE7C657A4
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
codex/merkletree/codex/codex.nim
View File

@ -42,12 +42,12 @@ type
ByteProof* = MerkleProof[ByteHash, ByteTreeKey]
CodexTree* = ref object of ByteTree
mhash: MHash
mcodec*: MultiCodec
CodexProof* = ref object of ByteProof
mhash: MHash
mcodec*: MultiCodec
func getMhash*(mcodec: MultiCodec): ?!MHash =
func mhash*(mcodec: MultiCodec): ?!MHash =
let
mhash = CodeHashes.getOrDefault(mcodec)
@ -62,21 +62,15 @@ func digestSize*(self: (CodexTree or CodexProof)): int =
self.mhash.size
func mcodec*(self: (CodexTree or CodexProof)): MultiCodec =
## Multicodec
##
self.mhash.mcodec
func bytes*(mhash: MultiHash): seq[byte] =
## Extract hash bytes
func digestBytes*(mhash: MultiHash): seq[byte] =
## Extract hash digestBytes
##
mhash.data.buffer[mhash.dpos..<mhash.dpos + mhash.size]
func getProof*(self: CodexTree, index: int): ?!CodexProof =
var
proof = CodexProof(mhash: self.mhash)
proof = CodexProof(mcodec: self.mcodec)
? self.getProof(index, proof)
@ -87,8 +81,8 @@ func verify*(self: CodexProof, leaf: MultiHash, root: MultiHash): ?!void =
##
let
rootBytes = root.bytes
leafBytes = leaf.bytes
rootBytes = root.digestBytes
leafBytes = leaf.digestBytes
if self.mcodec != root.mcodec or
self.mcodec != leaf.mcodec:
@ -165,7 +159,7 @@ func init*(
return failure "Empty leaves"
let
mhash = ? mcodec.getMhash()
mhash = ? mcodec.mhash()
compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!ByteHash {.noSideEffect.} =
compress(x, y, key, mhash)
Zero: ByteHash = newSeq[byte](mhash.size)
@ -174,7 +168,7 @@ func init*(
return failure "Invalid hash length"
var
self = CodexTree(mhash: mhash, compress: compressor, zero: Zero)
self = CodexTree(mcodec: mcodec, compress: compressor, zero: Zero)
self.layers = ? merkleTreeWorker(self, leaves, isBottomLayer = true)
success self
@ -188,7 +182,7 @@ func init*(
let
mcodec = leaves[0].mcodec
leaves = leaves.mapIt( it.bytes )
leaves = leaves.mapIt( it.digestBytes )
CodexTree.init(mcodec, leaves)
@ -200,7 +194,7 @@ func init*(
let
mcodec = (? leaves[0].mhash.mapFailure).mcodec
leaves = leaves.mapIt( (? it.mhash.mapFailure).bytes )
leaves = leaves.mapIt( (? it.mhash.mapFailure).digestBytes )
CodexTree.init(mcodec, leaves)
@ -214,7 +208,7 @@ proc fromNodes*(
return failure "Empty nodes"
let
mhash = ? mcodec.getMhash()
mhash = ? mcodec.mhash()
Zero = newSeq[byte](mhash.size)
compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!ByteHash {.noSideEffect.} =
compress(x, y, key, mhash)
@ -223,7 +217,7 @@ proc fromNodes*(
return failure "Invalid hash length"
var
self = CodexTree(compress: compressor, zero: Zero, mhash: mhash)
self = CodexTree(compress: compressor, zero: Zero, mcodec: mcodec)
layer = nleaves
pos = 0
@ -250,16 +244,15 @@ func init*(
return failure "Empty nodes"
let
mhash = ? mcodec.getMhash()
mhash = ? mcodec.mhash()
Zero = newSeq[byte](mhash.size)
compressor = proc(x, y: seq[byte], key: ByteTreeKey): ?!seq[byte] {.noSideEffect.} =
compress(x, y, key, mhash)
success CodexProof(
compress: compressor,
zero: Zero,
mhash: mhash,
mcodec: mcodec,
index: index,
nleaves: nleaves,
path: @nodes)