From 546ec7058915b60a5bbd0c24f42384af467b1cea Mon Sep 17 00:00:00 2001
From: Bulat-Ziganshin <bulat.ziganshin@gmail.com>
Date: Sat, 27 Aug 2022 18:41:38 +0300
Subject: [PATCH] Manifest: renamed operations to
 addProtection/removeProtection

---
 codex/erasure/erasure.nim    |  4 ++--
 codex/manifest/manifest.nim  | 14 ++++++--------
 tests/codex/testmanifest.nim |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/codex/erasure/erasure.nim b/codex/erasure/erasure.nim
index 317d2ff2..3eff7a02 100644
--- a/codex/erasure/erasure.nim
+++ b/codex/erasure/erasure.nim
@@ -82,7 +82,7 @@ proc encode*(
     parity       = parity
 
   trace "Erasure coding manifest", blocks, parity
-  without var encoded =? Manifest.new(manifest, blocks, parity), error:
+  without var encoded =? manifest.addProtection(blocks, parity), error:
     trace "Unable to create manifest", msg = error.msg
     return error.failure
 
@@ -253,7 +253,7 @@ proc decode*(
   finally:
     decoder.release()
 
-  without decoded =? encoded.unprotect(blocks = encoded.blocks[0..<encoded.originalLen]), error:
+  without decoded =? encoded.removeProtection(), error:
     return failure error
 
   return success decoded
diff --git a/codex/manifest/manifest.nim b/codex/manifest/manifest.nim
index 53fb86c6..8a4454b5 100644
--- a/codex/manifest/manifest.nim
+++ b/codex/manifest/manifest.nim
@@ -204,11 +204,10 @@ proc new*(
     originalBytes: blocks.len * blockSize,
     protected: protected).success
 
-proc new*(
-  T: type Manifest,
+proc addProtection*(
   manifest: Manifest,
   K, M: int): ?!Manifest =
-  ## Create an erasure protected dataset from an unprotected one
+  ## Create an erasure protected dataset manifest from an unprotected one
   ##
 
   ? manifest.verify()
@@ -238,11 +237,10 @@ proc new*(
   ? self.verify()
   self.success
 
-proc unprotect*(
-  manifest: Manifest,
-  blocks: openArray[Cid] = []
+proc removeProtection*(
+  manifest: Manifest
   ): ?!Manifest =
-  ## Create an unprotected dataset from an erasure protected one
+  ## Create an unprotected dataset manifest from an erasure protected one
   ##
 
   ? manifest.verify()
@@ -250,7 +248,7 @@ proc unprotect*(
     return failure newException(CodexError, "Trying to unprotect already non-protected manifest")
 
   var self = copyAllScalarFields(manifest, protected = false)
-  self.blocks = @blocks
+  self.blocks = manifest.blocks[0..<manifest.originalLen]
 
   ? self.verify()
   self.success
diff --git a/tests/codex/testmanifest.nim b/tests/codex/testmanifest.nim
index 7cd43b6e..48a01d7a 100644
--- a/tests/codex/testmanifest.nim
+++ b/tests/codex/testmanifest.nim
@@ -63,7 +63,7 @@ suite "Manifest":
         Block.new(("Block " & $it).toBytes).tryGet().cid
       )
       manifest = Manifest.new(blocks).tryGet()
-      protected = Manifest.new(manifest, 2, 2).tryGet()
+      protected = manifest.addProtection(2, 2).tryGet()
 
     check:
         protected.originalCid == manifest.cid.tryGet()