codex-storage/nim-codex
1
0
Fork 0
mirror of https://github.com/codex-storage/nim-codex.git synced 2025-02-26 19:40:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Used copyAllScalarFields when building unprotected Manifest from a protected one

Browse Source
This commit is contained in:
Bulat-Ziganshin 2022-08-26 04:21:23 +03:00
parent 2dc5b18da2
commit 105d02993b
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
codex/erasure/erasure.nim
View File

@ -156,8 +156,7 @@ proc encode*(
proc decode*( proc decode*(
self: Erasure, self: Erasure,
encoded: Manifest): Future[?!Manifest] {.async.} = encoded: Manifest): Future[?!Manifest] {.async.} =
## Decode a protected manifest into it's original ## Decode a protected manifest into its original manifest
## manifest
## ##
## `encoded` - the encoded (protected) manifest to ## `encoded` - the encoded (protected) manifest to
## be recovered ## be recovered
@ -254,10 +253,10 @@ proc decode*(
finally: finally:
decoder.release() decoder.release()
without decoded =? Manifest.new(blocks = encoded.blocks[0..<encoded.originalLen]), error: without decoded =? encoded.unprotect(blocks = encoded.blocks[0..<encoded.originalLen]), error:
return error.failure return failure error
return decoded.success return success decoded
proc start*(self: Erasure) {.async.} = proc start*(self: Erasure) {.async.} =
return return

35
codex/manifest/manifest.nim
View File

@ -153,7 +153,10 @@ proc cid*(self: Manifest): ?!Cid =
# Constructors # Constructors
############################################################ ############################################################
func copyAllScalarFields(original: Manifest): Manifest = func copyAllScalarFields(
original: Manifest,
protected: bool
): Manifest =
# Sometimes we need to copy all but a few fields # Sometimes we need to copy all but a few fields
# from a manifest to another one. # from a manifest to another one.
# It can be mplemented by copying all fields and then # It can be mplemented by copying all fields and then
@ -169,9 +172,9 @@ func copyAllScalarFields(original: Manifest): Manifest =
version: original.version, version: original.version,
hcodec: original.hcodec, hcodec: original.hcodec,
codec: original.codec, codec: original.codec,
protected: original.protected) protected: protected)
if original.protected: if copy.protected and original.protected:
copy.K = original.K copy.K = original.K
copy.M = original.M copy.M = original.M
copy.originalCid = original.originalCid copy.originalCid = original.originalCid
@ -187,7 +190,7 @@ proc new*(
hcodec = multiCodec("sha2-256"), hcodec = multiCodec("sha2-256"),
codec = multiCodec("raw"), codec = multiCodec("raw"),
blockSize = BlockSize): ?!T = blockSize = BlockSize): ?!T =
## Create a manifest using array of `Cid`s ## Create a dataset from an array of `Cid`s
## ##
if hcodec notin EmptyDigests[version]: if hcodec notin EmptyDigests[version]:
@ -205,16 +208,14 @@ proc new*(
T: type Manifest, T: type Manifest,
manifest: Manifest, manifest: Manifest,
K, M: int): ?!Manifest = K, M: int): ?!Manifest =
## Create an erasure protected dataset from an ## Create an erasure protected dataset from an unprotected one
## un-protected one
## ##
? manifest.verify() ? manifest.verify()
if manifest.protected: if manifest.protected:
return failure newException(CodexError, "Trying to protect already protected manifest") return failure newException(CodexError, "Trying to protect already protected manifest")
var self = copyAllScalarFields(manifest) var self = copyAllScalarFields(manifest, protected = true)
self.protected = true
self.K = K self.K = K
self.M = M self.M = M
self.originalCid = ? manifest.cid self.originalCid = ? manifest.cid
@ -237,6 +238,24 @@ proc new*(
? self.verify() ? self.verify()
self.success self.success
proc unprotect*(
manifest: Manifest,
blocks: openArray[Cid] = []
): ?!Manifest =
## Create an unprotected dataset from an erasure protected one
##
? manifest.verify()
if not manifest.protected:
return failure newException(CodexError, "Trying to unprotect already non-protected manifest")
var self = copyAllScalarFields(manifest, protected = false)
self.blocks = @blocks
? self.verify()
self.success
proc new*( proc new*(
T: type Manifest, T: type Manifest,
data: openArray[byte], data: openArray[byte],