This repository was archived by the owner on Mar 10, 2020. It is now read-only.
File tree 2 files changed +34
-12
lines changed
2 files changed +34
-12
lines changed Original file line number Diff line number Diff line change 25
25
"flatmap" : " 0.0.3" ,
26
26
"glob" : " ^7.1.1" ,
27
27
"ipfs-block" : " ^0.4.0" ,
28
- "ipld-dag-pb" : " ^0.1.2 " ,
28
+ "ipld-dag-pb" : " ^0.1.3 " ,
29
29
"is-ipfs" : " ^0.2.0" ,
30
30
"isstream" : " ^0.1.2" ,
31
31
"multiaddr" : " ^2.0.2" ,
Original file line number Diff line number Diff line change @@ -94,21 +94,37 @@ module.exports = (send) => {
94
94
obj = JSON . parse ( obj . toString ( ) )
95
95
}
96
96
}
97
+
97
98
let node
99
+
98
100
if ( obj . multihash ) {
99
101
node = obj
100
102
} else if ( options . enc === 'protobuf' ) {
101
- node = new DAGNode ( )
102
- node . unMarshal ( obj )
103
+ dagPB . util . deserialize ( obj , ( err , _node ) => {
104
+ if ( err ) {
105
+ return callback ( err )
106
+ }
107
+ node = _node
108
+ next ( )
109
+ } )
110
+ return
103
111
} else {
104
112
node = new DAGNode ( obj . Data , obj . Links )
105
113
}
106
-
107
- if ( node . toJSON ( ) . Hash !== result . Hash ) {
108
- return callback ( new Error ( 'Stored object was different from constructed object' ) )
114
+ next ( )
115
+
116
+ function next ( ) {
117
+ node . toJSON ( ( err , nodeJSON ) => {
118
+ if ( err ) {
119
+ return callback ( err )
120
+ }
121
+ if ( nodeJSON . Hash !== result . Hash ) {
122
+ return callback ( new Error ( 'Stored object was different from constructed object' ) )
123
+ }
124
+
125
+ callback ( null , node )
126
+ } )
109
127
}
110
-
111
- callback ( null , node )
112
128
} )
113
129
} ) ,
114
130
data : promisify ( ( multihash , options , callback ) => {
@@ -201,13 +217,19 @@ module.exports = (send) => {
201
217
if ( err ) {
202
218
return callback ( err )
203
219
}
220
+
204
221
const node = new DAGNode ( )
222
+ node . toJSON ( ( err , nodeJSON ) => {
223
+ if ( err ) {
224
+ return callback ( err )
225
+ }
205
226
206
- if ( node . toJSON ( ) . Hash !== result . Hash ) {
207
- return callback ( new Error ( 'Stored object was different from constructed object' ) )
208
- }
227
+ if ( nodeJSON . Hash !== result . Hash ) {
228
+ return callback ( new Error ( 'Stored object was different from constructed object' ) )
229
+ }
209
230
210
- callback ( null , node )
231
+ callback ( null , node )
232
+ } )
211
233
} )
212
234
} ) ,
213
235
patch : {
You can’t perform that action at this time.
0 commit comments