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

Commit 2ef1480

Browse files
author
Alan Shaw
authored
fix: ls files sizes for compat with go-ipfs 0.4.19 (#449)
* fix: ls files sizes for compat with go-ipfs 0.4.19 Adjusts file sizes accordingly. refs #427 License: MIT Signed-off-by: Alan Shaw <[email protected]> * fix: end test after stream is complete License: MIT Signed-off-by: Alan Shaw <[email protected]>
1 parent d3ad40b commit 2ef1480

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

‎src/files-regular/add-readable-stream.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ module.exports = (createCommon, options) => {
5959
stream.on('data', (file) => {
6060
if (file.path === 'test-folder') {
6161
expect(file.hash).to.equal(fixtures.directory.cid)
62-
done()
6362
}
6463
})
6564

65+
stream.on('end', done)
66+
6667
files.forEach((file) => stream.write(file))
6768
stream.end()
6869
})

‎src/files-regular/ls-pull-stream.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,37 +70,37 @@ module.exports = (createCommon, options) => {
7070
{ depth: 1,
7171
name: 'alice.txt',
7272
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
73-
size: 11696,
73+
size: 11685,
7474
hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
7575
type: 'file' },
7676
{ depth: 1,
7777
name: 'empty-folder',
7878
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
79-
size: 4,
79+
size: 0,
8080
hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
8181
type: 'dir' },
8282
{ depth: 1,
8383
name: 'files',
8484
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
85-
size: 183,
85+
size: 0,
8686
hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
8787
type: 'dir' },
8888
{ depth: 1,
8989
name: 'holmes.txt',
9090
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
91-
size: 582072,
91+
size: 581878,
9292
hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
9393
type: 'file' },
9494
{ depth: 1,
9595
name: 'jungle.txt',
9696
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
97-
size: 2305,
97+
size: 2294,
9898
hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
9999
type: 'file' },
100100
{ depth: 1,
101101
name: 'pp.txt',
102102
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
103-
size: 4551,
103+
size: 4540,
104104
hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
105105
type: 'file' }
106106
])

‎src/files-regular/ls-readable-stream.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,37 +66,37 @@ module.exports = (createCommon, options) => {
6666
{ depth: 1,
6767
name: 'alice.txt',
6868
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
69-
size: 11696,
69+
size: 11685,
7070
hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
7171
type: 'file' },
7272
{ depth: 1,
7373
name: 'empty-folder',
7474
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
75-
size: 4,
75+
size: 0,
7676
hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
7777
type: 'dir' },
7878
{ depth: 1,
7979
name: 'files',
8080
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
81-
size: 183,
81+
size: 0,
8282
hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
8383
type: 'dir' },
8484
{ depth: 1,
8585
name: 'holmes.txt',
8686
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
87-
size: 582072,
87+
size: 581878,
8888
hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
8989
type: 'file' },
9090
{ depth: 1,
9191
name: 'jungle.txt',
9292
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
93-
size: 2305,
93+
size: 2294,
9494
hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
9595
type: 'file' },
9696
{ depth: 1,
9797
name: 'pp.txt',
9898
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
99-
size: 4551,
99+
size: 4540,
100100
hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
101101
type: 'file' }
102102
])

‎src/files-regular/ls.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,37 +69,37 @@ module.exports = (createCommon, options) => {
6969
{ depth: 1,
7070
name: 'alice.txt',
7171
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
72-
size: 11696,
72+
size: 11685,
7373
hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
7474
type: 'file' },
7575
{ depth: 1,
7676
name: 'empty-folder',
7777
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
78-
size: 4,
78+
size: 0,
7979
hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
8080
type: 'dir' },
8181
{ depth: 1,
8282
name: 'files',
8383
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
84-
size: 183,
84+
size: 0,
8585
hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
8686
type: 'dir' },
8787
{ depth: 1,
8888
name: 'holmes.txt',
8989
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
90-
size: 582072,
90+
size: 581878,
9191
hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
9292
type: 'file' },
9393
{ depth: 1,
9494
name: 'jungle.txt',
9595
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
96-
size: 2305,
96+
size: 2294,
9797
hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
9898
type: 'file' },
9999
{ depth: 1,
100100
name: 'pp.txt',
101101
path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
102-
size: 4551,
102+
size: 4540,
103103
hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
104104
type: 'file' }
105105
])

0 commit comments

Comments
 (0)