Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make consistent with go #25

Merged
merged 4 commits into from
Jun 8, 2018
Merged

Make consistent with go #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5bbf1a
chore: fix typos
achingbrain May 18, 2018
271988b
chore: update aegir dep
achingbrain May 18, 2018
3ba1be1
chore: make empty files cause the same cid as go
achingbrain May 18, 2018
7d7a282
Merge branch 'master' into make-consistent-with-go
achingbrain Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,23 @@ function Data (type, data) {
}
let fileSize = this.fileSize()

if (!fileSize) {
fileSize = undefined
let data = this.data

if (!this.data || !this.data.length) {
data = undefined
}

let blockSizes = this.blockSizes

if (!this.blockSizes || !this.blockSizes.length) {
blockSizes = undefined
}

return unixfsData.encode({
Type: type,
Data: this.data,
Data: data,
filesize: fileSize,
blocksizes: this.blockSizes.length > 0 ? this.blockSizes : undefined,
blocksizes: blockSizes,
hashType: this.hashType,
fanout: this.fanout
})
Expand Down
164 changes: 80 additions & 84 deletions test/unixfs-format.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,88 +15,81 @@ const symlink = loadFixture('test/fixtures/symlink.txt.unixfs')
const Buffer = require('safe-buffer').Buffer

describe('unixfs-format', () => {
it('raw', (done) => {
it('raw', () => {
const data = new UnixFS('raw', Buffer.from('bananas'))
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})

it('directory', (done) => {
it('directory', () => {
const data = new UnixFS('directory')
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})

it('hamt-sharded-directory', (done) => {
it('hamt-sharded-directory', () => {
const data = new UnixFS('hamt-sharded-directory')
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})

it('file', (done) => {
it('file', () => {
const data = new UnixFS('file', new Buffer('batata'))
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})

it('file add blocksize', (done) => {
it('file add blocksize', () => {
const data = new UnixFS('file')
data.addBlockSize(256)
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})

it('file add and remove blocksize', (done) => {
it('file add and remove blocksize', () => {
const data = new UnixFS('file')
data.addBlockSize(256)
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
unmarsheled.removeBlockSize(0)
expect(data.blockSizes).to.not.deep.equal(unmarsheled.blockSizes)
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
unmarshalled.removeBlockSize(0)
expect(data.blockSizes).to.not.deep.equal(unmarshalled.blockSizes)
})

// figuring out what is this metadata for https://github.com/ipfs/js-ipfs-data-importing/issues/3#issuecomment-182336526
it.skip('metadata', (done) => {})
it.skip('metadata', () => {})

it('symlink', (done) => {
it('symlink', () => {
const data = new UnixFS('symlink')
const marsheled = data.marshal()
const unmarsheled = UnixFS.unmarshal(marsheled)
expect(data.type).to.equal(unmarsheled.type)
expect(data.data).to.deep.equal(unmarsheled.data)
expect(data.blockSizes).to.deep.equal(unmarsheled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarsheled.fileSize())
done()
const marshalled = data.marshal()
const unmarshalled = UnixFS.unmarshal(marshalled)
expect(data.type).to.equal(unmarshalled.type)
expect(data.data).to.deep.equal(unmarshalled.data)
expect(data.blockSizes).to.deep.equal(unmarshalled.blockSizes)
expect(data.fileSize()).to.deep.equal(unmarshalled.fileSize())
})
it('wrong type', (done) => {
let data
Expand All @@ -110,40 +103,43 @@ describe('unixfs-format', () => {
})

describe('interop', () => {
it('raw', (done) => {
const unmarsheled = UnixFS.unmarshal(raw)
expect(unmarsheled.data).to.eql(Buffer.from('Hello UnixFS\n'))
expect(unmarsheled.type).to.equal('file')
expect(unmarsheled.marshal()).to.deep.equal(raw)
done()
it('raw', () => {
const unmarshalled = UnixFS.unmarshal(raw)
expect(unmarshalled.data).to.eql(Buffer.from('Hello UnixFS\n'))
expect(unmarshalled.type).to.equal('file')
expect(unmarshalled.marshal()).to.deep.equal(raw)
})

it('directory', (done) => {
const unmarsheled = UnixFS.unmarshal(directory)
expect(unmarsheled.data).to.deep.equal(undefined)
expect(unmarsheled.type).to.equal('directory')
expect(unmarsheled.marshal()).to.deep.equal(directory)
done()
it('directory', () => {
const unmarshalled = UnixFS.unmarshal(directory)
expect(unmarshalled.data).to.deep.equal(undefined)
expect(unmarshalled.type).to.equal('directory')
expect(unmarshalled.marshal()).to.deep.equal(directory)
})

it('file', (done) => {
const unmarsheled = UnixFS.unmarshal(file)
expect(unmarsheled.data).to.deep.equal(Buffer.from('Hello UnixFS\n'))
expect(unmarsheled.type).to.equal('file')
expect(unmarsheled.marshal()).to.deep.equal(file)
done()
it('file', () => {
const unmarshalled = UnixFS.unmarshal(file)
expect(unmarshalled.data).to.deep.equal(Buffer.from('Hello UnixFS\n'))
expect(unmarshalled.type).to.equal('file')
expect(unmarshalled.marshal()).to.deep.equal(file)
})

it.skip('metadata', (done) => {
it.skip('metadata', () => {
})

it('symlink', (done) => {
const unmarsheled = UnixFS.unmarshal(symlink)
expect(unmarsheled.data).to.deep.equal(Buffer.from('file.txt'))
expect(unmarsheled.type).to.equal('symlink')
it('symlink', () => {
const unmarshalled = UnixFS.unmarshal(symlink)
expect(unmarshalled.data).to.deep.equal(Buffer.from('file.txt'))
expect(unmarshalled.type).to.equal('symlink')
// TODO: waiting on https://github.com/ipfs/js-ipfs-data-importing/issues/3#issuecomment-182440079
// expect(unmarsheled.marshal()).to.deep.equal(symlink)
done()
// expect(unmarshalled.marshal()).to.deep.equal(symlink)
})
})

it('empty', () => {
const data = new UnixFS('file')
const marshalled = data.marshal()

expect(marshalled).to.deep.equal(Buffer.from([0x08, 0x02, 0x18, 0x00]))
})
})