6
6
const expect = require ( 'chai' ) . expect
7
7
const Block = require ( 'ipfs-block' )
8
8
const multihash = require ( 'multihashes' )
9
+ const CID = require ( 'cids' )
9
10
10
11
module . exports = ( common ) => {
11
12
describe ( '.block' , ( ) => {
@@ -34,23 +35,37 @@ module.exports = (common) => {
34
35
describe ( 'callback API' , ( ) => {
35
36
it ( '.put a buffer' , ( done ) => {
36
37
const expectedHash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
38
+ const cid = new CID ( expectedHash )
37
39
const blob = Buffer ( 'blorb' )
38
40
39
- ipfs . block . put ( blob , ( err , block ) => {
41
+ ipfs . block . put ( blob , cid , ( err , block ) => {
40
42
expect ( err ) . to . not . exist
41
- expect ( block . key ) . to . eql ( multihash . fromB58String ( expectedHash ) )
43
+ expect ( block . key ( 'sha2-256' ) ) . to . eql ( multihash . fromB58String ( expectedHash ) )
42
44
expect ( block ) . to . have . a . property ( 'data' , blob )
43
45
done ( )
44
46
} )
45
47
} )
46
48
47
49
it ( '.put a block' , ( done ) => {
50
+ const expectedHash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
51
+ const cid = new CID ( expectedHash )
52
+ const blob = new Block ( new Buffer ( 'blorb' ) )
53
+
54
+ ipfs . block . put ( blob , cid , ( err , block ) => {
55
+ expect ( err ) . to . not . exist
56
+ expect ( block . key ( 'sha2-256' ) ) . to . eql ( multihash . fromB58String ( expectedHash ) )
57
+ expect ( block . data ) . to . eql ( new Buffer ( 'blorb' ) )
58
+ done ( )
59
+ } )
60
+ } )
61
+
62
+ it ( '.put a block (without using CID, legacy mode)' , ( done ) => {
48
63
const expectedHash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
49
64
const blob = new Block ( new Buffer ( 'blorb' ) )
50
65
51
66
ipfs . block . put ( blob , ( err , block ) => {
52
67
expect ( err ) . to . not . exist
53
- expect ( block . key ) . to . eql ( multihash . fromB58String ( expectedHash ) )
68
+ expect ( block . key ( 'sha2-256' ) ) . to . eql ( multihash . fromB58String ( expectedHash ) )
54
69
expect ( block . data ) . to . eql ( new Buffer ( 'blorb' ) )
55
70
done ( )
56
71
} )
@@ -59,26 +74,39 @@ module.exports = (common) => {
59
74
it ( '.put error with array of blocks' , ( ) => {
60
75
const blob = Buffer ( 'blorb' )
61
76
62
- ipfs . block . put ( [ blob , blob ] , ( err ) => {
77
+ ipfs . block . put ( [ blob , blob ] , 'fake cids' , ( err ) => {
63
78
expect ( err ) . to . be . an . instanceof ( Error )
64
79
} )
65
80
} )
66
81
67
82
it ( 'block.get' , ( done ) => {
68
83
const hash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
84
+ const cid = new CID ( hash )
85
+
86
+ ipfs . block . get ( cid , ( err , block ) => {
87
+ expect ( err ) . to . not . exist
88
+ expect ( block . key ( 'sha2-256' ) ) . to . eql ( cid . multihash )
89
+ expect ( block . data ) . to . eql ( new Buffer ( 'blorb' ) )
90
+ done ( )
91
+ } )
92
+ } )
93
+
94
+ it ( 'block.get (without using CID, legacy mode)' , ( done ) => {
95
+ const hash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
69
96
70
97
ipfs . block . get ( hash , ( err , block ) => {
71
98
expect ( err ) . to . not . exist
72
- expect ( block . key ) . to . eql ( multihash . fromB58String ( hash ) )
99
+ expect ( block . key ( 'sha2-256' ) ) . to . eql ( multihash . fromB58String ( hash ) )
73
100
expect ( block . data ) . to . eql ( new Buffer ( 'blorb' ) )
74
101
done ( )
75
102
} )
76
103
} )
77
104
78
105
it ( 'block.stat' , ( done ) => {
79
106
const hash = 'QmPv52ekjS75L4JmHpXVeuJ5uX2ecSfSZo88NSyxwA3rAQ'
107
+ const cid = new CID ( hash )
80
108
81
- ipfs . block . stat ( hash , ( err , stats ) => {
109
+ ipfs . block . stat ( cid , ( err , stats ) => {
82
110
expect ( err ) . to . not . exist
83
111
expect ( stats ) . to . have . property ( 'key' )
84
112
expect ( stats ) . to . have . property ( 'size' )
0 commit comments