fix: create CIDv1 for raw blocks even if cidv is 0

ipld · Mar 9, 2022 · 9afb665 · 9afb665
1 parent 0ffb39b
commit 9afb665
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/file/layout/trickle.js b/src/file/layout/trickle.js
@@ -1,4 +1,5 @@
 import * as Layout from "./api.js"
+import * as Chunker from "../chunker/api.js"
 
 /**
  * @typedef {{
@@ -60,7 +61,7 @@ export const open = options => ({
 
 /**
  * @param {Trickle} state
- * @param {Uint8Array[]} leaves
+ * @param {Chunker.Buffer[]} leaves
  * @returns {Layout.WriteResult<Trickle>}
  */
 export const write = (state, leaves) => {

diff --git a/src/file/writer.js b/src/file/writer.js
@@ -4,7 +4,7 @@ import * as Layout from "./layout/api.js"
 import * as UnixFS from "../lib.js"
 import * as Channel from "../writer/channel.js"
 import * as Chunker from "./chunker.js"
-import { panic, unreachable, defer } from "../writer/util.js"
+import { panic, unreachable } from "../writer/util.js"
 import * as Queue from "./layout/queue.js"
 
 /**

diff --git a/test/matrix.js b/test/matrix.js
@@ -60,14 +60,21 @@ export const parseConfig = async input => {
     fileEncoder: UnixFS,
     hasher: sha256,
     fileLayout: input.trickle ? Trickle : Balanced,
-    createCID: CID.create.bind(CID, /** @type {0|1} */ (input.cidVersion)),
+    createCID: input.cidVersion === 0 ? createCIDv0 : CID.createV1,
     chunkerConfig: input.chunker,
     chunker: await parseChunker(input.chunker),
     cid: CID.parse(input.cid),
     cmd: input.cmd,
   }
 }
 
+/**
+ * @param {number} code
+ * @param {API.MultihashDigest} hash
+ * @returns
+ */
+const createCIDv0 = (code, hash) =>
+  code === UnixFS.code ? CID.createV0(hash) : CID.createV1(code, hash)
 /**
  * @param {string} input
  */