Merge pull request #26 from TRON-US/BTFS-1555

taiyangc · web-flow · commit d1c7a1ab882d · 2020-02-11T19:48:48.000-08:00
BTFS-1555
diff --git a/file/reed_solomon_file.go b/file/reed_solomon_file.go
@@ -169,6 +169,10 @@ func (it *rsIterator) Next() bool {
 	return it.err == nil
 }
 
+func (it *rsIterator) AbsRootPath() (string, error) {
+	return "", nil
+}
+
 func GetRsNode(l interface{}) (uio.Node, error) {
 	m, ok := l.(map[string]interface{})
 	if !ok {
diff --git a/file/unixfile.go b/file/unixfile.go
@@ -97,6 +97,10 @@ func (it *ufsIterator) Err() error {
 	return it.err
 }
 
+func (it *ufsIterator) AbsRootPath() (string, error) {
+	return "", nil
+}
+
 func (d *ufsDirectory) Close() error {
 	return nil
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/TRON-US/go-unixfs
 require (
 	github.com/Stebalien/go-bitfield v0.0.1
 	github.com/TRON-US/go-btfs-chunker v0.2.6
-	github.com/TRON-US/go-btfs-files v0.1.1
+	github.com/TRON-US/go-btfs-files v0.1.4
 	github.com/gogo/protobuf v1.2.1
 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
 	github.com/ipfs/go-bitswap v0.1.2 // indirect
diff --git a/go.sum b/go.sum
@@ -6,6 +6,8 @@ github.com/TRON-US/go-btfs-chunker v0.2.6 h1:SPeUEMGSHNQyBSTU50nYBdaJA36CXPzQRtc
 github.com/TRON-US/go-btfs-chunker v0.2.6/go.mod h1:Wj0oyybAWtu5lpcAc90QQ3bhJ14JRXD50PqxP25wmnI=
 github.com/TRON-US/go-btfs-files v0.1.1 h1:GuDIiWDM66bfhfxJy8+dBL4Cfbcp3iBp7pgHpKKCw8k=
 github.com/TRON-US/go-btfs-files v0.1.1/go.mod h1:tD2vOKLcLCDNMn9rrA27n2VbNpHdKewGzEguIFY+EJ0=
+github.com/TRON-US/go-btfs-files v0.1.4 h1:6/vqS7g6ttsOPCEyZEEkaba07hFviTLV6KjuPiZ45Ds=
+github.com/TRON-US/go-btfs-files v0.1.4/go.mod h1:I8LeoFulha712BW03zGgmDdNwa0qbAPwfMIglzw0fnE=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 h1:qkOC5Gd33k54tobS36cXdAzJbeHaduLtnLQQwNoIi78=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
diff --git a/mod/dagmodifier_test.go b/mod/dagmodifier_test.go
@@ -1014,7 +1014,7 @@ func testBalancedMetaDagAppend(t *testing.T, opts testu.NodeOpts, userDataSize i
 	if err != nil {
 		t.Fatal(err)
 	}
-	mdagmod := NewMetaDagModifierBalanced(dagmod, db)
+	mdagmod := NewMetaDagModifierBalanced(dagmod, db, true)
 
 	// Append metadata.
 	// Note combining two JSON byte arrays like below does not happen here in unit tests:

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,10 @@ func (it *ufsIterator) Err() error {`
`97`	`97`	`return it.err`
`98`	`98`	`}`
`99`	`99`
	`100`	`+func (it *ufsIterator) AbsRootPath() (string, error) {`
	`101`	`+ return "", nil`
	`102`	`+}`
	`103`	`+`
`100`	`104`	`func (d *ufsDirectory) Close() error {`
`101`	`105`	`return nil`
`102`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,7 @@ func testBalancedMetaDagAppend(t *testing.T, opts testu.NodeOpts, userDataSize i`
`1014`	`1014`	`if err != nil {`
`1015`	`1015`	`t.Fatal(err)`
`1016`	`1016`	`}`
`1017`		`- mdagmod := NewMetaDagModifierBalanced(dagmod, db)`
	`1017`	`+ mdagmod := NewMetaDagModifierBalanced(dagmod, db, true)`
`1018`	`1018`
`1019`	`1019`	`// Append metadata.`
`1020`	`1020`	`// Note combining two JSON byte arrays like below does not happen here in unit tests:`