Merge pull request #379 from bittorrent/release_2.3.2

Release 2.3.2

.gitignore

@@ -54,4 +54,8 @@ cmd/btfs/btfs
 cmd/btfs/btfs.upgrade
 cmd/btfs/ttt
 cmd/btfs/tt
-cmd/btfs/t*
+cmd/btfs/t*
+cmd/btfs/btfs.1.*
+cmd/btfs/btfs.2.*
+cmd/btfs/btfs.3.*
+btfs.linux.*

assets/assets.go

@@ -13,9 +13,9 @@ import (
 	"github.com/bittorrent/go-btfs/core"
 	"github.com/bittorrent/go-btfs/core/coreapi"
 
-	files "github.com/TRON-US/go-btfs-files"
-	options "github.com/TRON-US/interface-go-btfs-core/options"
-	"github.com/TRON-US/interface-go-btfs-core/path"
+	files "github.com/bittorrent/go-btfs-files"
+	options "github.com/bittorrent/interface-go-btfs-core/options"
+	"github.com/bittorrent/interface-go-btfs-core/path"
 	cid "github.com/ipfs/go-cid"
 )
 

autoupdate/main.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/bittorrent/go-btfs/logger"
 
-	"github.com/TRON-US/go-btfs-api"
+	"github.com/bittorrent/go-btfs-api"
 )
 
 var log = logger.InitLogger("update.log").Sugar()

bigint/bigint.go

@@ -38,7 +38,7 @@ func (i *BigInt) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-//Wrap wraps big.Int pointer into BigInt struct.
+// Wrap wraps big.Int pointer into BigInt struct.
 func Wrap(i *big.Int) *BigInt {
 	return &BigInt{Int: i}
 }

bindata/bindata.go

@@ -156,11 +156,13 @@ var _bindata = map[string]func() (*asset, error){
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
 // following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
+//
+//	data/
+//	  foo.txt
+//	  img/
+//	    a.png
+//	    b.png
+//
 // then AssetDir("data") would return []string{"foo.txt", "img"}
 // AssetDir("data/img") would return []string{"a.png", "b.png"}
 // AssetDir("foo.txt") and AssetDir("notexist") would return an error

chain/config/config.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"errors"
-	cfg "github.com/TRON-US/go-btfs-config"
+	cfg "github.com/bittorrent/go-btfs-config"
 	"github.com/ethereum/go-ethereum/common"
 )
 

chain/utils.go

@@ -4,21 +4,21 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	config "github.com/TRON-US/go-btfs-config"
+	config "github.com/bittorrent/go-btfs-config"
 	"io/ioutil"
 	"math/rand"
 	"os"
 	"time"
 
 	cmds "github.com/bittorrent/go-btfs-cmds"
+	"github.com/bittorrent/go-btfs-common/crypto"
+	onlinePb "github.com/bittorrent/go-btfs-common/protos/online"
 	oldcmds "github.com/bittorrent/go-btfs/commands"
 	"github.com/bittorrent/go-btfs/core/commands/storage/path"
 	"github.com/bittorrent/go-btfs/settlement/swap/vault"
 	cpt "github.com/bittorrent/go-btfs/transaction/crypto"
 	"github.com/bittorrent/go-btfs/transaction/storage"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/tron-us/go-btfs-common/crypto"
-	onlinePb "github.com/tron-us/go-btfs-common/protos/online"
 )
 
 // after btfs init

cmd/btfs/autoupdate.go

@@ -17,8 +17,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/TRON-US/go-btfs-api"
 	btfs_version "github.com/bittorrent/go-btfs"
+	"github.com/bittorrent/go-btfs-api"
 	"github.com/mholt/archiver/v3"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"

cmd/btfs/chain_config_test.go

@@ -6,8 +6,8 @@ import (
 
 	"gotest.tools/assert"
 
-	Cfg "github.com/TRON-US/go-btfs-config"
 	cmds "github.com/bittorrent/go-btfs-cmds"
+	Cfg "github.com/bittorrent/go-btfs-config"
 	"github.com/bittorrent/go-btfs/chain"
 )