chore: fix interop tests

Author: achingbrain

packages/ipfs-core/package.json

@@ -65,7 +65,7 @@
     "debug": "^4.1.1",
     "dlv": "^1.1.3",
     "err-code": "^2.0.3",
-    "hamt-sharding": "^1.0.0",
+    "hamt-sharding": "ipfs-shipyard/js-hamt-sharding#feat/add-types",
     "hashlru": "^2.3.0",
     "interface-datastore": "^3.0.3",
     "ipfs-bitswap": "^4.0.2",

packages/ipfs-core/src/components/files/utils/add-link.js

@@ -8,6 +8,7 @@ const CID = require('cids')
 const log = require('debug')('ipfs:mfs:core:utils:add-link')
 const UnixFS = require('ipfs-unixfs')
 const DirSharded = require('ipfs-unixfs-importer/src/dir-sharded')
+const defaultImporterOptions = require('ipfs-unixfs-importer/src/options')
 const {
   updateHamtDirectory,
   recreateHamtLevel,
@@ -153,6 +154,7 @@ const addFileToShardedDirectory = async (context, options) => {
   // start at the root bucket and descend, loading nodes as we go
   const rootBucket = await recreateHamtLevel(options.parent.Links)
   const node = UnixFS.unmarshal(options.parent.Data)
+  const importerOptions = defaultImporterOptions()
 
   const shard = new DirSharded({
     root: true,
@@ -163,7 +165,11 @@ const addFileToShardedDirectory = async (context, options) => {
     dirty: true,
     flat: false,
     mode: node.mode
-  }, options)
+  }, {
+    hamtHashFn: importerOptions.hamtHashFn,
+    hamtBucketBits: importerOptions.hamtBucketBits,
+    ...options
+  })
   shard._bucket = rootBucket
 
   if (node.mtime) {

packages/ipfs-core/src/components/files/utils/hamt-utils.js

@@ -3,23 +3,29 @@
 const {
   DAGNode
 } = require('ipld-dag-pb')
-const Bucket = require('hamt-sharding/src/bucket')
+const {
+  Bucket,
+  createHAMT
+} = require('hamt-sharding')
 const DirSharded = require('ipfs-unixfs-importer/src/dir-sharded')
+const defaultImporterOptions = require('ipfs-unixfs-importer/src/options')
 const log = require('debug')('ipfs:mfs:core:utils:hamt-utils')
 const UnixFS = require('ipfs-unixfs')
 const mc = require('multicodec')
 const mh = require('multihashing-async').multihash
 const last = require('it-last')
 
 const updateHamtDirectory = async (context, links, bucket, options) => {
+  const importerOptions = defaultImporterOptions()
+
   // update parent with new bit field
   const data = Uint8Array.from(bucket._children.bitField().reverse())
   const node = UnixFS.unmarshal(options.parent.Data)
   const dir = new UnixFS({
     type: 'hamt-sharded-directory',
     data,
     fanout: bucket.tableSize(),
-    hashType: DirSharded.hashFn.code,
+    hashType: importerOptions.hamtHashCode,
     mode: node.mode,
     mtime: node.mtime
   })
@@ -40,14 +46,20 @@ const updateHamtDirectory = async (context, links, bucket, options) => {
 }
 
 const recreateHamtLevel = async (links, rootBucket, parentBucket, positionAtParent) => {
-  // recreate this level of the HAMT
-  const bucket = new Bucket({
-    hashFn: DirSharded.hashFn,
-    hash: parentBucket ? parentBucket._options.hash : undefined
-  }, parentBucket, positionAtParent)
+  const importerOptions = defaultImporterOptions()
+  let bucket
 
+  // recreate this level of the HAMT
   if (parentBucket) {
+    bucket = new Bucket({
+      hash: parentBucket._options.hash,
+      bits: parentBucket._options.bits
+    }, parentBucket, positionAtParent)
     parentBucket._putObjectAt(positionAtParent, bucket)
+  } else {
+    bucket = createHAMT({
+      hashFn: importerOptions.hamtHashFn
+    })
   }
 
   await addLinksToHamtBucket(links, bucket, rootBucket)
@@ -62,7 +74,8 @@ const addLinksToHamtBucket = async (links, bucket, rootBucket) => {
         const pos = parseInt(link.Name, 16)
 
         bucket._putObjectAt(pos, new Bucket({
-          hashFn: DirSharded.hashFn
+          hash: bucket._options.hash,
+          bits: bucket._options.bits
         }, bucket, pos))
 
         return Promise.resolve()
@@ -102,6 +115,7 @@ const generatePath = async (context, fileName, rootNode) => {
       prefix: toPrefix(currentBucket._posAtParent)
     })
 
+    // @ts-ignore
     currentBucket = currentBucket._parent
   }