Skip to content
This repository was archived by the owner on Apr 29, 2020. It is now read-only.

Commit ed20d33

Browse files
Alan Shawachingbrain
Alan Shaw
authored andcommitted
refactor: use ipld-in-memory module
The `inMemory` util is going away to remove dependence on IPFS. This PR switches to using the `ipld-in-memory` module which does the same thing. License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>
1 parent bc35f6f commit ed20d33

11 files changed

+21
-10
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"dirty-chai": "^2.0.1",
4444
"ipfs-unixfs-exporter": "~0.35.4",
4545
"ipld": "~0.20.2",
46+
"ipld-in-memory": "^2.0.0",
4647
"multihashes": "~0.4.14",
4748
"pull-buffer-stream": "^1.0.1",
4849
"pull-generate": "^2.2.0",

test/benchmark.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const pull = require('pull-stream/pull')
1010
const values = require('pull-stream/sources/values')
1111
const onEnd = require('pull-stream/sinks/on-end')
1212
const IPLD = require('ipld')
13+
const inMemory = require('ipld-in-memory')
1314
const bufferStream = require('pull-buffer-stream')
1415

1516
const REPEATS = 10
@@ -22,7 +23,7 @@ describe.skip('benchmark', function () {
2223
let ipld
2324

2425
before((done) => {
25-
IPLD.inMemory((err, resolver) => {
26+
inMemory(IPLD, (err, resolver) => {
2627
expect(err).to.not.exist()
2728

2829
ipld = resolver

test/builder-dir-sharding.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const chai = require('chai')
88
chai.use(require('dirty-chai'))
99
const expect = chai.expect
1010
const IPLD = require('ipld')
11+
const inMemory = require('ipld-in-memory')
1112
const pull = require('pull-stream/pull')
1213
const values = require('pull-stream/sources/values')
1314
const asyncMap = require('pull-stream/throughs/async-map')
@@ -22,7 +23,7 @@ describe('builder: directory sharding', () => {
2223
let ipld
2324

2425
before((done) => {
25-
IPLD.inMemory((err, resolver) => {
26+
inMemory(IPLD, (err, resolver) => {
2627
expect(err).to.not.exist()
2728

2829
ipld = resolver

test/builder-only-hash.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const pull = require('pull-stream/pull')
88
const values = require('pull-stream/sources/values')
99
const collect = require('pull-stream/sinks/collect')
1010
const IPLD = require('ipld')
11+
const inMemory = require('ipld-in-memory')
1112
const CID = require('cids')
1213
const createBuilder = require('../src/builder')
1314
const FixedSizeChunker = require('../src/chunker/fixed-size')
@@ -16,7 +17,7 @@ describe('builder: onlyHash', () => {
1617
let ipld
1718

1819
before((done) => {
19-
IPLD.inMemory((err, resolver) => {
20+
inMemory(IPLD, (err, resolver) => {
2021
expect(err).to.not.exist()
2122

2223
ipld = resolver

test/builder.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const values = require('pull-stream/sources/values')
99
const collect = require('pull-stream/sinks/collect')
1010
const mh = require('multihashes')
1111
const IPLD = require('ipld')
12+
const inMemory = require('ipld-in-memory')
1213
const eachSeries = require('async').eachSeries
1314
const CID = require('cids')
1415
const UnixFS = require('ipfs-unixfs')
@@ -19,7 +20,7 @@ describe('builder', () => {
1920
let ipld
2021

2122
before((done) => {
22-
IPLD.inMemory((err, resolver) => {
23+
inMemory(IPLD, (err, resolver) => {
2324
expect(err).to.not.exist()
2425

2526
ipld = resolver

test/hash-parity-with-go-ipfs.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const values = require('pull-stream/sources/values')
1111
const collect = require('pull-stream/sinks/collect')
1212
const CID = require('cids')
1313
const IPLD = require('ipld')
14+
const inMemory = require('ipld-in-memory')
1415
const randomByteStream = require('./helpers/finite-pseudorandom-byte-stream')
1516

1617
const strategies = [
@@ -34,7 +35,7 @@ strategies.forEach(strategy => {
3435
let ipld
3536

3637
before((done) => {
37-
IPLD.inMemory((err, resolver) => {
38+
inMemory(IPLD, (err, resolver) => {
3839
expect(err).to.not.exist()
3940

4041
ipld = resolver

test/import-export-nested-dir.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const chai = require('chai')
55
chai.use(require('dirty-chai'))
66
const expect = chai.expect
77
const IPLD = require('ipld')
8+
const inMemory = require('ipld-in-memory')
89
const pull = require('pull-stream/pull')
910
const values = require('pull-stream/sources/values')
1011
const collect = require('pull-stream/sinks/collect')
@@ -19,7 +20,7 @@ describe('import and export: directory', () => {
1920
let ipld
2021

2122
before((done) => {
22-
IPLD.inMemory((err, resolver) => {
23+
inMemory(IPLD, (err, resolver) => {
2324
expect(err).to.not.exist()
2425

2526
ipld = resolver

test/import-export.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const chai = require('chai')
66
chai.use(require('dirty-chai'))
77
const expect = chai.expect
88
const IPLD = require('ipld')
9+
const inMemory = require('ipld-in-memory')
910
const pull = require('pull-stream/pull')
1011
const values = require('pull-stream/sources/values')
1112
const concat = require('pull-stream/sinks/concat')
@@ -46,7 +47,7 @@ describe('import and export', function () {
4647
let ipld
4748

4849
before((done) => {
49-
IPLD.inMemory((err, resolver) => {
50+
inMemory(IPLD, (err, resolver) => {
5051
expect(err).to.not.exist()
5152

5253
ipld = resolver

test/importer-flush.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const chai = require('chai')
77
chai.use(require('dirty-chai'))
88
const expect = chai.expect
99
const IPLD = require('ipld')
10+
const inMemory = require('ipld-in-memory')
1011
const pull = require('pull-stream/pull')
1112
const values = require('pull-stream/sources/values')
1213
const map = require('pull-stream/throughs/map')
@@ -17,7 +18,7 @@ describe('importer: flush', () => {
1718
let ipld
1819

1920
before((done) => {
20-
IPLD.inMemory((err, resolver) => {
21+
inMemory(IPLD, (err, resolver) => {
2122
expect(err).to.not.exist()
2223

2324
ipld = resolver

test/importer.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const collect = require('pull-stream/sinks/collect')
1717
const onEnd = require('pull-stream/sinks/on-end')
1818
const CID = require('cids')
1919
const IPLD = require('ipld')
20+
const inMemory = require('ipld-in-memory')
2021
const loadFixture = require('aegir/fixtures')
2122
const each = require('async/each')
2223
const waterfall = require('async/waterfall')
@@ -244,7 +245,7 @@ strategies.forEach((strategy) => {
244245
}
245246

246247
before((done) => {
247-
IPLD.inMemory((err, resolver) => {
248+
inMemory(IPLD, (err, resolver) => {
248249
expect(err).to.not.exist()
249250

250251
ipld = resolver

test/with-dag-api.spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const collect = require('pull-stream/sinks/collect')
1717
const loadFixture = require('aegir/fixtures')
1818
const CID = require('cids')
1919
const IPLD = require('ipld')
20+
const inMemory = require('ipld-in-memory')
2021

2122
function stringifyMh (files) {
2223
return files.map((file) => {
@@ -176,7 +177,7 @@ describe('with dag-api', function () {
176177
}
177178

178179
before(function (done) {
179-
IPLD.inMemory((err, resolver) => {
180+
inMemory(IPLD, (err, resolver) => {
180181
if (err) {
181182
return done(err)
182183
}

0 commit comments

Comments
 (0)