cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to go-ipfs-files 2.0.3

Browse Source 
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
This commit is contained in:
Hector Sanjuan 2018-12-17 13:44:06 +01:00
parent 15413edbc6
commit ced9f2f7f1
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adder/adder_test.go
View File

@ -111,7 +111,7 @@ func TestAdder_ContextCancelled(t *testing.T) {
defer closer.Close()
defer st.Close()
slf := files.DirFrom(map[string]files.Node{
slf := files.NewMapDirectory(map[string]files.Node{
"a": lg,
"b": st,
})

2
adder/local/dag_service_test.go
View File

@ -64,7 +64,7 @@ func TestAdd(t *testing.T) {
}
if rootCid.String() != test.ShardingDirBalancedRootCIDWrapped {
t.Fatal("bad root cid")
t.Fatal("bad root cid: ", rootCid)
}
expected := test.ShardingDirCids[:]

2
api/rest/client/methods.go
View File

@ -411,7 +411,7 @@ func (c *defaultClient) Add(
addFiles[i] = files.FileEntry(name, addFile)
}
sliceFile := files.NewSliceFile(addFiles)
sliceFile := files.NewSliceDirectory(addFiles)
// If `form` is set to true, the multipart data will have
// a Content-Type of 'multipart/form-data', if `form` is false,
// the Content-Type will be 'multipart/mixed'.

10
ipfsconn/ipfshttp/ipfshttp.go
View File

@ -592,9 +592,13 @@ func (ipfs *Connector) BlockPut(b api.NodeWithMeta) error {
defer cancel()
defer ipfs.updateInformerMetric()
multiFileR := files.NewMultiFileReader(files.DirFrom(map[string]files.Node{ // IPFS reqs require a wrapping directory
"": files.FileFrom(b.Data),
}), true)
mapDir := files.NewMapDirectory(
map[string]files.Node{ // IPFS reqs require a wrapping directory
"": files.NewBytesFile(b.Data),
},
)
multiFileR := files.NewMultiFileReader(mapDir, true)
if b.Format == "" {
b.Format = "v0"
}

4
package.json
View File

@ -140,9 +140,9 @@
},
{
"author": "magik6k",
"hash": "QmPhx9B9cuaXc4vuw62567BF5NxfpsdD1AVE9HbTn7t1Y6",
"hash": "QmXWZCd8jfaHmt4UDSnjKmGcrQMw95bDGWqEeVLVJjoANX",
"name": "go-ipfs-files",
"version": "2.0.1"
"version": "2.0.3"
},
{
"author": "lanzafame",

14
test/sharding.go
View File

@ -98,12 +98,14 @@ func NewShardingTestHelper() *ShardingTestHelper {
func (sth *ShardingTestHelper) GetTreeMultiReader(t *testing.T) (*files.MultiFileReader, io.Closer) {
sf := sth.GetTreeSerialFile(t)
return files.NewMultiFileReader(files.DirFrom(map[string]files.Node{
mapDir := files.NewMapDirectory(map[string]files.Node{
shardingTestTree: sf,
}), true), sf
})
return files.NewMultiFileReader(mapDir, true), sf
}
// GetTreeSerialFile returns a files.SerialFile pointing to the testing
// GetTreeSerialFile returns a files.Directory pointing to the testing
// directory tree (see GetTreeMultiReader).
func (sth *ShardingTestHelper) GetTreeSerialFile(t *testing.T) files.Directory {
st := sth.makeTree(t)
@ -131,8 +133,10 @@ func (sth *ShardingTestHelper) GetRandFileReader(t *testing.T, kbs int) (files.D
if err != nil {
t.Fatal(err)
}
slf := files.DirFrom(map[string]files.Node{"randomfile": sf})
return slf, sf
mapDir := files.NewMapDirectory(
map[string]files.Node{"randomfile": sf},
)
return mapDir, sf
}
// Clean deletes any folder and file generated by this helper.