@ipld/car 4.0.0 → 4.1.2

package/cjs/lib/buffer-writer.js

@@ -0,0 +1,161 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var varint = require('varint');
+var cborg = require('cborg');
+var length = require('cborg/length');
+var CBOR = require('@ipld/dag-cbor');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var varint__default = /*#__PURE__*/_interopDefaultLegacy(varint);
+var CBOR__namespace = /*#__PURE__*/_interopNamespace(CBOR);
+
+class CarBufferWriter {
+  constructor(bytes, headerSize) {
+    this.bytes = bytes;
+    this.byteOffset = headerSize;
+    this.roots = [];
+    this.headerSize = headerSize;
+  }
+  addRoot(root, options) {
+    addRoot(this, root, options);
+    return this;
+  }
+  write(block) {
+    addBlock(this, block);
+    return this;
+  }
+  close(options) {
+    return close(this, options);
+  }
+}
+const addRoot = (writer, root, {
+  resize = false
+} = {}) => {
+  const {bytes, headerSize, byteOffset, roots} = writer;
+  writer.roots.push(root);
+  const size = headerLength(writer);
+  if (size > headerSize) {
+    if (size - headerSize + byteOffset < bytes.byteLength) {
+      if (resize) {
+        resizeHeader(writer, size);
+      } else {
+        roots.pop();
+        throw new RangeError(`Header of size ${ headerSize } has no capacity for new root ${ root }.
+  However there is a space in the buffer and you could call addRoot(root, { resize: root }) to resize header to make a space for this root.`);
+      }
+    } else {
+      roots.pop();
+      throw new RangeError(`Buffer has no capacity for a new root ${ root }`);
+    }
+  }
+};
+const blockLength = ({cid, bytes}) => {
+  const size = cid.bytes.byteLength + bytes.byteLength;
+  return varint__default["default"].encodingLength(size) + size;
+};
+const addBlock = (writer, {cid, bytes}) => {
+  const byteLength = cid.bytes.byteLength + bytes.byteLength;
+  const size = varint__default["default"].encode(byteLength);
+  if (writer.byteOffset + size.length + byteLength > writer.bytes.byteLength) {
+    throw new RangeError('Buffer has no capacity for this block');
+  } else {
+    writeBytes(writer, size);
+    writeBytes(writer, cid.bytes);
+    writeBytes(writer, bytes);
+  }
+};
+const close = (writer, {
+  resize = false
+} = {}) => {
+  const {roots, bytes, byteOffset, headerSize} = writer;
+  const headerBytes = CBOR__namespace.encode({
+    version: 1,
+    roots
+  });
+  const varintBytes = varint__default["default"].encode(headerBytes.length);
+  const size = varintBytes.length + headerBytes.byteLength;
+  const offset = headerSize - size;
+  if (offset === 0) {
+    writeHeader(writer, varintBytes, headerBytes);
+    return bytes.subarray(0, byteOffset);
+  } else if (resize) {
+    resizeHeader(writer, size);
+    writeHeader(writer, varintBytes, headerBytes);
+    return bytes.subarray(0, writer.byteOffset);
+  } else {
+    throw new RangeError(`Header size was overestimated.
+You can use close({ resize: true }) to resize header`);
+  }
+};
+const resizeHeader = (writer, byteLength) => {
+  const {bytes, headerSize} = writer;
+  bytes.set(bytes.subarray(headerSize, writer.byteOffset), byteLength);
+  writer.byteOffset += byteLength - headerSize;
+  writer.headerSize = byteLength;
+};
+const writeBytes = (writer, bytes) => {
+  writer.bytes.set(bytes, writer.byteOffset);
+  writer.byteOffset += bytes.length;
+};
+const writeHeader = ({bytes}, varint, header) => {
+  bytes.set(varint);
+  bytes.set(header, varint.length);
+};
+const headerPreludeTokens = [
+  new cborg.Token(cborg.Type.map, 2),
+  new cborg.Token(cborg.Type.string, 'version'),
+  new cborg.Token(cborg.Type.uint, 1),
+  new cborg.Token(cborg.Type.string, 'roots')
+];
+const CID_TAG = new cborg.Token(cborg.Type.tag, 42);
+const calculateHeaderLength = rootLengths => {
+  const tokens = [...headerPreludeTokens];
+  tokens.push(new cborg.Token(cborg.Type.array, rootLengths.length));
+  for (const rootLength of rootLengths) {
+    tokens.push(CID_TAG);
+    tokens.push(new cborg.Token(cborg.Type.bytes, { length: rootLength + 1 }));
+  }
+  const length$1 = length.tokensToLength(tokens);
+  return varint__default["default"].encodingLength(length$1) + length$1;
+};
+const headerLength = ({roots}) => calculateHeaderLength(roots.map(cid => cid.bytes.byteLength));
+const estimateHeaderLength = (rootCount, rootByteLength = 36) => calculateHeaderLength(new Array(rootCount).fill(rootByteLength));
+const createWriter = (buffer, {roots = [], byteOffset = 0, byteLength = buffer.byteLength, headerSize = headerLength({ roots })} = {}) => {
+  const bytes = new Uint8Array(buffer, byteOffset, byteLength);
+  const writer = new CarBufferWriter(bytes, headerSize);
+  for (const root of roots) {
+    writer.addRoot(root);
+  }
+  return writer;
+};
+
+exports.addBlock = addBlock;
+exports.addRoot = addRoot;
+exports.blockLength = blockLength;
+exports.calculateHeaderLength = calculateHeaderLength;
+exports.close = close;
+exports.createWriter = createWriter;
+exports.estimateHeaderLength = estimateHeaderLength;
+exports.headerLength = headerLength;
+exports.resizeHeader = resizeHeader;

package/cjs/lib/decoder.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var varint = require('varint');
 var cid = require('multiformats/cid');
 var Digest = require('multiformats/hashes/digest');
-var dagCbor = require('@ipld/dag-cbor');
+var CBOR = require('@ipld/dag-cbor');
 var headerValidator = require('./header-validator.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -70,7 +70,7 @@ async function readHeader(reader, strictVersion) {
   }
   const header = await reader.exactly(length);
   reader.seek(length);
-  const block = dagCbor.decode(header);
+  const block = CBOR.decode(header);
   if (!headerValidator.CarHeader(block)) {
     throw new Error('Invalid CAR header format');
   }

package/cjs/lib/encoder.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var varint = require('varint');
-var dagCbor = require('@ipld/dag-cbor');
+var CBOR = require('@ipld/dag-cbor');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var varint__default = /*#__PURE__*/_interopDefaultLegacy(varint);
 
 function createHeader(roots) {
-  const headerBytes = dagCbor.encode({
+  const headerBytes = CBOR.encode({
     version: 1,
     roots
   });
@@ -35,7 +35,7 @@ function createEncoder(writer) {
       }
     },
     async close() {
-      return writer.end();
+      await writer.end();
     }
   };
 }

package/cjs/lib/iterator-channel.js

@@ -34,7 +34,7 @@ function create() {
       ended = true;
       const drainer = makeDrainer();
       outWaitResolver();
-      return drainer;
+      await drainer;
     }
   };
   const iterator = {

package/cjs/node-test/common.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var multiformats = require('multiformats');
 var sha2 = require('multiformats/hashes/sha2');
 var raw = require('multiformats/codecs/raw');
-var dagCbor = require('@ipld/dag-cbor');
+var CBOR = require('@ipld/dag-cbor');
 var dagPb = require('@ipld/dag-pb');
 var chai = require('chai');
 var chaiAsPromised = require('chai-as-promised');
@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 }
 
 var raw__namespace = /*#__PURE__*/_interopNamespace(raw);
-var dagCbor__namespace = /*#__PURE__*/_interopNamespace(dagCbor);
+var CBOR__namespace = /*#__PURE__*/_interopNamespace(CBOR);
 var dagPb__namespace = /*#__PURE__*/_interopNamespace(dagPb);
 var chai__default = /*#__PURE__*/_interopDefaultLegacy(chai);
 var chaiAsPromised__default = /*#__PURE__*/_interopDefaultLegacy(chaiAsPromised);
@@ -101,7 +101,7 @@ async function makeData() {
       cborBlocks.push(await toBlock({
         name: b[0],
         link: b[1]
-      }, dagCbor__namespace));
+      }, CBOR__namespace));
     }
     allBlocks = [
       [

package/cjs/node-test/node-test-large.js

@@ -4,7 +4,7 @@ var fs = require('fs');
 var stream = require('stream');
 var ipldGarbage = require('ipld-garbage');
 var varint = require('varint');
-var dagCbor = require('@ipld/dag-cbor');
+var CBOR = require('@ipld/dag-cbor');
 var sha2 = require('multiformats/hashes/sha2');
 var cid = require('multiformats/cid');
 require('../car.js');
@@ -36,7 +36,7 @@ function _interopNamespace(e) {
 
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var varint__default = /*#__PURE__*/_interopDefaultLegacy(varint);
-var dagCbor__namespace = /*#__PURE__*/_interopNamespace(dagCbor);
+var CBOR__namespace = /*#__PURE__*/_interopNamespace(CBOR);
 
 describe('Large CAR', () => {
   const objects = [];
@@ -45,7 +45,7 @@ describe('Large CAR', () => {
   it('create, no roots', async () => {
     const {writer: writer$1, out} = writer.CarWriter.create([]);
     stream.Readable.from(out).pipe(fs__default["default"].createWriteStream('./test.car'));
-    let offset = dagCbor__namespace.encode({
+    let offset = CBOR__namespace.encode({
       version: 1,
       roots: []
     }).length;
@@ -53,9 +53,9 @@ describe('Large CAR', () => {
     for (let i = 0; i < 500; i++) {
       const obj = ipldGarbage.garbage(1000);
       objects.push(obj);
-      const bytes = dagCbor__namespace.encode(obj);
+      const bytes = CBOR__namespace.encode(obj);
       const hash = await sha2.sha256.digest(bytes);
-      const cid$1 = cid.CID.create(1, dagCbor__namespace.code, hash);
+      const cid$1 = cid.CID.create(1, CBOR__namespace.code, hash);
       cids.push(cid$1.toString());
       const blockLength = bytes.length;
       let length = cid$1.bytes.length + blockLength;
@@ -101,7 +101,7 @@ describe('Large CAR', () => {
     let i = 0;
     for await (const {cid, bytes} of reader$1.blocks()) {
       common.assert.strictEqual(cid.toString(), cids[i], `cid #${ i } ${ cid } <> ${ cids[i] }`);
-      const obj = dagCbor__namespace.decode(bytes);
+      const obj = CBOR__namespace.decode(bytes);
       common.assert.deepStrictEqual(obj, objects[i], `object #${ i }`);
       i++;
     }
@@ -112,7 +112,7 @@ describe('Large CAR', () => {
     let i = 0;
     for await (const {cid, bytes} of reader$1.blocks()) {
       common.assert.strictEqual(cid.toString(), cids[i], `cid #${ i } ${ cid } <> ${ cids[i] }`);
-      const obj = dagCbor__namespace.decode(bytes);
+      const obj = CBOR__namespace.decode(bytes);
       common.assert.deepStrictEqual(obj, objects[i], `object #${ i }`);
       i++;
     }
@@ -123,7 +123,7 @@ describe('Large CAR', () => {
     let i = 0;
     for await (const {cid, bytes} of reader.blocks()) {
       common.assert.strictEqual(cid.toString(), cids[i], `cid #${ i } ${ cid } <> ${ cids[i] }`);
-      const obj = dagCbor__namespace.decode(bytes);
+      const obj = CBOR__namespace.decode(bytes);
       common.assert.deepStrictEqual(obj, objects[i], `object #${ i }`);
       i++;
     }

package/cjs/node-test/test-buffer-writer.js

@@ -0,0 +1,330 @@
+'use strict';
+
+var bufferWriter = require('../lib/buffer-writer.js');
+var reader = require('../lib/reader.js');
+var encoder = require('../lib/encoder.js');
+var common = require('./common.js');
+var multiformats = require('multiformats');
+var CBOR = require('@ipld/dag-cbor');
+var sha2 = require('multiformats/hashes/sha2');
+var identity = require('multiformats/hashes/identity');
+var raw = require('multiformats/codecs/raw');
+var Block = require('multiformats/block');
+
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var CBOR__namespace = /*#__PURE__*/_interopNamespace(CBOR);
+var raw__namespace = /*#__PURE__*/_interopNamespace(raw);
+var Block__namespace = /*#__PURE__*/_interopNamespace(Block);
+
+describe('CarBufferWriter', () => {
+  const cid = multiformats.CID.parse('bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu');
+  describe('calculateHeaderLength', async () => {
+    for (const count of [
+        0,
+        1,
+        10,
+        18,
+        24,
+        48,
+        124,
+        255,
+        258,
+        65536 - 1,
+        65536
+      ]) {
+      it(`calculateHeaderLength(new Array(${ count }).fill(36))`, () => {
+        const roots = new Array(count).fill(cid);
+        const sizes = new Array(count).fill(cid.bytes.byteLength);
+        common.assert.deepEqual(bufferWriter.calculateHeaderLength(sizes), encoder.createHeader(roots).byteLength);
+      });
+      it(`calculateHeaderLength(new Array(${ count }).fill(36))`, () => {
+        const roots = new Array(count).fill(cid);
+        const rootLengths = roots.map(c => c.bytes.byteLength);
+        common.assert.deepEqual(bufferWriter.calculateHeaderLength(rootLengths), encoder.createHeader(roots).byteLength);
+      });
+    }
+    it('estimate on large CIDs', () => {
+      const largeCID = multiformats.CID.parse(`bafkqbbac${ 'a'.repeat(416) }`);
+      common.assert.equal(bufferWriter.calculateHeaderLength([
+        cid.bytes.byteLength,
+        largeCID.bytes.byteLength
+      ]), encoder.createHeader([
+        cid,
+        largeCID
+      ]).byteLength);
+    });
+    it('estimate on large CIDs 2', () => {
+      const largeCID = multiformats.CID.createV1(raw__namespace.code, identity.identity.digest(new Uint8Array(512).fill(1)));
+      common.assert.equal(bufferWriter.calculateHeaderLength([
+        cid.bytes.byteLength,
+        largeCID.bytes.byteLength
+      ]), encoder.createHeader([
+        cid,
+        largeCID
+      ]).byteLength);
+    });
+  });
+  describe('writer', () => {
+    it('estimate header and write blocks', async () => {
+      const headerSize = bufferWriter.estimateHeaderLength(1);
+      const dataSize = 256;
+      const buffer = new ArrayBuffer(headerSize + dataSize);
+      const writer = bufferWriter.createWriter(buffer, { headerSize });
+      const b1 = await Block__namespace.encode({
+        value: { hello: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha256
+      });
+      writer.write(b1);
+      const b2 = await Block__namespace.encode({
+        value: { bye: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha256
+      });
+      writer.write(b2);
+      writer.addRoot(b1.cid);
+      const bytes = writer.close();
+      const reader$1 = await reader.CarReader.fromBytes(bytes);
+      common.assert.deepEqual(await reader$1.getRoots(), [b1.cid]);
+      common.assert.deepEqual(reader$1._blocks, [
+        {
+          cid: b1.cid,
+          bytes: b1.bytes
+        },
+        {
+          cid: b2.cid,
+          bytes: b2.bytes
+        }
+      ]);
+    });
+    it('overestimate header', async () => {
+      const headerSize = bufferWriter.estimateHeaderLength(2);
+      const dataSize = 256;
+      const buffer = new ArrayBuffer(headerSize + dataSize);
+      const writer = bufferWriter.createWriter(buffer, { headerSize });
+      const b1 = await Block__namespace.encode({
+        value: { hello: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha256
+      });
+      writer.write(b1);
+      const b2 = await Block__namespace.encode({
+        value: { bye: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha256
+      });
+      writer.write(b2);
+      writer.addRoot(b1.cid);
+      common.assert.throws(() => writer.close(), /Header size was overestimate/);
+      const bytes = writer.close({ resize: true });
+      const reader$1 = await reader.CarReader.fromBytes(bytes);
+      common.assert.deepEqual(await reader$1.getRoots(), [b1.cid]);
+      common.assert.deepEqual(reader$1._blocks, [
+        {
+          cid: b1.cid,
+          bytes: b1.bytes
+        },
+        {
+          cid: b2.cid,
+          bytes: b2.bytes
+        }
+      ]);
+    });
+    it('underestimate header', async () => {
+      const headerSize = bufferWriter.estimateHeaderLength(2);
+      const dataSize = 300;
+      const buffer = new ArrayBuffer(headerSize + dataSize);
+      const writer = bufferWriter.createWriter(buffer, { headerSize });
+      const b1 = await Block__namespace.encode({
+        value: { hello: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha256
+      });
+      writer.write(b1);
+      writer.addRoot(b1.cid);
+      const b2 = await Block__namespace.encode({
+        value: { bye: 'world' },
+        codec: CBOR__namespace,
+        hasher: sha2.sha512
+      });
+      writer.write(b2);
+      common.assert.throws(() => writer.addRoot(b2.cid), /has no capacity/);
+      writer.addRoot(b2.cid, { resize: true });
+      const bytes = writer.close();
+      const reader$1 = await reader.CarReader.fromBytes(bytes);
+      common.assert.deepEqual(await reader$1.getRoots(), [
+        b1.cid,
+        b2.cid
+      ]);
+      common.assert.deepEqual(reader$1._blocks, [
+        {
+          cid: b1.cid,
+          bytes: b1.bytes
+        },
+        {
+          cid: b2.cid,
+          bytes: b2.bytes
+        }
+      ]);
+    });
+  });
+  it('has no space for the root', async () => {
+    const headerSize = bufferWriter.estimateHeaderLength(1);
+    const dataSize = 100;
+    const buffer = new ArrayBuffer(headerSize + dataSize);
+    const writer = bufferWriter.createWriter(buffer, { headerSize });
+    const b1 = await Block__namespace.encode({
+      value: { hello: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    writer.write(b1);
+    writer.addRoot(b1.cid);
+    const b2 = await Block__namespace.encode({
+      value: { bye: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    writer.write(b2);
+    common.assert.throws(() => writer.addRoot(b2.cid), /Buffer has no capacity for a new root/);
+    common.assert.throws(() => writer.addRoot(b2.cid, { resize: true }), /Buffer has no capacity for a new root/);
+    const bytes = writer.close();
+    const reader$1 = await reader.CarReader.fromBytes(bytes);
+    common.assert.deepEqual(await reader$1.getRoots(), [b1.cid]);
+    common.assert.deepEqual(reader$1._blocks, [
+      {
+        cid: b1.cid,
+        bytes: b1.bytes
+      },
+      {
+        cid: b2.cid,
+        bytes: b2.bytes
+      }
+    ]);
+  });
+  it('has no space for the block', async () => {
+    const headerSize = bufferWriter.estimateHeaderLength(1);
+    const dataSize = 58;
+    const buffer = new ArrayBuffer(headerSize + dataSize);
+    const writer = bufferWriter.createWriter(buffer, { headerSize });
+    const b1 = await Block__namespace.encode({
+      value: { hello: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    writer.write(b1);
+    writer.addRoot(b1.cid);
+    const b2 = await Block__namespace.encode({
+      value: { bye: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    common.assert.throws(() => writer.write(b2), /Buffer has no capacity for this block/);
+    const bytes = writer.close();
+    const reader$1 = await reader.CarReader.fromBytes(bytes);
+    common.assert.deepEqual(await reader$1.getRoots(), [b1.cid]);
+    common.assert.deepEqual(reader$1._blocks, [{
+        cid: b1.cid,
+        bytes: b1.bytes
+      }]);
+  });
+  it('provide roots', async () => {
+    const b1 = await Block__namespace.encode({
+      value: { hello: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    const b2 = await Block__namespace.encode({
+      value: { bye: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha512
+    });
+    const buffer = new ArrayBuffer(300);
+    const writer = bufferWriter.createWriter(buffer, {
+      roots: [
+        b1.cid,
+        b2.cid
+      ]
+    });
+    writer.write(b1);
+    writer.write(b2);
+    const bytes = writer.close();
+    const reader$1 = await reader.CarReader.fromBytes(bytes);
+    common.assert.deepEqual(await reader$1.getRoots(), [
+      b1.cid,
+      b2.cid
+    ]);
+    common.assert.deepEqual(reader$1._blocks, [
+      {
+        cid: b1.cid,
+        bytes: b1.bytes
+      },
+      {
+        cid: b2.cid,
+        bytes: b2.bytes
+      }
+    ]);
+  });
+  it('provide large CID root', async () => {
+    const bytes = new Uint8Array(512).fill(1);
+    const b1 = await Block__namespace.encode({
+      value: { hello: 'world' },
+      codec: CBOR__namespace,
+      hasher: sha2.sha256
+    });
+    const b2 = {
+      cid: multiformats.CID.createV1(raw__namespace.code, identity.identity.digest(bytes)),
+      bytes
+    };
+    const headerSize = CBOR__namespace.encode({
+      version: 1,
+      roots: [
+        b1.cid,
+        b2.cid
+      ]
+    }).byteLength;
+    const bodySize = bufferWriter.blockLength(b1) + bufferWriter.blockLength(b2);
+    const varintSize = multiformats.varint.encodingLength(headerSize);
+    const writer = bufferWriter.createWriter(new ArrayBuffer(varintSize + headerSize + bodySize), {
+      roots: [
+        b1.cid,
+        b2.cid
+      ]
+    });
+    writer.write(b1);
+    writer.write(b2);
+    const car = writer.close();
+    const reader$1 = await reader.CarReader.fromBytes(car);
+    common.assert.deepEqual(await reader$1.getRoots(), [
+      b1.cid,
+      b2.cid
+    ]);
+    common.assert.deepEqual(reader$1._blocks, [
+      {
+        cid: b1.cid,
+        bytes: b1.bytes
+      },
+      {
+        cid: b2.cid,
+        bytes: b2.bytes
+      }
+    ]);
+  });
+});

package/cjs/node-test/test-errors.js

@@ -1,13 +1,13 @@
 'use strict';
 
 var multiformats = require('multiformats');
-var dagCbor = require('@ipld/dag-cbor');
+var CBOR = require('@ipld/dag-cbor');
 var varint = require('varint');
 var reader = require('../lib/reader.js');
 var common = require('./common.js');
 
 function makeHeader(block) {
-  const u = dagCbor.encode(block);
+  const u = CBOR.encode(block);
   const l = varint.encode(u.length);
   const u2 = new Uint8Array(u.length + l.length);
   u2.set(l, 0);

package/cjs/node-test/test-indexer.js

@@ -19,7 +19,7 @@ describe('CarIndexer fromBytes()', () => {
     const indexer$1 = await indexer.CarIndexer.fromBytes(common.goCarV2Bytes);
     const roots = await indexer$1.getRoots();
     common.assert.strictEqual(roots.length, 1);
-    common.assert(common.goCarV2Roots[0].equals(roots[0]));
+    common.assert.ok(common.goCarV2Roots[0].equals(roots[0]));
     common.assert.strictEqual(indexer$1.version, 2);
     const indexData = [];
     for await (const index of indexer$1) {

package/cjs/node-test/test-reader.js

@@ -76,13 +76,13 @@ describe('CarReader fromBytes()', () => {
     const reader$1 = await reader.CarReader.fromBytes(common.goCarV2Bytes);
     const roots = await reader$1.getRoots();
     common.assert.strictEqual(roots.length, 1);
-    common.assert(common.goCarV2Roots[0].equals(roots[0]));
+    common.assert.ok(common.goCarV2Roots[0].equals(roots[0]));
     common.assert.strictEqual(reader$1.version, 2);
     for (const {cid} of common.goCarV2Index) {
       const block = await reader$1.get(cid);
       common.assert.isDefined(block);
       if (block) {
-        common.assert(cid.equals(block.cid));
+        common.assert.ok(cid.equals(block.cid));
         let content;
         if (cid.code === dagPb__namespace.code) {
           content = dagPb__namespace.decode(block.bytes);

package/cjs/node-test/test-writer.js

@@ -182,9 +182,9 @@ describe('CarWriter', () => {
     const rawBytes = await append(0);
     const pbBytes = await append(1);
     const cborBytes = await append(2);
-    common.assert(rawBytes.length > 0);
-    common.assert(pbBytes.length > 0);
-    common.assert(cborBytes.length > 0);
+    common.assert.ok(rawBytes.length > 0);
+    common.assert.ok(pbBytes.length > 0);
+    common.assert.ok(cborBytes.length > 0);
     const reassembled = concatBytes([
       headerBytes,
       rawBytes,