modify import path (#1805)

* modify import path

* fix travis.yml go import path

diff --git a/.travis.yml b/.travis.yml
index b248347..55df781 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/bytom
+go_import_path: github.com/bytom/bytom
 dist: trusty
 sudo: false
 

diff --git a/Makefile b/Makefile
index 4a3b242..d54f632 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ endif
 endif
 
 PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd' | grep -v '/mining/tensority')
-PACKAGES += 'github.com/bytom/mining/tensority/go_algorithm'
+PACKAGES += 'github.com/bytom/bytom/mining/tensority/go_algorithm'
 
-BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
+BUILD_FLAGS := -ldflags "-X github.com/bytom/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
 MINER_BINARY64 := miner-$(GOOS)_amd64

diff --git a/accesstoken/accesstoken.go b/accesstoken/accesstoken.go
index 9bdff95..7258003 100644 (file)
--- a/accesstoken/accesstoken.go
+++ b/accesstoken/accesstoken.go
@@ -10,9 +10,9 @@ import (
        "strings"
        "time"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const tokenSize = 32

diff --git a/accesstoken/accesstoken_test.go b/accesstoken/accesstoken_test.go
index a588755..015208a 100644 (file)
--- a/accesstoken/accesstoken_test.go
+++ b/accesstoken/accesstoken_test.go
@@ -6,8 +6,8 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/errors"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestCreate(t *testing.T) {

diff --git a/account/accounts.go b/account/accounts.go
index 48131bf..512d1a6 100644 (file)
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -11,19 +11,19 @@ import (
        "github.com/golang/groupcache/lru"
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm/vmutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/account/accounts_test.go b/account/accounts_test.go
index 31cd25c..7b1bf1d 100644 (file)
--- a/account/accounts_test.go
+++ b/account/accounts_test.go
@@ -7,15 +7,15 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/database"
-       "github.com/bytom/errors"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/testutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/testutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestCreateAccountWithUppercase(t *testing.T) {

diff --git a/account/builder.go b/account/builder.go
index ec63216..f4d4040 100644 (file)
--- a/account/builder.go
+++ b/account/builder.go
@@ -4,15 +4,15 @@ import (
        "context"
        "encoding/json"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 //DecodeSpendAction unmarshal JSON-encoded data of spend action

diff --git a/account/builder_test.go b/account/builder_test.go
index 9e2d4bf..b6e32cf 100644 (file)
--- a/account/builder_test.go
+++ b/account/builder_test.go
@@ -5,12 +5,12 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestReserveBtmUtxoChain(t *testing.T) {

diff --git a/account/indexer.go b/account/indexer.go
index 22c70ac..1059f64 100644 (file)
--- a/account/indexer.go
+++ b/account/indexer.go
@@ -1,8 +1,8 @@
 package account
 
 import (
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 const (

diff --git a/account/utxo_keeper.go b/account/utxo_keeper.go
index a984bf9..8803a04 100644 (file)
--- a/account/utxo_keeper.go
+++ b/account/utxo_keeper.go
@@ -10,9 +10,9 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const desireUtxoCount = 5

diff --git a/account/utxo_keeper_test.go b/account/utxo_keeper_test.go
index 5b4d8a7..c3426ad 100644 (file)
--- a/account/utxo_keeper_test.go
+++ b/account/utxo_keeper_test.go
@@ -6,9 +6,9 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestAddUnconfirmedUtxo(t *testing.T) {

diff --git a/api/accounts.go b/api/accounts.go
index c1d6b11..df903df 100644 (file)
--- a/api/accounts.go
+++ b/api/accounts.go
@@ -7,12 +7,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // POST /create-account

diff --git a/api/api.go b/api/api.go
index d12ead1..f1e2b4b 100644 (file)
--- a/api/api.go
+++ b/api/api.go
@@ -11,24 +11,24 @@ import (
        log "github.com/sirupsen/logrus"
        cmn "github.com/tendermint/tmlibs/common"
 
-       "github.com/bytom/accesstoken"
-       "github.com/bytom/blockchain/txfeed"
-       cfg "github.com/bytom/config"
-       "github.com/bytom/dashboard/dashboard"
-       "github.com/bytom/dashboard/equity"
-       "github.com/bytom/errors"
-       "github.com/bytom/event"
-       "github.com/bytom/mining/cpuminer"
-       "github.com/bytom/mining/miningpool"
-       "github.com/bytom/net/http/authn"
-       "github.com/bytom/net/http/gzip"
-       "github.com/bytom/net/http/httpjson"
-       "github.com/bytom/net/http/static"
-       "github.com/bytom/net/websocket"
-       "github.com/bytom/netsync"
-       "github.com/bytom/p2p"
-       "github.com/bytom/protocol"
-       "github.com/bytom/wallet"
+       "github.com/bytom/bytom/accesstoken"
+       "github.com/bytom/bytom/blockchain/txfeed"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/dashboard/dashboard"
+       "github.com/bytom/bytom/dashboard/equity"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/mining/cpuminer"
+       "github.com/bytom/bytom/mining/miningpool"
+       "github.com/bytom/bytom/net/http/authn"
+       "github.com/bytom/bytom/net/http/gzip"
+       "github.com/bytom/bytom/net/http/httpjson"
+       "github.com/bytom/bytom/net/http/static"
+       "github.com/bytom/bytom/net/websocket"
+       "github.com/bytom/bytom/netsync"
+       "github.com/bytom/bytom/p2p"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/wallet"
 )
 
 var (

diff --git a/api/api_test.go b/api/api_test.go
index 004baf6..a12e11b 100644 (file)
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -6,10 +6,10 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/accesstoken"
-       "github.com/bytom/blockchain/rpc"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/accesstoken"
+       "github.com/bytom/bytom/blockchain/rpc"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestAPIHandler(t *testing.T) {

diff --git a/api/assets.go b/api/assets.go
index 5648468..c9c7113 100644 (file)
--- a/api/assets.go
+++ b/api/assets.go
@@ -4,9 +4,9 @@ import (
        "context"
        "strings"
 
-       "github.com/bytom/asset"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
 
        log "github.com/sirupsen/logrus"
 )

diff --git a/api/block_retrieve.go b/api/block_retrieve.go
index f4543a1..37642e2 100644 (file)
--- a/api/block_retrieve.go
+++ b/api/block_retrieve.go
@@ -5,12 +5,12 @@ import (
 
        "gopkg.in/fatih/set.v0"
 
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/consensus/difficulty"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/consensus/difficulty"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // return best block hash

diff --git a/api/compile.go b/api/compile.go
index c2de9ca..e52c65c 100644 (file)
--- a/api/compile.go
+++ b/api/compile.go
@@ -3,10 +3,10 @@ package api
 import (
        "strings"
 
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/equity/compiler"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/vm"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/equity/compiler"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 // pre-define contract error types

diff --git a/api/errors.go b/api/errors.go
index 5ea054e..41c498b 100644 (file)
--- a/api/errors.go
+++ b/api/errors.go
@@ -3,17 +3,17 @@ package api
 import (
        "context"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/rpc"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/errors"
-       "github.com/bytom/net/http/httperror"
-       "github.com/bytom/net/http/httpjson"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/rpc"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/net/http/httperror"
+       "github.com/bytom/bytom/net/http/httpjson"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 var (

diff --git a/api/hsm.go b/api/hsm.go
index 8779083..9418483 100644 (file)
--- a/api/hsm.go
+++ b/api/hsm.go
@@ -5,8 +5,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 type createKeyResp struct {

diff --git a/api/message.go b/api/message.go
index 4c1ae31..08c1184 100644 (file)
--- a/api/message.go
+++ b/api/message.go
@@ -5,13 +5,13 @@ import (
        "encoding/hex"
        "strings"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
 )
 
 // SignMsgResp is response for sign message

diff --git a/api/miner.go b/api/miner.go
index 00b3c11..029993e 100644 (file)
--- a/api/miner.go
+++ b/api/miner.go
@@ -4,11 +4,11 @@ import (
        "context"
        "strconv"
 
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // BlockHeaderJSON struct provides support for get work in json format, when it also follows

diff --git a/api/nodeinfo.go b/api/nodeinfo.go
index bda4c19..42852e8 100644 (file)
--- a/api/nodeinfo.go
+++ b/api/nodeinfo.go
@@ -4,10 +4,10 @@ import (
        "context"
        "net"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/netsync"
-       "github.com/bytom/p2p"
-       "github.com/bytom/version"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/netsync"
+       "github.com/bytom/bytom/p2p"
+       "github.com/bytom/bytom/version"
 )
 
 type VersionInfo struct {

diff --git a/api/program.go b/api/program.go
index 624503a..d7981a6 100644 (file)
--- a/api/program.go
+++ b/api/program.go
@@ -5,8 +5,8 @@ import (
        "encoding/hex"
        "fmt"
 
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 // DecodeProgResp is response for decode program

diff --git a/api/query.go b/api/query.go
index 330d431..3a02781 100644 (file)
--- a/api/query.go
+++ b/api/query.go
@@ -7,18 +7,18 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // POST /list-accounts

diff --git a/api/receivers.go b/api/receivers.go
index 380eb78..1c12d21 100644 (file)
--- a/api/receivers.go
+++ b/api/receivers.go
@@ -3,7 +3,7 @@ package api
 import (
        "context"
 
-       "github.com/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/blockchain/txbuilder"
 )
 
 func (a *API) createAccountReceiver(ctx context.Context, ins struct {

diff --git a/api/request.go b/api/request.go
index 20c6297..17af94c 100644 (file)
--- a/api/request.go
+++ b/api/request.go
@@ -4,10 +4,10 @@ import (
        "context"
        "strings"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // action error

diff --git a/api/transact.go b/api/transact.go
index 947b47e..12beb55 100644 (file)
--- a/api/transact.go
+++ b/api/transact.go
@@ -8,12 +8,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/errors"
-       "github.com/bytom/net/http/reqid"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/net/http/reqid"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 var (

diff --git a/api/txfeeds.go b/api/txfeeds.go
index 9f78317..11075c6 100644 (file)
--- a/api/txfeeds.go
+++ b/api/txfeeds.go
@@ -6,8 +6,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/txfeed"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/blockchain/txfeed"
+       "github.com/bytom/bytom/errors"
 )
 
 // POST /create-txfeed

diff --git a/api/wallet.go b/api/wallet.go
index 23a446f..1e7a40f 100644 (file)
--- a/api/wallet.go
+++ b/api/wallet.go
@@ -3,11 +3,11 @@ package api
 import (
        "context"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
 )
 
 // POST /wallet error

diff --git a/api/websocket.go b/api/websocket.go
index 8b3548d..3a896e8 100644 (file)
--- a/api/websocket.go
+++ b/api/websocket.go
@@ -6,7 +6,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/net/websocket"
+       "github.com/bytom/bytom/net/websocket"
 )
 
 // timeZeroVal is simply the zero value for a time.Time and is used to avoid

diff --git a/asset/annotate.go b/asset/annotate.go
index 52edf5c..1b7ded3 100644 (file)
--- a/asset/annotate.go
+++ b/asset/annotate.go
@@ -3,9 +3,9 @@ package asset
 import (
        "encoding/json"
 
-       "github.com/bytom/blockchain/query"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/blockchain/query"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 func isValidJSON(b []byte) bool {

diff --git a/asset/asset.go b/asset/asset.go
index 78343eb..7d87c0b 100644 (file)
--- a/asset/asset.go
+++ b/asset/asset.go
@@ -9,17 +9,17 @@ import (
        "github.com/golang/groupcache/lru"
        "golang.org/x/crypto/sha3"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       dbm "github.com/bytom/database/leveldb"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // DefaultNativeAsset native BTM asset

diff --git a/asset/asset_test.go b/asset/asset_test.go
index 046f59e..9f35d8b 100644 (file)
--- a/asset/asset_test.go
+++ b/asset/asset_test.go
@@ -9,13 +9,13 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/database"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/database"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestDefineAssetWithLowercase(t *testing.T) {

diff --git a/asset/builder.go b/asset/builder.go
index fab4fec..fab3b79 100644 (file)
--- a/asset/builder.go
+++ b/asset/builder.go
@@ -8,10 +8,10 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 //NewIssueAction create a new asset issue action

diff --git a/asset/image.go b/asset/image.go
index ab435f9..3b7627d 100644 (file)
--- a/asset/image.go
+++ b/asset/image.go
@@ -5,7 +5,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/common"
+       "github.com/bytom/bytom/common"
 )
 
 // Image is the struct for hold export asset data

diff --git a/blockchain/pseudohsm/image.go b/blockchain/pseudohsm/image.go
index 2bc2a16..f95fdce 100644 (file)
--- a/blockchain/pseudohsm/image.go
+++ b/blockchain/pseudohsm/image.go
@@ -9,7 +9,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 const logModule = "pseudohsm"

diff --git a/blockchain/pseudohsm/image_test.go b/blockchain/pseudohsm/image_test.go
index 88dd7d8..13e0e97 100644 (file)
--- a/blockchain/pseudohsm/image_test.go
+++ b/blockchain/pseudohsm/image_test.go
@@ -7,7 +7,7 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 func TestRestore(t *testing.T) {

diff --git a/blockchain/pseudohsm/key.go b/blockchain/pseudohsm/key.go
index 54a08b8..e1bbb98 100644 (file)
--- a/blockchain/pseudohsm/key.go
+++ b/blockchain/pseudohsm/key.go
@@ -7,7 +7,7 @@ import (
        "path/filepath"
        "time"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
        "github.com/pborman/uuid"
 )
 

diff --git a/blockchain/pseudohsm/keycache.go b/blockchain/pseudohsm/keycache.go
index 02e244e..2068d2e 100644 (file)
--- a/blockchain/pseudohsm/keycache.go
+++ b/blockchain/pseudohsm/keycache.go
@@ -15,7 +15,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does

diff --git a/blockchain/pseudohsm/keycache_test.go b/blockchain/pseudohsm/keycache_test.go
index dc016e9..4a4ee03 100644 (file)
--- a/blockchain/pseudohsm/keycache_test.go
+++ b/blockchain/pseudohsm/keycache_test.go
@@ -12,7 +12,7 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
        "github.com/cespare/cp"
        "github.com/davecgh/go-spew/spew"
 )

diff --git a/blockchain/pseudohsm/keystore_passphrase.go b/blockchain/pseudohsm/keystore_passphrase.go
index b3002f7..1cdf0ea 100644 (file)
--- a/blockchain/pseudohsm/keystore_passphrase.go
+++ b/blockchain/pseudohsm/keystore_passphrase.go
@@ -16,9 +16,9 @@ import (
        "io/ioutil"
        "path/filepath"
 
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/crypto/randentropy"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/randentropy"
        "github.com/pborman/uuid"
        "golang.org/x/crypto/pbkdf2"
        "golang.org/x/crypto/scrypt"

diff --git a/blockchain/pseudohsm/keystore_passphrase_test.go b/blockchain/pseudohsm/keystore_passphrase_test.go
index ee168cd..458f67a 100644 (file)
--- a/blockchain/pseudohsm/keystore_passphrase_test.go
+++ b/blockchain/pseudohsm/keystore_passphrase_test.go
@@ -5,7 +5,7 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
        "github.com/pborman/uuid"
 )
 

diff --git a/blockchain/pseudohsm/pseudohsm.go b/blockchain/pseudohsm/pseudohsm.go
index 5c13844..925edaf 100644 (file)
--- a/blockchain/pseudohsm/pseudohsm.go
+++ b/blockchain/pseudohsm/pseudohsm.go
@@ -12,9 +12,9 @@ import (
 
        "github.com/pborman/uuid"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
-       mnem "github.com/bytom/wallet/mnemonic"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
+       mnem "github.com/bytom/bytom/wallet/mnemonic"
 )
 
 // pre-define errors for supporting bytom errorFormatter

diff --git a/blockchain/pseudohsm/pseudohsm_test.go b/blockchain/pseudohsm/pseudohsm_test.go
index bba1cf3..aace811 100644 (file)
--- a/blockchain/pseudohsm/pseudohsm_test.go
+++ b/blockchain/pseudohsm/pseudohsm_test.go
@@ -7,8 +7,8 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/errors"
 )
 
 const dirPath = "testdata/pseudo"

diff --git a/blockchain/query/annotated.go b/blockchain/query/annotated.go
index b91567c..dd6d857 100644 (file)
--- a/blockchain/query/annotated.go
+++ b/blockchain/query/annotated.go
@@ -3,9 +3,9 @@ package query
 import (
        "encoding/json"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 //AnnotatedTx means an annotated transaction.

diff --git a/blockchain/query/filter/parser.go b/blockchain/query/filter/parser.go
index 8aa9e9c..5c9bb62 100644 (file)
--- a/blockchain/query/filter/parser.go
+++ b/blockchain/query/filter/parser.go
@@ -4,7 +4,7 @@ import (
        "fmt"
        "strconv"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 // ErrBadFilter is returned from Parse when

diff --git a/blockchain/query/filter/typecheck.go b/blockchain/query/filter/typecheck.go
index e9c4678..315c4c1 100644 (file)
--- a/blockchain/query/filter/typecheck.go
+++ b/blockchain/query/filter/typecheck.go
@@ -3,7 +3,7 @@ package filter
 import (
        "fmt"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 //Column describe a column

diff --git a/blockchain/query/transactions.go b/blockchain/query/transactions.go
index 00f39bb..94e51f5 100644 (file)
--- a/blockchain/query/transactions.go
+++ b/blockchain/query/transactions.go
@@ -1,8 +1,8 @@
 package query
 
 import (
-       "github.com/bytom/blockchain/query/filter"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/blockchain/query/filter"
+       "github.com/bytom/bytom/errors"
 )
 
 var filterTable = filter.Table{

diff --git a/blockchain/rpc/rpc.go b/blockchain/rpc/rpc.go
index 13651e6..cd66c6d 100644 (file)
--- a/blockchain/rpc/rpc.go
+++ b/blockchain/rpc/rpc.go
@@ -11,9 +11,9 @@ import (
        "strings"
        "time"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/net/http/httperror"
-       "github.com/bytom/net/http/reqid"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/net/http/httperror"
+       "github.com/bytom/bytom/net/http/reqid"
 )
 
 // Bytom-specific header fields

diff --git a/blockchain/rpc/rpc_test.go b/blockchain/rpc/rpc_test.go
index 7f6a478..d700687 100644 (file)
--- a/blockchain/rpc/rpc_test.go
+++ b/blockchain/rpc/rpc_test.go
@@ -9,7 +9,7 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestRPCCallJSON(t *testing.T) {

diff --git a/blockchain/signers/idgenerate.go b/blockchain/signers/idgenerate.go
index 47afe36..427ee19 100644 (file)
--- a/blockchain/signers/idgenerate.go
+++ b/blockchain/signers/idgenerate.go
@@ -5,7 +5,7 @@ import (
        "sync/atomic"
        "time"
 
-       "github.com/bytom/encoding/base32"
+       "github.com/bytom/bytom/encoding/base32"
 )
 
 //1<seq_id ,increase by 1

diff --git a/blockchain/signers/signers.go b/blockchain/signers/signers.go
index a8c8fce..ba96a9e 100644 (file)
--- a/blockchain/signers/signers.go
+++ b/blockchain/signers/signers.go
@@ -4,8 +4,8 @@ package signers
 import (
        "bytes"
        "encoding/binary"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
 )
 
 type keySpace byte

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index ab3f0ff..ecb24f7 100644 (file)
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -5,12 +5,12 @@ import (
        stdjson "encoding/json"
        "errors"
 
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/encoding/json"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // DecodeControlAddressAction convert input data to action struct

diff --git a/blockchain/txbuilder/builder.go b/blockchain/txbuilder/builder.go
index 218eb4e..6d2499d 100644 (file)
--- a/blockchain/txbuilder/builder.go
+++ b/blockchain/txbuilder/builder.go
@@ -4,8 +4,8 @@ import (
        "math"
        "time"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // NewBuilder return new TemplateBuilder instance

diff --git a/blockchain/txbuilder/constraint.go b/blockchain/txbuilder/constraint.go
index 192e842..d562872 100644 (file)
--- a/blockchain/txbuilder/constraint.go
+++ b/blockchain/txbuilder/constraint.go
@@ -1,9 +1,9 @@
 package txbuilder
 
 import (
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // Constraint types express a constraint on an input of a proposed

diff --git a/blockchain/txbuilder/data_witness.go b/blockchain/txbuilder/data_witness.go
index 0060ed0..86f2f1e 100644 (file)
--- a/blockchain/txbuilder/data_witness.go
+++ b/blockchain/txbuilder/data_witness.go
@@ -3,7 +3,7 @@ package txbuilder
 import (
        "encoding/json"
 
-       chainjson "github.com/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
 )
 
 // DataWitness used sign transaction

diff --git a/blockchain/txbuilder/estimate.go b/blockchain/txbuilder/estimate.go
index bfd9836..7338689 100644 (file)
--- a/blockchain/txbuilder/estimate.go
+++ b/blockchain/txbuilder/estimate.go
@@ -1,10 +1,10 @@
 package txbuilder
 
 import (
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 const (

diff --git a/blockchain/txbuilder/finalize.go b/blockchain/txbuilder/finalize.go
index 6e14449..3639b48 100644 (file)
--- a/blockchain/txbuilder/finalize.go
+++ b/blockchain/txbuilder/finalize.go
@@ -4,12 +4,12 @@ import (
        "bytes"
        "context"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 var (

diff --git a/blockchain/txbuilder/rawtxsig_witness.go b/blockchain/txbuilder/rawtxsig_witness.go
index d5df57e..2a82c98 100644 (file)
--- a/blockchain/txbuilder/rawtxsig_witness.go
+++ b/blockchain/txbuilder/rawtxsig_witness.go
@@ -6,7 +6,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       chainjson "github.com/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
 )
 
 // TODO(bobg): most of the code here is duplicated from

diff --git a/blockchain/txbuilder/signature_program.go b/blockchain/txbuilder/signature_program.go
index 4689945..3591b97 100644 (file)
--- a/blockchain/txbuilder/signature_program.go
+++ b/blockchain/txbuilder/signature_program.go
@@ -1,8 +1,8 @@
 package txbuilder
 
 import (
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // Signature programs constrain how the signed inputs of a transaction

diff --git a/blockchain/txbuilder/signature_witness.go b/blockchain/txbuilder/signature_witness.go
index 233b772..ddb9b85 100644 (file)
--- a/blockchain/txbuilder/signature_witness.go
+++ b/blockchain/txbuilder/signature_witness.go
@@ -6,11 +6,11 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/crypto/sha3pool"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 type (

diff --git a/blockchain/txbuilder/signing_instruction.go b/blockchain/txbuilder/signing_instruction.go
index 1c65f61..9e91e76 100644 (file)
--- a/blockchain/txbuilder/signing_instruction.go
+++ b/blockchain/txbuilder/signing_instruction.go
@@ -3,9 +3,9 @@ package txbuilder
 import (
        "encoding/json"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
 )
 
 // AddWitnessKeys adds a SignatureWitness with the given quorum and

diff --git a/blockchain/txbuilder/txbuilder.go b/blockchain/txbuilder/txbuilder.go
index 9660ae7..8ac5bda 100644 (file)
--- a/blockchain/txbuilder/txbuilder.go
+++ b/blockchain/txbuilder/txbuilder.go
@@ -9,12 +9,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
-       "github.com/bytom/math/checked"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/math/checked"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 const logModule = "txbuilder"

diff --git a/blockchain/txbuilder/txbuilder_test.go b/blockchain/txbuilder/txbuilder_test.go
index 8fdb785..f52c062 100644 (file)
--- a/blockchain/txbuilder/txbuilder_test.go
+++ b/blockchain/txbuilder/txbuilder_test.go
@@ -11,18 +11,18 @@ import (
        "github.com/davecgh/go-spew/spew"
        "golang.org/x/crypto/sha3"
 
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 type testAction bc.AssetAmount

diff --git a/blockchain/txbuilder/types.go b/blockchain/txbuilder/types.go
index 8995cc4..7922d2a 100644 (file)
--- a/blockchain/txbuilder/types.go
+++ b/blockchain/txbuilder/types.go
@@ -4,10 +4,10 @@ import (
        "context"
        "encoding/json"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // Template represents a partially- or fully-signed transaction.

diff --git a/blockchain/txbuilder/witness.go b/blockchain/txbuilder/witness.go
index 3efc546..35eefd5 100644 (file)
--- a/blockchain/txbuilder/witness.go
+++ b/blockchain/txbuilder/witness.go
@@ -3,9 +3,9 @@ package txbuilder
 import (
        "context"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
 )
 
 // SignFunc is the function passed into Sign that produces

diff --git a/blockchain/txbuilder/witness_test.go b/blockchain/txbuilder/witness_test.go
index 192f3ab..3055de8 100644 (file)
--- a/blockchain/txbuilder/witness_test.go
+++ b/blockchain/txbuilder/witness_test.go
@@ -6,8 +6,8 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/testutil"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestWitnessJSON(t *testing.T) {

diff --git a/blockchain/txfeed/txfeed.go b/blockchain/txfeed/txfeed.go
index b8e91d4..47b8ab5 100644 (file)
--- a/blockchain/txfeed/txfeed.go
+++ b/blockchain/txfeed/txfeed.go
@@ -8,13 +8,13 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/cmd/bytomcli/commands/accesstoken.go b/cmd/bytomcli/commands/accesstoken.go
index e262196..7cdc47f 100644 (file)
--- a/cmd/bytomcli/commands/accesstoken.go
+++ b/cmd/bytomcli/commands/accesstoken.go
@@ -6,7 +6,7 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var createAccessTokenCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/account.go b/cmd/bytomcli/commands/account.go
index ac26b7d..fe5e183 100644 (file)
--- a/cmd/bytomcli/commands/account.go
+++ b/cmd/bytomcli/commands/account.go
@@ -7,8 +7,8 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/util"
 )
 
 func init() {

diff --git a/cmd/bytomcli/commands/asset.go b/cmd/bytomcli/commands/asset.go
index 16cc2c3..d120dab 100644 (file)
--- a/cmd/bytomcli/commands/asset.go
+++ b/cmd/bytomcli/commands/asset.go
@@ -8,8 +8,8 @@ import (
        jww "github.com/spf13/jwalterweatherman"
 
        "encoding/hex"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/util"
 )
 
 func init() {

diff --git a/cmd/bytomcli/commands/block.go b/cmd/bytomcli/commands/block.go
index 900b58b..32450b9 100644 (file)
--- a/cmd/bytomcli/commands/block.go
+++ b/cmd/bytomcli/commands/block.go
@@ -9,8 +9,8 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/util"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/util"
 )
 
 func init() {

diff --git a/cmd/bytomcli/commands/bytomcli.go b/cmd/bytomcli/commands/bytomcli.go
index a089e4e..6796709 100644 (file)
--- a/cmd/bytomcli/commands/bytomcli.go
+++ b/cmd/bytomcli/commands/bytomcli.go
@@ -7,7 +7,7 @@ import (
 
        "github.com/spf13/cobra"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 // bytomcli usage template

diff --git a/cmd/bytomcli/commands/key.go b/cmd/bytomcli/commands/key.go
index ba96cfe..bd0690e 100644 (file)
--- a/cmd/bytomcli/commands/key.go
+++ b/cmd/bytomcli/commands/key.go
@@ -7,9 +7,9 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/util"
 )
 
 var createKeyCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/mining.go b/cmd/bytomcli/commands/mining.go
index 7736dc1..7e37ecb 100644 (file)
--- a/cmd/bytomcli/commands/mining.go
+++ b/cmd/bytomcli/commands/mining.go
@@ -7,7 +7,7 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var isMiningCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/net.go b/cmd/bytomcli/commands/net.go
index 971942d..e422312 100644 (file)
--- a/cmd/bytomcli/commands/net.go
+++ b/cmd/bytomcli/commands/net.go
@@ -5,7 +5,7 @@ import (
 
        "github.com/spf13/cobra"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var netInfoCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/program.go b/cmd/bytomcli/commands/program.go
index 6543227..a87b496 100644 (file)
--- a/cmd/bytomcli/commands/program.go
+++ b/cmd/bytomcli/commands/program.go
@@ -5,7 +5,7 @@ import (
 
        "github.com/spf13/cobra"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var decodeProgCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/template.go b/cmd/bytomcli/commands/template.go
index bf62f17..113ed99 100644 (file)
--- a/cmd/bytomcli/commands/template.go
+++ b/cmd/bytomcli/commands/template.go
@@ -3,7 +3,7 @@ package commands
 import (
        "fmt"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 const (

diff --git a/cmd/bytomcli/commands/transaction.go b/cmd/bytomcli/commands/transaction.go
index 9c2e063..11ffd9b 100644 (file)
--- a/cmd/bytomcli/commands/transaction.go
+++ b/cmd/bytomcli/commands/transaction.go
@@ -9,11 +9,11 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/api"
-       "github.com/bytom/blockchain/txbuilder"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/api"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/util"
 )
 
 func init() {

diff --git a/cmd/bytomcli/commands/txfeed.go b/cmd/bytomcli/commands/txfeed.go
index 953315f..d92dbfb 100644 (file)
--- a/cmd/bytomcli/commands/txfeed.go
+++ b/cmd/bytomcli/commands/txfeed.go
@@ -6,7 +6,7 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var createTransactionFeedCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/util.go b/cmd/bytomcli/commands/util.go
index ea07375..932223d 100644 (file)
--- a/cmd/bytomcli/commands/util.go
+++ b/cmd/bytomcli/commands/util.go
@@ -7,10 +7,10 @@ import (
 
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/encoding/json"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/util"
 )
 
 // accountIns is used for account related request.

diff --git a/cmd/bytomcli/commands/version.go b/cmd/bytomcli/commands/version.go
index d74ef88..bb3fc0a 100644 (file)
--- a/cmd/bytomcli/commands/version.go
+++ b/cmd/bytomcli/commands/version.go
@@ -6,7 +6,7 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/version"
+       "github.com/bytom/bytom/version"
 )
 
 var versionCmd = &cobra.Command{

diff --git a/cmd/bytomcli/commands/wallet.go b/cmd/bytomcli/commands/wallet.go
index ce14f87..469c9b0 100644 (file)
--- a/cmd/bytomcli/commands/wallet.go
+++ b/cmd/bytomcli/commands/wallet.go
@@ -6,7 +6,7 @@ import (
        "github.com/spf13/cobra"
        jww "github.com/spf13/jwalterweatherman"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 var walletInfoCmd = &cobra.Command{

diff --git a/cmd/bytomcli/main.go b/cmd/bytomcli/main.go
index 07e8c6b..709e6b7 100644 (file)
--- a/cmd/bytomcli/main.go
+++ b/cmd/bytomcli/main.go
@@ -3,7 +3,7 @@ package main
 import (
        "runtime"
 
-       cmd "github.com/bytom/cmd/bytomcli/commands"
+       cmd "github.com/bytom/bytom/cmd/bytomcli/commands"
 )
 
 func main() {

diff --git a/cmd/bytomd/commands/init.go b/cmd/bytomd/commands/init.go
index ea56539..ba5a538 100644 (file)
--- a/cmd/bytomd/commands/init.go
+++ b/cmd/bytomd/commands/init.go
@@ -7,7 +7,7 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/spf13/cobra"
 
-       cfg "github.com/bytom/config"
+       cfg "github.com/bytom/bytom/config"
 )
 
 var initFilesCmd = &cobra.Command{

diff --git a/cmd/bytomd/commands/root.go b/cmd/bytomd/commands/root.go
index a678d3f..cbde867 100644 (file)
--- a/cmd/bytomd/commands/root.go
+++ b/cmd/bytomd/commands/root.go
@@ -8,7 +8,7 @@ import (
        "github.com/spf13/viper"
        cmn "github.com/tendermint/tmlibs/common"
 
-       cfg "github.com/bytom/config"
+       cfg "github.com/bytom/bytom/config"
 )
 
 var (

diff --git a/cmd/bytomd/commands/run_node.go b/cmd/bytomd/commands/run_node.go
index f6c160d..b87e42a 100644 (file)
--- a/cmd/bytomd/commands/run_node.go
+++ b/cmd/bytomd/commands/run_node.go
@@ -7,7 +7,7 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/spf13/cobra"
 
-       "github.com/bytom/node"
+       "github.com/bytom/bytom/node"
 )
 
 const logModule = "cmd"

diff --git a/cmd/bytomd/commands/version.go b/cmd/bytomd/commands/version.go
index 8cc1db8..8d22cc6 100644 (file)
--- a/cmd/bytomd/commands/version.go
+++ b/cmd/bytomd/commands/version.go
@@ -5,7 +5,7 @@ import (
 
        "github.com/spf13/cobra"
 
-       "github.com/bytom/version"
+       "github.com/bytom/bytom/version"
 )
 
 var versionCmd = &cobra.Command{

diff --git a/cmd/bytomd/main.go b/cmd/bytomd/main.go
index 4afb0d3..4649a74 100644 (file)
--- a/cmd/bytomd/main.go
+++ b/cmd/bytomd/main.go
@@ -10,8 +10,8 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/tmlibs/cli"
 
-       "github.com/bytom/cmd/bytomd/commands"
-       "github.com/bytom/config"
+       "github.com/bytom/bytom/cmd/bytomd/commands"
+       "github.com/bytom/bytom/config"
 )
 
 // ContextHook is a hook for logrus.

diff --git a/cmd/miner/main.go b/cmd/miner/main.go
index d9a2f40..c120958 100644 (file)
--- a/cmd/miner/main.go
+++ b/cmd/miner/main.go
@@ -5,12 +5,12 @@ import (
        "log"
        "os"
 
-       "github.com/bytom/api"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/api"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/util"
 )
 
 const (

diff --git a/common/address.go b/common/address.go
index 4c81d94..645c55b 100644 (file)
--- a/common/address.go
+++ b/common/address.go
@@ -6,8 +6,8 @@ import (
        "fmt"
        "strings"
 
-       "github.com/bytom/common/bech32"
-       "github.com/bytom/consensus"
+       "github.com/bytom/bytom/common/bech32"
+       "github.com/bytom/bytom/consensus"
 )
 
 var (

diff --git a/common/address_test.go b/common/address_test.go
index 918d6c6..37856a3 100644 (file)
--- a/common/address_test.go
+++ b/common/address_test.go
@@ -7,8 +7,8 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/common/bech32"
-       "github.com/bytom/consensus"
+       "github.com/bytom/bytom/common/bech32"
+       "github.com/bytom/bytom/consensus"
 )
 
 func TestAddresses(t *testing.T) {

diff --git a/config/config.go b/config/config.go
index ec95113..666b14f 100644 (file)
--- a/config/config.go
+++ b/config/config.go
@@ -10,7 +10,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519"
 )
 
 var (

diff --git a/config/genesis.go b/config/genesis.go
index 90b481c..3e8bc9c 100644 (file)
--- a/config/genesis.go
+++ b/config/genesis.go
@@ -5,9 +5,9 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 func GenesisTx() *types.Tx {

diff --git a/consensus/difficulty/difficulty.go b/consensus/difficulty/difficulty.go
index 5f5249a..c030ec6 100644 (file)
--- a/consensus/difficulty/difficulty.go
+++ b/consensus/difficulty/difficulty.go
@@ -3,10 +3,10 @@ package difficulty
 import (
        "math/big"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/mining/tensority"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/mining/tensority"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 var (

diff --git a/consensus/difficulty/difficulty_test.go b/consensus/difficulty/difficulty_test.go
index fbacde4..96e2326 100644 (file)
--- a/consensus/difficulty/difficulty_test.go
+++ b/consensus/difficulty/difficulty_test.go
@@ -6,9 +6,9 @@ import (
        "strconv"
        "testing"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // A lower difficulty Int actually reflects a more difficult mining progress.

diff --git a/consensus/general.go b/consensus/general.go
index f69011d..066be21 100644 (file)
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -4,7 +4,7 @@ import (
        "encoding/binary"
        "strings"
 
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 //consensus variables

diff --git a/consensus/segwit/segwit.go b/consensus/segwit/segwit.go
index 3415291..b85c4e8 100644 (file)
--- a/consensus/segwit/segwit.go
+++ b/consensus/segwit/segwit.go
@@ -3,9 +3,9 @@ package segwit
 import (
        "errors"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 func IsP2WScript(prog []byte) bool {

diff --git a/crypto/crypto.go b/crypto/crypto.go
index 919b1c5..b3b1af9 100644 (file)
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -1,7 +1,7 @@
 package crypto
 
 import (
-       "github.com/bytom/common"
+       "github.com/bytom/bytom/common"
        "golang.org/x/crypto/ripemd160"
        "golang.org/x/crypto/sha3"
 )

diff --git a/crypto/ed25519/chainkd/chainkd.go b/crypto/ed25519/chainkd/chainkd.go
index 3629fec..c2cc25d 100644 (file)
--- a/crypto/ed25519/chainkd/chainkd.go
+++ b/crypto/ed25519/chainkd/chainkd.go
@@ -6,8 +6,8 @@ import (
        "crypto/sha512"
        "io"
 
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/ecmath"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/ecmath"
 )
 
 type (

diff --git a/crypto/ed25519/chainkd/expanded_key.go b/crypto/ed25519/chainkd/expanded_key.go
index fbc5db1..ed47a76 100644 (file)
--- a/crypto/ed25519/chainkd/expanded_key.go
+++ b/crypto/ed25519/chainkd/expanded_key.go
@@ -14,8 +14,8 @@ import (
        "io"
        "strconv"
 
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/internal/edwards25519"
 )
 
 const (

diff --git a/crypto/ed25519/chainkd/expanded_key_test.go b/crypto/ed25519/chainkd/expanded_key_test.go
index 355ce1f..c80677d 100644 (file)
--- a/crypto/ed25519/chainkd/expanded_key_test.go
+++ b/crypto/ed25519/chainkd/expanded_key_test.go
@@ -5,7 +5,7 @@ import (
        "crypto"
        "testing"
 
-       "github.com/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519"
 )
 
 // Testing basic InnerSign+Verify and the invariants:

diff --git a/crypto/ed25519/chainkd/util.go b/crypto/ed25519/chainkd/util.go
index 194b20e..6f1c82b 100644 (file)
--- a/crypto/ed25519/chainkd/util.go
+++ b/crypto/ed25519/chainkd/util.go
@@ -3,7 +3,7 @@ package chainkd
 import (
        "io"
 
-       "github.com/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519"
 )
 
 // Utility functions

diff --git a/crypto/ed25519/ecmath/point.go b/crypto/ed25519/ecmath/point.go
index 9ec0d75..e1adf4a 100644 (file)
--- a/crypto/ed25519/ecmath/point.go
+++ b/crypto/ed25519/ecmath/point.go
@@ -3,7 +3,7 @@ package ecmath
 import (
        "crypto/subtle"
 
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
+       "github.com/bytom/bytom/crypto/ed25519/internal/edwards25519"
 )
 
 // Point is a point on the ed25519 curve.

diff --git a/crypto/ed25519/ecmath/scalar.go b/crypto/ed25519/ecmath/scalar.go
index 651f2ca..3f0e914 100644 (file)
--- a/crypto/ed25519/ecmath/scalar.go
+++ b/crypto/ed25519/ecmath/scalar.go
@@ -3,7 +3,7 @@ package ecmath
 import (
        "crypto/subtle"
 
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
+       "github.com/bytom/bytom/crypto/ed25519/internal/edwards25519"
 )
 
 // Scalar is a 256-bit little-endian scalar.

diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go
index a41d10a..70c8cc9 100644 (file)
--- a/crypto/ed25519/ed25519.go
+++ b/crypto/ed25519/ed25519.go
@@ -16,7 +16,7 @@ import (
        "io"
        "strconv"
 
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
+       "github.com/bytom/bytom/crypto/ed25519/internal/edwards25519"
 )
 
 const (

diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go
index e0d5a1d..f4ceef2 100644 (file)
--- a/crypto/ed25519/ed25519_test.go
+++ b/crypto/ed25519/ed25519_test.go
@@ -15,7 +15,7 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
+       "github.com/bytom/bytom/crypto/ed25519/internal/edwards25519"
 )
 
 type zeroReader struct{}

diff --git a/database/cache.go b/database/cache.go
index 41a5525..64571df 100644 (file)
--- a/database/cache.go
+++ b/database/cache.go
@@ -7,8 +7,8 @@ import (
        "github.com/golang/groupcache/lru"
        "github.com/golang/groupcache/singleflight"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const maxCachedBlocks = 30

diff --git a/database/cache_test.go b/database/cache_test.go
index 36ea57a..4c60fbb 100644 (file)
--- a/database/cache_test.go
+++ b/database/cache_test.go
@@ -3,8 +3,8 @@ package database
 import (
        "testing"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 func TestBlockCache(t *testing.T) {

diff --git a/database/store.go b/database/store.go
index 9fbad6c..33deef4 100644 (file)
--- a/database/store.go
+++ b/database/store.go
@@ -9,13 +9,13 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/tmlibs/common"
 
-       "github.com/bytom/database/storage"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const logModule = "leveldb"

diff --git a/database/store_test.go b/database/store_test.go
index 795d248..78bcdb4 100644 (file)
--- a/database/store_test.go
+++ b/database/store_test.go
@@ -4,14 +4,14 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/config"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestLoadBlockIndex(t *testing.T) {

diff --git a/database/utxo_view.go b/database/utxo_view.go
index a9e1e3f..88d4629 100644 (file)
--- a/database/utxo_view.go
+++ b/database/utxo_view.go
@@ -1,12 +1,12 @@
 package database
 
 import (
-       "github.com/bytom/database/storage"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/state"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/state"
        "github.com/golang/protobuf/proto"
-       dbm "github.com/bytom/database/leveldb"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const UtxoPreFix = "UT:"

diff --git a/database/utxo_view_test.go b/database/utxo_view_test.go
index fa613de..930b3d5 100644 (file)
--- a/database/utxo_view_test.go
+++ b/database/utxo_view_test.go
@@ -4,11 +4,11 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestSaveUtxoView(t *testing.T) {

diff --git a/encoding/blockchain/blockchain.go b/encoding/blockchain/blockchain.go
index 61ee843..5d721cb 100644 (file)
--- a/encoding/blockchain/blockchain.go
+++ b/encoding/blockchain/blockchain.go
@@ -9,7 +9,7 @@ import (
        "math"
        "sync"
 
-       "github.com/bytom/encoding/bufpool"
+       "github.com/bytom/bytom/encoding/bufpool"
 )
 
 var bufPool = sync.Pool{New: func() interface{} { return new([9]byte) }}

diff --git a/equity/compiler/ast.go b/equity/compiler/ast.go
index 41f9e6a..f921c9b 100644 (file)
--- a/equity/compiler/ast.go
+++ b/equity/compiler/ast.go
@@ -6,7 +6,7 @@ import (
        "strconv"
        "strings"
 
-       chainjson "github.com/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
 )
 
 // Contract is a compiled Equity contract.

diff --git a/equity/compiler/cmd/equitycmd/equitycmd.go b/equity/compiler/cmd/equitycmd/equitycmd.go
index c74f01b..c2ce66e 100644 (file)
--- a/equity/compiler/cmd/equitycmd/equitycmd.go
+++ b/equity/compiler/cmd/equitycmd/equitycmd.go
@@ -8,7 +8,7 @@ import (
        "os"
        "strings"
 
-       "github.com/bytom/equity/compiler"
+       "github.com/bytom/bytom/equity/compiler"
 )
 
 var (

diff --git a/equity/compiler/compile.go b/equity/compiler/compile.go
index ddaf496..23346fb 100644 (file)
--- a/equity/compiler/compile.go
+++ b/equity/compiler/compile.go
@@ -6,10 +6,10 @@ import (
        "io"
        "io/ioutil"
 
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // ValueInfo describes how a blockchain value is used in a contract

diff --git a/equity/compiler/compile_test.go b/equity/compiler/compile_test.go
index befa34b..7487fc9 100644 (file)
--- a/equity/compiler/compile_test.go
+++ b/equity/compiler/compile_test.go
@@ -5,9 +5,9 @@ import (
        "strings"
        "testing"
 
-       chainjson "github.com/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
 
-       "github.com/bytom/equity/compiler/equitytest"
+       "github.com/bytom/bytom/equity/compiler/equitytest"
 )
 
 func TestCompile(t *testing.T) {

diff --git a/equity/equity/main.go b/equity/equity/main.go
index c5aff80..2e6c6e4 100644 (file)
--- a/equity/equity/main.go
+++ b/equity/equity/main.go
@@ -9,8 +9,8 @@ import (
 
        "github.com/spf13/cobra"
 
-       "github.com/bytom/equity/compiler"
-       equityutil "github.com/bytom/equity/equity/util"
+       "github.com/bytom/bytom/equity/compiler"
+       equityutil "github.com/bytom/bytom/equity/equity/util"
 )
 
 const (

diff --git a/equity/equity/util/instance.go b/equity/equity/util/instance.go
index 78c6867..f39a4e5 100644 (file)
--- a/equity/equity/util/instance.go
+++ b/equity/equity/util/instance.go
@@ -5,9 +5,9 @@ import (
        "errors"
        "strconv"
 
-       chainjson "github.com/bytom/encoding/json"
+       chainjson "github.com/bytom/bytom/encoding/json"
 
-       "github.com/bytom/equity/compiler"
+       "github.com/bytom/bytom/equity/compiler"
 )
 
 // InstantiateContract instantiate contract parameters

diff --git a/equity/equity/util/shift.go b/equity/equity/util/shift.go
index 6d0b220..77dec8a 100644 (file)
--- a/equity/equity/util/shift.go
+++ b/equity/equity/util/shift.go
@@ -6,9 +6,9 @@ import (
        "encoding/hex"
        "errors"
 
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm"
 
-       "github.com/bytom/equity/compiler"
+       "github.com/bytom/bytom/equity/compiler"
 )
 
 const (

diff --git a/event/event.go b/event/event.go
index 055aed1..20f525d 100644 (file)
--- a/event/event.go
+++ b/event/event.go
@@ -9,7 +9,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/log/log.go b/log/log.go
index 60bfaf5..f616c87 100644 (file)
--- a/log/log.go
+++ b/log/log.go
@@ -12,7 +12,7 @@ import (
        rotatelogs "github.com/lestrrat-go/file-rotatelogs"
        "github.com/sirupsen/logrus"
 
-       "github.com/bytom/config"
+       "github.com/bytom/bytom/config"
 )
 
 const (

diff --git a/mining/cpuminer/cpuminer.go b/mining/cpuminer/cpuminer.go
index 2c91721..97227a1 100644 (file)
--- a/mining/cpuminer/cpuminer.go
+++ b/mining/cpuminer/cpuminer.go
@@ -6,12 +6,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/event"
-       "github.com/bytom/mining"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/mining"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/mining/mining.go b/mining/mining.go
index e635976..fa736d3 100644 (file)
--- a/mining/mining.go
+++ b/mining/mining.go
@@ -7,16 +7,16 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 const logModule = "mining"

diff --git a/mining/miningpool/miningpool.go b/mining/miningpool/miningpool.go
index c6906c2..0df0fc4 100644 (file)
--- a/mining/miningpool/miningpool.go
+++ b/mining/miningpool/miningpool.go
@@ -7,11 +7,11 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/event"
-       "github.com/bytom/mining"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/mining"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/mining/sort.go b/mining/sort.go
index 40a4f01..a95a26f 100644 (file)
--- a/mining/sort.go
+++ b/mining/sort.go
@@ -1,6 +1,6 @@
 package mining
 
-import "github.com/bytom/protocol"
+import "github.com/bytom/bytom/protocol"
 
 type byTime []*protocol.TxDesc
 

diff --git a/mining/tensority/ai_hash.go b/mining/tensority/ai_hash.go
index ee89e90..803927e 100644 (file)
--- a/mining/tensority/ai_hash.go
+++ b/mining/tensority/ai_hash.go
@@ -3,10 +3,10 @@ package tensority
 import (
        "github.com/golang/groupcache/lru"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/mining/tensority/cgo_algorithm"
-       "github.com/bytom/mining/tensority/go_algorithm"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/mining/tensority/cgo_algorithm"
+       "github.com/bytom/bytom/mining/tensority/go_algorithm"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 const maxAIHashCached = 64

diff --git a/mining/tensority/cgo_algorithm/algorithm_unsupported.go b/mining/tensority/cgo_algorithm/algorithm_unsupported.go
index 375ad6c..a5d9d97 100644 (file)
--- a/mining/tensority/cgo_algorithm/algorithm_unsupported.go
+++ b/mining/tensority/cgo_algorithm/algorithm_unsupported.go
@@ -5,8 +5,8 @@ package cgo_algorithm
 import (
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/mining/tensority/go_algorithm"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/mining/tensority/go_algorithm"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 func SimdAlgorithm(bh, seed *bc.Hash) *bc.Hash {

diff --git a/mining/tensority/go_algorithm/algorithm.go b/mining/tensority/go_algorithm/algorithm.go
index ae9ecac..0e5f5a6 100644 (file)
--- a/mining/tensority/go_algorithm/algorithm.go
+++ b/mining/tensority/go_algorithm/algorithm.go
@@ -1,7 +1,7 @@
 package go_algorithm
 
 import (
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 func LegacyAlgorithm(bh, seed *bc.Hash) *bc.Hash {

diff --git a/mining/tensority/go_algorithm/algorithm_test.go b/mining/tensority/go_algorithm/algorithm_test.go
index c1213d4..e2ddd78 100644 (file)
--- a/mining/tensority/go_algorithm/algorithm_test.go
+++ b/mining/tensority/go_algorithm/algorithm_test.go
@@ -6,7 +6,7 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 var tests = []struct {

diff --git a/mining/tensority/go_algorithm/matrix.go b/mining/tensority/go_algorithm/matrix.go
index aa14791..10c22c4 100644 (file)
--- a/mining/tensority/go_algorithm/matrix.go
+++ b/mining/tensority/go_algorithm/matrix.go
@@ -8,8 +8,8 @@ import (
 
        "gonum.org/v1/gonum/mat"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 const (

diff --git a/mining/tensority/go_algorithm/seed.go b/mining/tensority/go_algorithm/seed.go
index 4234ad1..9e5b63e 100644 (file)
--- a/mining/tensority/go_algorithm/seed.go
+++ b/mining/tensority/go_algorithm/seed.go
@@ -4,9 +4,9 @@ import (
        "encoding/binary"
        "unsafe"
 
-       "github.com/bytom/crypto/scrypt"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/scrypt"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 func calcSeed(blockHashs []*bc.Hash) []byte {

diff --git a/net/http/authn/authn.go b/net/http/authn/authn.go
index 95c1eda..e4a00de 100644 (file)
--- a/net/http/authn/authn.go
+++ b/net/http/authn/authn.go
@@ -8,8 +8,8 @@ import (
        "sync"
        "time"
 
-       "github.com/bytom/accesstoken"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/accesstoken"
+       "github.com/bytom/bytom/errors"
 )
 
 const tokenExpiry = time.Minute * 5

diff --git a/net/http/authn/authn_test.go b/net/http/authn/authn_test.go
index c6ba995..22eaf47 100644 (file)
--- a/net/http/authn/authn_test.go
+++ b/net/http/authn/authn_test.go
@@ -6,9 +6,9 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/accesstoken"
-       "github.com/bytom/errors"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/accesstoken"
+       "github.com/bytom/bytom/errors"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestAuthenticate(t *testing.T) {

diff --git a/net/http/httperror/httperror.go b/net/http/httperror/httperror.go
index c015e59..b253ad5 100644 (file)
--- a/net/http/httperror/httperror.go
+++ b/net/http/httperror/httperror.go
@@ -6,8 +6,8 @@ import (
        "context"
        "net/http"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/net/http/httpjson"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/net/http/httpjson"
 )
 
 // Info contains a set of error codes to send to the user.

diff --git a/net/http/httperror/httperror_test.go b/net/http/httperror/httperror_test.go
index 4ecf2fe..a197a00 100644 (file)
--- a/net/http/httperror/httperror_test.go
+++ b/net/http/httperror/httperror_test.go
@@ -5,7 +5,7 @@ import (
        "fmt"
        "testing"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 var (

diff --git a/net/http/httpjson/handler_test.go b/net/http/httpjson/handler_test.go
index e7b0063..8651174 100644 (file)
--- a/net/http/httpjson/handler_test.go
+++ b/net/http/httpjson/handler_test.go
@@ -9,7 +9,7 @@ import (
        "testing"
        "testing/iotest"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 func TestHandler(t *testing.T) {

diff --git a/net/http/httpjson/io.go b/net/http/httpjson/io.go
index d2221da..e465567 100644 (file)
--- a/net/http/httpjson/io.go
+++ b/net/http/httpjson/io.go
@@ -7,7 +7,7 @@ import (
        "net/http"
        "reflect"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
        log "github.com/sirupsen/logrus"
 )
 

diff --git a/net/websocket/wsclient.go b/net/websocket/wsclient.go
index 61fd749..f0a1651 100644 (file)
--- a/net/websocket/wsclient.go
+++ b/net/websocket/wsclient.go
@@ -12,7 +12,7 @@ import (
        "github.com/gorilla/websocket"
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 // websocketSendBufferSize is the number of elements the send channel

diff --git a/net/websocket/wsnotificationmaneger.go b/net/websocket/wsnotificationmaneger.go
index 96bdb12..bfe403b 100644 (file)
--- a/net/websocket/wsnotificationmaneger.go
+++ b/net/websocket/wsnotificationmaneger.go
@@ -7,10 +7,10 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 // Notification types

diff --git a/netsync/block_fetcher.go b/netsync/block_fetcher.go
index 3e59634..51f312e 100644 (file)
--- a/netsync/block_fetcher.go
+++ b/netsync/block_fetcher.go
@@ -4,8 +4,8 @@ import (
        log "github.com/sirupsen/logrus"
        "gopkg.in/karalabe/cookiejar.v2/collections/prque"
 
-       "github.com/bytom/p2p/security"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/p2p/security"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 const (

diff --git a/netsync/block_fetcher_test.go b/netsync/block_fetcher_test.go
index 7350b9a..679c76c 100644 (file)
--- a/netsync/block_fetcher_test.go
+++ b/netsync/block_fetcher_test.go
@@ -4,8 +4,8 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 type chain struct {

diff --git a/netsync/block_keeper.go b/netsync/block_keeper.go
index 298f6bb..05b9aec 100644 (file)
--- a/netsync/block_keeper.go
+++ b/netsync/block_keeper.go
@@ -6,12 +6,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/mining/tensority"
-       "github.com/bytom/p2p/security"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/mining/tensority"
+       "github.com/bytom/bytom/p2p/security"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/netsync/block_keeper_test.go b/netsync/block_keeper_test.go
index 4f4ae15..9eff7f5 100644 (file)
--- a/netsync/block_keeper_test.go
+++ b/netsync/block_keeper_test.go
@@ -7,12 +7,12 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/test/mock"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/test/mock"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestAppendHeaderList(t *testing.T) {

diff --git a/netsync/handle.go b/netsync/handle.go
index 566868a..9a63dd5 100644 (file)
--- a/netsync/handle.go
+++ b/netsync/handle.go
@@ -6,14 +6,14 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/event"
-       "github.com/bytom/p2p"
-       "github.com/bytom/p2p/security"
-       core "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/p2p"
+       "github.com/bytom/bytom/p2p/security"
+       core "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
        "github.com/tendermint/go-crypto"
 )
 

diff --git a/netsync/message.go b/netsync/message.go
index e191eb9..da8d0b0 100644 (file)
--- a/netsync/message.go
+++ b/netsync/message.go
@@ -9,8 +9,8 @@ import (
 
        "github.com/tendermint/go-wire"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 //protocol msg byte

diff --git a/netsync/peer.go b/netsync/peer.go
index 468ce9e..5be6921 100644 (file)
--- a/netsync/peer.go
+++ b/netsync/peer.go
@@ -10,10 +10,10 @@ import (
        "github.com/tendermint/tmlibs/flowrate"
        "gopkg.in/fatih/set.v0"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/netsync/protocol_reactor.go b/netsync/protocol_reactor.go
index 06d68d0..3e9768d 100644 (file)
--- a/netsync/protocol_reactor.go
+++ b/netsync/protocol_reactor.go
@@ -5,9 +5,9 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/p2p"
-       "github.com/bytom/p2p/connection"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/p2p"
+       "github.com/bytom/bytom/p2p/connection"
 )
 
 const (

diff --git a/netsync/tool_test.go b/netsync/tool_test.go
index 5e4a704..6154bcb 100644 (file)
--- a/netsync/tool_test.go
+++ b/netsync/tool_test.go
@@ -9,10 +9,10 @@ import (
        wire "github.com/tendermint/go-wire"
        "github.com/tendermint/tmlibs/flowrate"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/test/mock"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/test/mock"
 )
 
 type P2PPeer struct {

diff --git a/netsync/tx_keeper.go b/netsync/tx_keeper.go
index 1ec3dab..b8194aa 100644 (file)
--- a/netsync/tx_keeper.go
+++ b/netsync/tx_keeper.go
@@ -6,8 +6,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       core "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
+       core "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/node/node.go b/node/node.go
index 61ca399..e64f863 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -13,27 +13,27 @@ import (
        cmn "github.com/tendermint/tmlibs/common"
        browser "github.com/toqueteos/webbrowser"
 
-       "github.com/bytom/accesstoken"
-       "github.com/bytom/account"
-       "github.com/bytom/api"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/txfeed"
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/database"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/env"
-       "github.com/bytom/event"
-       bytomLog "github.com/bytom/log"
-       "github.com/bytom/mining/cpuminer"
-       "github.com/bytom/mining/miningpool"
-       "github.com/bytom/mining/tensority"
-       "github.com/bytom/net/websocket"
-       "github.com/bytom/netsync"
-       "github.com/bytom/p2p"
-       "github.com/bytom/protocol"
-       w "github.com/bytom/wallet"
+       "github.com/bytom/bytom/accesstoken"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/api"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/txfeed"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/env"
+       "github.com/bytom/bytom/event"
+       bytomLog "github.com/bytom/bytom/log"
+       "github.com/bytom/bytom/mining/cpuminer"
+       "github.com/bytom/bytom/mining/miningpool"
+       "github.com/bytom/bytom/mining/tensority"
+       "github.com/bytom/bytom/net/websocket"
+       "github.com/bytom/bytom/netsync"
+       "github.com/bytom/bytom/p2p"
+       "github.com/bytom/bytom/protocol"
+       w "github.com/bytom/bytom/wallet"
 )
 
 const (

diff --git a/node/node_test.go b/node/node_test.go
index a4d2c50..dbf73d6 100644 (file)
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -5,7 +5,7 @@ import (
        "os"
        "testing"
 
-       cfg "github.com/bytom/config"
+       cfg "github.com/bytom/bytom/config"
 )
 
 func TestNodeUsedDataDir(t *testing.T) {

diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go
index 7d0f28d..755396c 100644 (file)
--- a/p2p/base_reactor.go
+++ b/p2p/base_reactor.go
@@ -3,7 +3,7 @@ package p2p
 import (
        cmn "github.com/tendermint/tmlibs/common"
 
-       "github.com/bytom/p2p/connection"
+       "github.com/bytom/bytom/p2p/connection"
 )
 
 //Reactor is responsible for handling incoming messages of one or more `Channels`

diff --git a/p2p/discover/dht/database.go b/p2p/discover/dht/database.go
index 6714ed3..06b2d3e 100644 (file)
--- a/p2p/discover/dht/database.go
+++ b/p2p/discover/dht/database.go
@@ -15,9 +15,9 @@ import (
        log "github.com/sirupsen/logrus"
        wire "github.com/tendermint/go-wire"
 
-       "github.com/bytom/crypto"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
 )
 
 var (

diff --git a/p2p/discover/dht/dns_seeds.go b/p2p/discover/dht/dns_seeds.go
index 78468d0..e5ddf51 100644 (file)
--- a/p2p/discover/dht/dns_seeds.go
+++ b/p2p/discover/dht/dns_seeds.go
@@ -6,8 +6,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
 )
 
 var (

diff --git a/p2p/discover/dht/dns_seeds_test.go b/p2p/discover/dht/dns_seeds_test.go
index 694146f..76579e0 100644 (file)
--- a/p2p/discover/dht/dns_seeds_test.go
+++ b/p2p/discover/dht/dns_seeds_test.go
@@ -4,7 +4,7 @@ import (
        "reflect"
        "testing"
 
-       "github.com/bytom/consensus"
+       "github.com/bytom/bytom/consensus"
        "github.com/davecgh/go-spew/spew"
 )
 

diff --git a/p2p/discover/dht/net.go b/p2p/discover/dht/net.go
index fd1204f..a6442b0 100644 (file)
--- a/p2p/discover/dht/net.go
+++ b/p2p/discover/dht/net.go
@@ -12,9 +12,9 @@ import (
        "github.com/tendermint/go-wire"
        "golang.org/x/crypto/sha3"
 
-       "github.com/bytom/common"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/p2p/netutil"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/p2p/netutil"
 )
 
 var (

diff --git a/p2p/discover/dht/node.go b/p2p/discover/dht/node.go
index 477ba8f..bcedca9 100644 (file)
--- a/p2p/discover/dht/node.go
+++ b/p2p/discover/dht/node.go
@@ -14,8 +14,8 @@ import (
        "strings"
        "time"
 
-       "github.com/bytom/common"
-       "github.com/bytom/crypto"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/crypto"
 )
 
 // Node represents a host on the network.

diff --git a/p2p/discover/dht/table.go b/p2p/discover/dht/table.go
index c0d4645..a6af968 100644 (file)
--- a/p2p/discover/dht/table.go
+++ b/p2p/discover/dht/table.go
@@ -14,8 +14,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/common"
-       "github.com/bytom/crypto"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/crypto"
 )
 
 const (

diff --git a/p2p/discover/dht/ticket.go b/p2p/discover/dht/ticket.go
index e1e4708..7c7817e 100644 (file)
--- a/p2p/discover/dht/ticket.go
+++ b/p2p/discover/dht/ticket.go
@@ -11,8 +11,8 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/common"
-       "github.com/bytom/crypto"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/crypto"
 )
 
 const (

diff --git a/p2p/discover/dht/udp.go b/p2p/discover/dht/udp.go
index a702c82..912aa05 100644 (file)
--- a/p2p/discover/dht/udp.go
+++ b/p2p/discover/dht/udp.go
@@ -14,12 +14,12 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/go-wire"
 
-       "github.com/bytom/common"
-       cfg "github.com/bytom/config"
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/p2p/netutil"
-       "github.com/bytom/version"
+       "github.com/bytom/bytom/common"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/p2p/netutil"
+       "github.com/bytom/bytom/version"
 )
 
 const (

diff --git a/p2p/discover/mdns/lan_discover.go b/p2p/discover/mdns/lan_discover.go
index e9a81ba..df9b05d 100644 (file)
--- a/p2p/discover/mdns/lan_discover.go
+++ b/p2p/discover/mdns/lan_discover.go
@@ -7,7 +7,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/event"
+       "github.com/bytom/bytom/event"
 )
 
 const (

diff --git a/p2p/listener.go b/p2p/listener.go
index d7a1199..14117d3 100644 (file)
--- a/p2p/listener.go
+++ b/p2p/listener.go
@@ -10,9 +10,9 @@ import (
        log "github.com/sirupsen/logrus"
        cmn "github.com/tendermint/tmlibs/common"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/errors"
-       "github.com/bytom/p2p/upnp"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/p2p/upnp"
 )
 
 const (

diff --git a/p2p/node_info.go b/p2p/node_info.go
index 2efb011..b5259ad 100644 (file)
--- a/p2p/node_info.go
+++ b/p2p/node_info.go
@@ -7,9 +7,9 @@ import (
 
        "github.com/tendermint/go-crypto"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/version"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/version"
 )
 
 const maxNodeInfoSize = 10240 // 10Kb

diff --git a/p2p/peer.go b/p2p/peer.go
index 01858c5..5c0a07b 100644 (file)
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -15,9 +15,9 @@ import (
        cmn "github.com/tendermint/tmlibs/common"
        "github.com/tendermint/tmlibs/flowrate"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/p2p/connection"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/p2p/connection"
 )
 
 // peerConn contains the raw connection and its config.

diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index 74b9744..af2213d 100644 (file)
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -8,9 +8,9 @@ import (
 
        "github.com/tendermint/go-crypto"
 
-       cfg "github.com/bytom/config"
-       conn "github.com/bytom/p2p/connection"
-       "github.com/bytom/version"
+       cfg "github.com/bytom/bytom/config"
+       conn "github.com/bytom/bytom/p2p/connection"
+       "github.com/bytom/bytom/version"
 )
 
 const testCh = 0x01

diff --git a/p2p/security/blacklist.go b/p2p/security/blacklist.go
index 951d659..c4b8ec4 100644 (file)
--- a/p2p/security/blacklist.go
+++ b/p2p/security/blacklist.go
@@ -6,8 +6,8 @@ import (
        "sync"
        "time"
 
-       cfg "github.com/bytom/config"
-       dbm "github.com/bytom/database/leveldb"
+       cfg "github.com/bytom/bytom/config"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/p2p/security/security.go b/p2p/security/security.go
index 41db475..1a1e678 100644 (file)
--- a/p2p/security/security.go
+++ b/p2p/security/security.go
@@ -3,7 +3,7 @@ package security
 import (
        log "github.com/sirupsen/logrus"
 
-       cfg "github.com/bytom/config"
+       cfg "github.com/bytom/bytom/config"
 )
 
 const logModule = "p2pSecurity"

diff --git a/p2p/switch.go b/p2p/switch.go
index d768e64..eb28dc4 100644 (file)
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -11,17 +11,17 @@ import (
        "github.com/tendermint/go-crypto"
        cmn "github.com/tendermint/tmlibs/common"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/errors"
-       "github.com/bytom/event"
-       "github.com/bytom/p2p/connection"
-       "github.com/bytom/p2p/discover/dht"
-       "github.com/bytom/p2p/discover/mdns"
-       "github.com/bytom/p2p/netutil"
-       "github.com/bytom/p2p/security"
-       "github.com/bytom/version"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/p2p/connection"
+       "github.com/bytom/bytom/p2p/discover/dht"
+       "github.com/bytom/bytom/p2p/discover/mdns"
+       "github.com/bytom/bytom/p2p/netutil"
+       "github.com/bytom/bytom/p2p/security"
+       "github.com/bytom/bytom/version"
 )
 
 const (

diff --git a/p2p/switch_test.go b/p2p/switch_test.go
index c276a07..3eafd2e 100644 (file)
--- a/p2p/switch_test.go
+++ b/p2p/switch_test.go
@@ -10,11 +10,11 @@ import (
        "github.com/davecgh/go-spew/spew"
        "github.com/tendermint/go-crypto"
 
-       cfg "github.com/bytom/config"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/errors"
-       conn "github.com/bytom/p2p/connection"
-       "github.com/bytom/p2p/security"
+       cfg "github.com/bytom/bytom/config"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
+       conn "github.com/bytom/bytom/p2p/connection"
+       "github.com/bytom/bytom/p2p/security"
 )
 
 var (

diff --git a/p2p/test_util.go b/p2p/test_util.go
index abb3b5b..00ba668 100644 (file)
--- a/p2p/test_util.go
+++ b/p2p/test_util.go
@@ -7,10 +7,10 @@ import (
        "github.com/tendermint/go-crypto"
        cmn "github.com/tendermint/tmlibs/common"
 
-       cfg "github.com/bytom/config"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/p2p/connection"
-       "github.com/bytom/p2p/discover/dht"
+       cfg "github.com/bytom/bytom/config"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/p2p/connection"
+       "github.com/bytom/bytom/p2p/discover/dht"
 )
 
 //PanicOnAddPeerErr add peer error

diff --git a/protocol/bc/asset.go b/protocol/bc/asset.go
index 880df75..e1e704f 100644 (file)
--- a/protocol/bc/asset.go
+++ b/protocol/bc/asset.go
@@ -5,8 +5,8 @@ import (
        "errors"
        "io"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/encoding/blockchain"
 )
 
 // NewAssetID convert byte array to aseet id

diff --git a/protocol/bc/entry.go b/protocol/bc/entry.go
index 48c4662..dabd9d5 100644 (file)
--- a/protocol/bc/entry.go
+++ b/protocol/bc/entry.go
@@ -8,9 +8,9 @@ import (
 
        "github.com/golang/protobuf/proto"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
 )
 
 // Entry is the interface implemented by each addressable unit in a

diff --git a/protocol/bc/tx.go b/protocol/bc/tx.go
index c73ea3a..20191ce 100644 (file)
--- a/protocol/bc/tx.go
+++ b/protocol/bc/tx.go
@@ -1,8 +1,8 @@
 package bc
 
 import (
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
 )
 
 // Tx is a wrapper for the entries-based representation of a transaction.

diff --git a/protocol/bc/types/block.go b/protocol/bc/types/block.go
index ddda19a..e80e90f 100644 (file)
--- a/protocol/bc/types/block.go
+++ b/protocol/bc/types/block.go
@@ -5,9 +5,9 @@ import (
        "fmt"
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/encoding/bufpool"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/encoding/bufpool"
+       "github.com/bytom/bytom/errors"
 )
 
 // serflag variables, start with 1

diff --git a/protocol/bc/types/block_commitment.go b/protocol/bc/types/block_commitment.go
index ad4d822..1219293 100644 (file)
--- a/protocol/bc/types/block_commitment.go
+++ b/protocol/bc/types/block_commitment.go
@@ -3,8 +3,8 @@ package types
 import (
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // BlockCommitment store the TransactionsMerkleRoot && TransactionStatusHash

diff --git a/protocol/bc/types/block_commitment_test.go b/protocol/bc/types/block_commitment_test.go
index 97375de..3c35fd0 100644 (file)
--- a/protocol/bc/types/block_commitment_test.go
+++ b/protocol/bc/types/block_commitment_test.go
@@ -5,8 +5,8 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestReadWriteBlockCommitment(t *testing.T) {

diff --git a/protocol/bc/types/block_header.go b/protocol/bc/types/block_header.go
index f15184b..49a6a18 100644 (file)
--- a/protocol/bc/types/block_header.go
+++ b/protocol/bc/types/block_header.go
@@ -6,10 +6,10 @@ import (
        "io"
        "time"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/encoding/bufpool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/encoding/bufpool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // BlockHeader defines information about a block and is used in the Bytom

diff --git a/protocol/bc/types/block_header_test.go b/protocol/bc/types/block_header_test.go
index bda1a88..1d6c3a5 100644 (file)
--- a/protocol/bc/types/block_header_test.go
+++ b/protocol/bc/types/block_header_test.go
@@ -9,9 +9,9 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestBlockHeader(t *testing.T) {

diff --git a/protocol/bc/types/block_test.go b/protocol/bc/types/block_test.go
index e4936ef..0249994 100644 (file)
--- a/protocol/bc/types/block_test.go
+++ b/protocol/bc/types/block_test.go
@@ -9,10 +9,10 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestBlock(t *testing.T) {

diff --git a/protocol/bc/types/issuance.go b/protocol/bc/types/issuance.go
index ff8feeb..39d0ec2 100644 (file)
--- a/protocol/bc/types/issuance.go
+++ b/protocol/bc/types/issuance.go
@@ -1,8 +1,8 @@
 package types
 
 import (
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // IssuanceInput satisfies the TypedInput interface and represents a issuance.

diff --git a/protocol/bc/types/map.go b/protocol/bc/types/map.go
index 4975bd7..6488861 100644 (file)
--- a/protocol/bc/types/map.go
+++ b/protocol/bc/types/map.go
@@ -1,10 +1,10 @@
 package types
 
 import (
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // MapTx converts a types TxData object into its entries-based

diff --git a/protocol/bc/types/map_test.go b/protocol/bc/types/map_test.go
index 8b6c366..02b369c 100644 (file)
--- a/protocol/bc/types/map_test.go
+++ b/protocol/bc/types/map_test.go
@@ -6,9 +6,9 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestMapSpendTx(t *testing.T) {

diff --git a/protocol/bc/types/merkle.go b/protocol/bc/types/merkle.go
index 78fbac7..5eff16d 100644 (file)
--- a/protocol/bc/types/merkle.go
+++ b/protocol/bc/types/merkle.go
@@ -7,8 +7,8 @@ import (
 
        "gopkg.in/fatih/set.v0"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // merkleFlag represent the type of merkle tree node, it's used to generate the structure of merkle tree

diff --git a/protocol/bc/types/merkle_test.go b/protocol/bc/types/merkle_test.go
index deeb222..30e97f9 100644 (file)
--- a/protocol/bc/types/merkle_test.go
+++ b/protocol/bc/types/merkle_test.go
@@ -7,9 +7,9 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestMerkleRoot(t *testing.T) {

diff --git a/protocol/bc/types/output_commitment.go b/protocol/bc/types/output_commitment.go
index 413a27b..e949b15 100644 (file)
--- a/protocol/bc/types/output_commitment.go
+++ b/protocol/bc/types/output_commitment.go
@@ -4,10 +4,10 @@ import (
        "fmt"
        "io"
 
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // OutputCommitment contains the commitment data for a transaction output.

diff --git a/protocol/bc/types/output_commitment_test.go b/protocol/bc/types/output_commitment_test.go
index bf26c7d..f9655e5 100644 (file)
--- a/protocol/bc/types/output_commitment_test.go
+++ b/protocol/bc/types/output_commitment_test.go
@@ -5,9 +5,9 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestReadWriteOutputCommitment(t *testing.T) {

diff --git a/protocol/bc/types/spend.go b/protocol/bc/types/spend.go
index 2fb26cd..4dd6cde 100644 (file)
--- a/protocol/bc/types/spend.go
+++ b/protocol/bc/types/spend.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // SpendInput satisfies the TypedInput interface and represents a spend transaction.

diff --git a/protocol/bc/types/spend_commitment.go b/protocol/bc/types/spend_commitment.go
index 08a35ea..68528da 100644 (file)
--- a/protocol/bc/types/spend_commitment.go
+++ b/protocol/bc/types/spend_commitment.go
@@ -4,9 +4,9 @@ import (
        "fmt"
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // SpendCommitment contains the commitment data for a transaction output.

diff --git a/protocol/bc/types/spend_commitment_test.go b/protocol/bc/types/spend_commitment_test.go
index 73cf114..a2a1192 100644 (file)
--- a/protocol/bc/types/spend_commitment_test.go
+++ b/protocol/bc/types/spend_commitment_test.go
@@ -5,9 +5,9 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestReadWriteSpendCommitment(t *testing.T) {

diff --git a/protocol/bc/types/spend_test.go b/protocol/bc/types/spend_test.go
index f451a5e..2633c24 100644 (file)
--- a/protocol/bc/types/spend_test.go
+++ b/protocol/bc/types/spend_test.go
@@ -8,9 +8,9 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestSerializationSpendCommitment(t *testing.T) {

diff --git a/protocol/bc/types/transaction.go b/protocol/bc/types/transaction.go
index 765df5d..48f16b0 100644 (file)
--- a/protocol/bc/types/transaction.go
+++ b/protocol/bc/types/transaction.go
@@ -6,9 +6,9 @@ import (
        "fmt"
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 const serRequired = 0x7 // Bit mask accepted serialization flag.

diff --git a/protocol/bc/types/transaction_test.go b/protocol/bc/types/transaction_test.go
index c3a7d4c..b73d449 100644 (file)
--- a/protocol/bc/types/transaction_test.go
+++ b/protocol/bc/types/transaction_test.go
@@ -10,10 +10,10 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestTransaction(t *testing.T) {

diff --git a/protocol/bc/types/txinput.go b/protocol/bc/types/txinput.go
index 9820ee0..f3bcf23 100644 (file)
--- a/protocol/bc/types/txinput.go
+++ b/protocol/bc/types/txinput.go
@@ -4,9 +4,9 @@ import (
        "fmt"
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // serflag variables for input types.

diff --git a/protocol/bc/types/txinput_test.go b/protocol/bc/types/txinput_test.go
index 2286573..4354cb9 100644 (file)
--- a/protocol/bc/types/txinput_test.go
+++ b/protocol/bc/types/txinput_test.go
@@ -8,8 +8,8 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestSerializationIssuance(t *testing.T) {

diff --git a/protocol/bc/types/txoutput.go b/protocol/bc/types/txoutput.go
index 2df28e8..d76ca6b 100644 (file)
--- a/protocol/bc/types/txoutput.go
+++ b/protocol/bc/types/txoutput.go
@@ -3,9 +3,9 @@ package types
 import (
        "io"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // TxOutput is the top level struct of tx output.

diff --git a/protocol/bc/types/txoutput_test.go b/protocol/bc/types/txoutput_test.go
index d229e7c..23ac4b4 100644 (file)
--- a/protocol/bc/types/txoutput_test.go
+++ b/protocol/bc/types/txoutput_test.go
@@ -8,9 +8,9 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/encoding/blockchain"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/encoding/blockchain"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestSerializationTxOutput(t *testing.T) {

diff --git a/protocol/block.go b/protocol/block.go
index 97ea244..3cb6908 100644 (file)
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -3,11 +3,11 @@ package protocol
 import (
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/protocol/validation"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/protocol/validation"
 )
 
 var (

diff --git a/protocol/block_test.go b/protocol/block_test.go
index 9b93633..2f28aaf 100644 (file)
--- a/protocol/block_test.go
+++ b/protocol/block_test.go
@@ -3,10 +3,10 @@ package protocol
 import (
        "testing"
 
-       "github.com/bytom/config"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestCalcReorganizeNodes(t *testing.T) {

diff --git a/protocol/orphan_manage.go b/protocol/orphan_manage.go
index fad633a..709714c 100644 (file)
--- a/protocol/orphan_manage.go
+++ b/protocol/orphan_manage.go
@@ -6,9 +6,9 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 var (

diff --git a/protocol/orphan_manage_test.go b/protocol/orphan_manage_test.go
index 6e74265..d8972dc 100644 (file)
--- a/protocol/orphan_manage_test.go
+++ b/protocol/orphan_manage_test.go
@@ -4,9 +4,9 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 var testBlocks = []*types.Block{

diff --git a/protocol/protocol.go b/protocol/protocol.go
index 5f62bf6..fab3ced 100644 (file)
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -5,11 +5,11 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/config"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
+       "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
 )
 
 const maxProcessBlockChSize = 1024

diff --git a/protocol/state/blockindex.go b/protocol/state/blockindex.go
index ae8a5ae..57746d0 100644 (file)
--- a/protocol/state/blockindex.go
+++ b/protocol/state/blockindex.go
@@ -6,12 +6,12 @@ import (
        "sort"
        "sync"
 
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 // approxNodesPerDay is an approximation of the number of new blocks there are

diff --git a/protocol/state/blockindex_test.go b/protocol/state/blockindex_test.go
index 8ea25b2..3b291ac 100644 (file)
--- a/protocol/state/blockindex_test.go
+++ b/protocol/state/blockindex_test.go
@@ -8,11 +8,11 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 func stringToBigInt(s string, base int) *big.Int {

diff --git a/protocol/state/utxo_view.go b/protocol/state/utxo_view.go
index 0815ce4..c309551 100644 (file)
--- a/protocol/state/utxo_view.go
+++ b/protocol/state/utxo_view.go
@@ -3,9 +3,9 @@ package state
 import (
        "errors"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 // UtxoViewpoint represents a view into the set of unspent transaction outputs

diff --git a/protocol/state/utxo_view_test.go b/protocol/state/utxo_view_test.go
index d224327..e377d3a 100644 (file)
--- a/protocol/state/utxo_view_test.go
+++ b/protocol/state/utxo_view_test.go
@@ -3,10 +3,10 @@ package state
 import (
        "testing"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/testutil"
 )
 
 var defaultEntry = map[bc.Hash]bc.Entry{

diff --git a/protocol/store.go b/protocol/store.go
index 014b244..c595fe8 100644 (file)
--- a/protocol/store.go
+++ b/protocol/store.go
@@ -1,10 +1,10 @@
 package protocol
 
 import (
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
 )
 
 // Store provides storage interface for blockchain data

diff --git a/protocol/tx.go b/protocol/tx.go
index c5efb1f..8f5f13d 100644 (file)
--- a/protocol/tx.go
+++ b/protocol/tx.go
@@ -3,11 +3,11 @@ package protocol
 import (
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/protocol/validation"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/protocol/validation"
 )
 
 // ErrBadTx is returned for transactions failing validation

diff --git a/protocol/txpool.go b/protocol/txpool.go
index f24710c..7bdb1e8 100644 (file)
--- a/protocol/txpool.go
+++ b/protocol/txpool.go
@@ -9,11 +9,11 @@ import (
        "github.com/golang/groupcache/lru"
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
 )
 
 // msg type

diff --git a/protocol/txpool_test.go b/protocol/txpool_test.go
index 243b39f..177921d 100644 (file)
--- a/protocol/txpool_test.go
+++ b/protocol/txpool_test.go
@@ -6,13 +6,13 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
 )
 
 var testTxs = []*types.Tx{

diff --git a/protocol/validation/block.go b/protocol/validation/block.go
index c1975af..ada4a1d 100644 (file)
--- a/protocol/validation/block.go
+++ b/protocol/validation/block.go
@@ -5,12 +5,12 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
 )
 
 const logModule = "leveldb"

diff --git a/protocol/validation/block_test.go b/protocol/validation/block_test.go
index 8ac32c0..48049bc 100644 (file)
--- a/protocol/validation/block_test.go
+++ b/protocol/validation/block_test.go
@@ -5,14 +5,14 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/mining/tensority"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/mining/tensority"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestCheckBlockTime(t *testing.T) {

diff --git a/protocol/validation/test/tx_ugly_test.go b/protocol/validation/test/tx_ugly_test.go
index ba69347..d6b60a3 100644 (file)
--- a/protocol/validation/test/tx_ugly_test.go
+++ b/protocol/validation/test/tx_ugly_test.go
@@ -5,15 +5,15 @@ import (
        "math"
        "testing"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/protocol/vm/vmutil"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestValidateUglyTx(t *testing.T) {

diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go
index f7e860e..e29a753 100644 (file)
--- a/protocol/validation/tx.go
+++ b/protocol/validation/tx.go
@@ -4,12 +4,12 @@ import (
        "fmt"
        "math"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/errors"
-       "github.com/bytom/math/checked"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/math/checked"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 const ruleAA = 142500

diff --git a/protocol/validation/tx_scene_test.go b/protocol/validation/tx_scene_test.go
index 6f97c81..3c9b77f 100644 (file)
--- a/protocol/validation/tx_scene_test.go
+++ b/protocol/validation/tx_scene_test.go
@@ -4,10 +4,10 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 func TestValidateTx(t *testing.T) {

diff --git a/protocol/validation/tx_test.go b/protocol/validation/tx_test.go
index d6f8eab..d143da7 100644 (file)
--- a/protocol/validation/tx_test.go
+++ b/protocol/validation/tx_test.go
@@ -6,14 +6,14 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func init() {

diff --git a/protocol/validation/vmcontext.go b/protocol/validation/vmcontext.go
index 7404d47..cd7a2ad 100644 (file)
--- a/protocol/validation/vmcontext.go
+++ b/protocol/validation/vmcontext.go
@@ -3,11 +3,11 @@ package validation
 import (
        "bytes"
 
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 // NewTxVMContext generates the vm.Context for BVM

diff --git a/protocol/validation/vmcontext_test.go b/protocol/validation/vmcontext_test.go
index 3325297..19014b9 100644 (file)
--- a/protocol/validation/vmcontext_test.go
+++ b/protocol/validation/vmcontext_test.go
@@ -4,10 +4,10 @@ import (
        "fmt"
        "testing"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 func TestCheckOutput(t *testing.T) {

diff --git a/protocol/vm/assemble.go b/protocol/vm/assemble.go
index bd4d50c..b01679d 100644 (file)
--- a/protocol/vm/assemble.go
+++ b/protocol/vm/assemble.go
@@ -10,7 +10,7 @@ import (
        "strings"
        "unicode"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 // Assemble converts a string like "2 3 ADD 5 NUMEQUAL" into 0x525393559c.

diff --git a/protocol/vm/assemble_test.go b/protocol/vm/assemble_test.go
index 5a141e2..94d131b 100644 (file)
--- a/protocol/vm/assemble_test.go
+++ b/protocol/vm/assemble_test.go
@@ -5,7 +5,7 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 func TestAssemble(t *testing.T) {

diff --git a/protocol/vm/bitwise_test.go b/protocol/vm/bitwise_test.go
index a4fe1ab..ca0d412 100644 (file)
--- a/protocol/vm/bitwise_test.go
+++ b/protocol/vm/bitwise_test.go
@@ -3,7 +3,7 @@ package vm
 import (
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestBitwiseOps(t *testing.T) {

diff --git a/protocol/vm/control_test.go b/protocol/vm/control_test.go
index 2c134df..04c0407 100644 (file)
--- a/protocol/vm/control_test.go
+++ b/protocol/vm/control_test.go
@@ -3,7 +3,7 @@ package vm
 import (
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestControlOps(t *testing.T) {

diff --git a/protocol/vm/crypto.go b/protocol/vm/crypto.go
index ac94f4d..9d09dce 100644 (file)
--- a/protocol/vm/crypto.go
+++ b/protocol/vm/crypto.go
@@ -6,9 +6,9 @@ import (
 
        "golang.org/x/crypto/sha3"
 
-       "github.com/bytom/crypto"
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/math/checked"
+       "github.com/bytom/bytom/crypto"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/math/checked"
 )
 
 func opSha256(vm *virtualMachine) error {

diff --git a/protocol/vm/crypto_test.go b/protocol/vm/crypto_test.go
index bbac97b..db18b3c 100644 (file)
--- a/protocol/vm/crypto_test.go
+++ b/protocol/vm/crypto_test.go
@@ -3,7 +3,7 @@ package vm
 import (
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestCheckSig(t *testing.T) {

diff --git a/protocol/vm/introspection_test.go b/protocol/vm/introspection_test.go
index d2a2885..5ed369a 100644 (file)
--- a/protocol/vm/introspection_test.go
+++ b/protocol/vm/introspection_test.go
@@ -5,8 +5,8 @@ import (
 
        "github.com/davecgh/go-spew/spew"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestOutputIDAndNonceOp(t *testing.T) {

diff --git a/protocol/vm/numeric.go b/protocol/vm/numeric.go
index 09486d2..6e7884d 100644 (file)
--- a/protocol/vm/numeric.go
+++ b/protocol/vm/numeric.go
@@ -3,7 +3,7 @@ package vm
 import (
        "math"
 
-       "github.com/bytom/math/checked"
+       "github.com/bytom/bytom/math/checked"
 )
 
 func op1Add(vm *virtualMachine) error {

diff --git a/protocol/vm/numeric_test.go b/protocol/vm/numeric_test.go
index 0c7ac48..4a5e300 100644 (file)
--- a/protocol/vm/numeric_test.go
+++ b/protocol/vm/numeric_test.go
@@ -5,7 +5,7 @@ import (
        "math"
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestNumericOps(t *testing.T) {

diff --git a/protocol/vm/ops.go b/protocol/vm/ops.go
index 8a2b6f3..19cb800 100644 (file)
--- a/protocol/vm/ops.go
+++ b/protocol/vm/ops.go
@@ -6,8 +6,8 @@ import (
        "math"
        "reflect"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/math/checked"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/math/checked"
 )
 
 type Op uint8

diff --git a/protocol/vm/ops_test.go b/protocol/vm/ops_test.go
index da09cf8..c0cc660 100644 (file)
--- a/protocol/vm/ops_test.go
+++ b/protocol/vm/ops_test.go
@@ -5,9 +5,9 @@ import (
        "reflect"
        "testing"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/math/checked"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/math/checked"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestParseOp(t *testing.T) {

diff --git a/protocol/vm/pushdata_test.go b/protocol/vm/pushdata_test.go
index 25c2523..ac01b99 100644 (file)
--- a/protocol/vm/pushdata_test.go
+++ b/protocol/vm/pushdata_test.go
@@ -4,7 +4,7 @@ import (
        "bytes"
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestPushdataOps(t *testing.T) {

diff --git a/protocol/vm/splice.go b/protocol/vm/splice.go
index b426cb4..560defb 100644 (file)
--- a/protocol/vm/splice.go
+++ b/protocol/vm/splice.go
@@ -1,6 +1,6 @@
 package vm
 
-import "github.com/bytom/math/checked"
+import "github.com/bytom/bytom/math/checked"
 
 func opCat(vm *virtualMachine) error {
        err := vm.applyCost(4)

diff --git a/protocol/vm/splice_test.go b/protocol/vm/splice_test.go
index dcc3b1c..e06f4c9 100644 (file)
--- a/protocol/vm/splice_test.go
+++ b/protocol/vm/splice_test.go
@@ -3,7 +3,7 @@ package vm
 import (
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestSpliceOps(t *testing.T) {

diff --git a/protocol/vm/stack.go b/protocol/vm/stack.go
index 0c72755..0d0ec3b 100644 (file)
--- a/protocol/vm/stack.go
+++ b/protocol/vm/stack.go
@@ -1,6 +1,6 @@
 package vm
 
-import "github.com/bytom/math/checked"
+import "github.com/bytom/bytom/math/checked"
 
 func opToAltStack(vm *virtualMachine) error {
        err := vm.applyCost(2)

diff --git a/protocol/vm/stack_test.go b/protocol/vm/stack_test.go
index 559c00d..d78106c 100644 (file)
--- a/protocol/vm/stack_test.go
+++ b/protocol/vm/stack_test.go
@@ -7,7 +7,7 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestStackOps(t *testing.T) {

diff --git a/protocol/vm/vm.go b/protocol/vm/vm.go
index c9f8e13..86447a8 100644 (file)
--- a/protocol/vm/vm.go
+++ b/protocol/vm/vm.go
@@ -6,7 +6,7 @@ import (
        "io"
        "strings"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 type virtualMachine struct {

diff --git a/protocol/vm/vm_test.go b/protocol/vm/vm_test.go
index 942a236..a130369 100644 (file)
--- a/protocol/vm/vm_test.go
+++ b/protocol/vm/vm_test.go
@@ -8,8 +8,8 @@ import (
        "testing"
        "testing/quick"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/testutil"
 )
 
 type tracebuf struct {

diff --git a/protocol/vm/vmutil/builder.go b/protocol/vm/vmutil/builder.go
index 8f57cd1..f2ffb85 100644 (file)
--- a/protocol/vm/vmutil/builder.go
+++ b/protocol/vm/vmutil/builder.go
@@ -3,8 +3,8 @@ package vmutil
 import (
        "encoding/binary"
 
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 type Builder struct {

diff --git a/protocol/vm/vmutil/builder_test.go b/protocol/vm/vmutil/builder_test.go
index 3df7f8d..c3078d3 100644 (file)
--- a/protocol/vm/vmutil/builder_test.go
+++ b/protocol/vm/vmutil/builder_test.go
@@ -5,7 +5,7 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 func TestAddJump(t *testing.T) {

diff --git a/protocol/vm/vmutil/script.go b/protocol/vm/vmutil/script.go
index 7cef891..2de83d6 100644 (file)
--- a/protocol/vm/vmutil/script.go
+++ b/protocol/vm/vmutil/script.go
@@ -1,9 +1,9 @@
 package vmutil
 
 import (
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 // pre-define errors

diff --git a/protocol/vm/vmutil/script_test.go b/protocol/vm/vmutil/script_test.go
index b5c2b63..4a4df8c 100644 (file)
--- a/protocol/vm/vmutil/script_test.go
+++ b/protocol/vm/vmutil/script_test.go
@@ -4,8 +4,8 @@ import (
        "encoding/hex"
        "testing"
 
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/errors"
 )
 
 // TestIsUnspendable ensures the IsUnspendable function returns the expected

diff --git a/test/bench_blockchain_test.go b/test/bench_blockchain_test.go
index b317f89..a94a0fd 100644 (file)
--- a/test/bench_blockchain_test.go
+++ b/test/bench_blockchain_test.go
@@ -7,22 +7,22 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/database"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/event"
-       "github.com/bytom/mining"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/mining"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func BenchmarkChain_CoinBaseTx_NoAsset(b *testing.B) {

diff --git a/test/block_test.go b/test/block_test.go
index 8b703f0..bfff121 100644 (file)
--- a/test/block_test.go
+++ b/test/block_test.go
@@ -7,11 +7,11 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestBlockHeader(t *testing.T) {

diff --git a/test/block_test_util.go b/test/block_test_util.go
index dd846b7..66d3454 100644 (file)
--- a/test/block_test_util.go
+++ b/test/block_test_util.go
@@ -1,12 +1,12 @@
 package test
 
 import (
-       "github.com/bytom/mining/tensority"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/mining/tensority"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/protocol/vm"
 )
 
 // NewBlock create block according to the current status of chain

diff --git a/test/chain_test_util.go b/test/chain_test_util.go
index 9e84d20..9f32749 100644 (file)
--- a/test/chain_test_util.go
+++ b/test/chain_test_util.go
@@ -5,16 +5,16 @@ import (
        "os"
        "time"
 
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/database"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
        "github.com/golang/protobuf/proto"
-       dbm "github.com/bytom/database/leveldb"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const utxoPrefix = "UT:"

diff --git a/test/integration/block_integration_test.go b/test/integration/block_integration_test.go
index 61c3f30..84dc1a0 100644 (file)
--- a/test/integration/block_integration_test.go
+++ b/test/integration/block_integration_test.go
@@ -5,15 +5,15 @@ import (
 
        "time"
 
-       "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/database"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
 )
 
 var blockMap map[int][]*attachBlock

diff --git a/test/integration/block_integration_util.go b/test/integration/block_integration_util.go
index 98dfaaf..0b31f64 100644 (file)
--- a/test/integration/block_integration_util.go
+++ b/test/integration/block_integration_util.go
@@ -10,15 +10,15 @@ import (
 
        "github.com/golang/protobuf/proto"
 
-       "github.com/bytom/database"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/database"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
 )
 
 const (

diff --git a/test/integration/run_test.go b/test/integration/run_test.go
index a8e8c21..90de8e9 100644 (file)
--- a/test/integration/run_test.go
+++ b/test/integration/run_test.go
@@ -3,9 +3,9 @@ package integration
 import (
        "fmt"
 
-       cfg "github.com/bytom/config"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/util"
+       cfg "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/util"
 )
 
 // Mock config.

diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go
index 6db31b6..d4faa03 100644 (file)
--- a/test/integration/standard_transaction_test.go
+++ b/test/integration/standard_transaction_test.go
@@ -6,14 +6,14 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/test"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/test"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestP2PKH(t *testing.T) {

diff --git a/test/mock/chain.go b/test/mock/chain.go
index 271d958..12d180f 100644 (file)
--- a/test/mock/chain.go
+++ b/test/mock/chain.go
@@ -4,8 +4,8 @@ import (
        "errors"
        "math/rand"
 
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 type Chain struct {

diff --git a/test/performance/mining_test.go b/test/performance/mining_test.go
index 6128f88..eec2e9f 100644 (file)
--- a/test/performance/mining_test.go
+++ b/test/performance/mining_test.go
@@ -4,10 +4,10 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/account"
-       "github.com/bytom/mining"
-       "github.com/bytom/test"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/mining"
+       "github.com/bytom/bytom/test"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 // Function NewBlockTemplate's benchmark - 0.05s

diff --git a/test/performance/rpc_test.go b/test/performance/rpc_test.go
index f46b919..ed06155 100644 (file)
--- a/test/performance/rpc_test.go
+++ b/test/performance/rpc_test.go
@@ -3,7 +3,7 @@ package performance
 import (
        "testing"
 
-       "github.com/bytom/util"
+       "github.com/bytom/bytom/util"
 )
 
 // Test rpc call benchmark - 0.1 s/op

diff --git a/test/protocol_test.go b/test/protocol_test.go
index 4fa1a15..9336933 100644 (file)
--- a/test/protocol_test.go
+++ b/test/protocol_test.go
@@ -6,10 +6,10 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 // case1:           |------c1(height=7)

diff --git a/test/protocol_test_util.go b/test/protocol_test_util.go
index 3dd6ff3..1b0bf5c 100644 (file)
--- a/test/protocol_test_util.go
+++ b/test/protocol_test_util.go
@@ -3,9 +3,9 @@ package test
 import (
        "fmt"
 
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func declChain(name string, baseChain *protocol.Chain, baseHeight uint64, height uint64) (*protocol.Chain, error) {

diff --git a/test/tx_test.go b/test/tx_test.go
index d951964..4c381ee 100644 (file)
--- a/test/tx_test.go
+++ b/test/tx_test.go
@@ -11,15 +11,15 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/validation"
-       "github.com/bytom/protocol/vm"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/validation"
+       "github.com/bytom/bytom/protocol/vm"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func init() {

diff --git a/test/tx_test_util.go b/test/tx_test_util.go
index 31663e2..cb6b9ee 100644 (file)
--- a/test/tx_test_util.go
+++ b/test/tx_test_util.go
@@ -6,21 +6,21 @@ import (
        "fmt"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/crypto/sha3pool"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // TxGenerator used to generate new tx

diff --git a/test/util.go b/test/util.go
index 5ad897a..7d2b0db 100644 (file)
--- a/test/util.go
+++ b/test/util.go
@@ -4,18 +4,18 @@ import (
        "context"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/database"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/test/utxo_view/utxo_view_test.go b/test/utxo_view/utxo_view_test.go
index 6898221..c39dfbd 100644 (file)
--- a/test/utxo_view/utxo_view_test.go
+++ b/test/utxo_view/utxo_view_test.go
@@ -4,16 +4,16 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/testutil"
 
        "github.com/golang/protobuf/proto"
 
-       "github.com/bytom/database"
-       "github.com/bytom/database/storage"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/database"
+       "github.com/bytom/bytom/database/storage"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestAttachOrDetachBlocks(t *testing.T) {

diff --git a/test/utxo_view/utxo_view_test_util.go b/test/utxo_view/utxo_view_test_util.go
index dd526c9..eeeb1f7 100644 (file)
--- a/test/utxo_view/utxo_view_test_util.go
+++ b/test/utxo_view/utxo_view_test_util.go
@@ -3,12 +3,12 @@ package utxo_view
 import (
        "encoding/hex"
 
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/state"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/difficulty"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/state"
+       "github.com/bytom/bytom/testutil"
 )
 
 const utxoPreFix = "UT:"

diff --git a/test/wallet_test_util.go b/test/wallet_test_util.go
index 07e81aa..1b27ac5 100644 (file)
--- a/test/wallet_test_util.go
+++ b/test/wallet_test_util.go
@@ -7,16 +7,16 @@ import (
        "path"
        "reflect"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
-       w "github.com/bytom/wallet"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
+       w "github.com/bytom/bytom/wallet"
 )
 
 type walletTestConfig struct {

diff --git a/testutil/expect.go b/testutil/expect.go
index bb899cb..749b603 100644 (file)
--- a/testutil/expect.go
+++ b/testutil/expect.go
@@ -7,7 +7,7 @@ import (
        "strings"
        "testing"
 
-       "github.com/bytom/errors"
+       "github.com/bytom/bytom/errors"
 )
 
 var wd, _ = os.Getwd()

diff --git a/testutil/hex.go b/testutil/hex.go
index b3f9389..439de64 100644 (file)
--- a/testutil/hex.go
+++ b/testutil/hex.go
@@ -6,7 +6,7 @@ import (
        "io"
        "testing"
 
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 func MustDecodeHash(s string) (h bc.Hash) {

diff --git a/testutil/keys.go b/testutil/keys.go
index 6a65e31..cc04032 100644 (file)
--- a/testutil/keys.go
+++ b/testutil/keys.go
@@ -1,8 +1,8 @@
 package testutil
 
 import (
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
 )
 
 var (

diff --git a/testutil/parameter.go b/testutil/parameter.go
index c488b9b..d6ae8c5 100644 (file)
--- a/testutil/parameter.go
+++ b/testutil/parameter.go
@@ -1,7 +1,7 @@
 package testutil
 
 import (
-       "github.com/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc"
 )
 
 var (

diff --git a/util/util.go b/util/util.go
index cb4ec3c..6aa4f7a 100644 (file)
--- a/util/util.go
+++ b/util/util.go
@@ -3,9 +3,9 @@ package util
 import (
        "context"
 
-       "github.com/bytom/api"
-       "github.com/bytom/blockchain/rpc"
-       "github.com/bytom/env"
+       "github.com/bytom/bytom/api"
+       "github.com/bytom/bytom/blockchain/rpc"
+       "github.com/bytom/bytom/env"
        jww "github.com/spf13/jwalterweatherman"
 )
 

diff --git a/vendor/github.com/miekg/dns/dnssec_keyscan.go b/vendor/github.com/miekg/dns/dnssec_keyscan.go
index 62bb27a..33797de 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec_keyscan.go
+++ b/vendor/github.com/miekg/dns/dnssec_keyscan.go
@@ -12,7 +12,7 @@ import (
        "strings"
        "bytes"
 
-       "github.com/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519"
 )
 
 // NewPrivateKey returns a PrivateKey by parsing the string s.

diff --git a/vendor/github.com/miekg/dns/dnssec_privkey.go b/vendor/github.com/miekg/dns/dnssec_privkey.go
index c0bc0da..529f0f3 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec_privkey.go
+++ b/vendor/github.com/miekg/dns/dnssec_privkey.go
@@ -8,7 +8,7 @@ import (
        "math/big"
        "strconv"
 
-       "github.com/bytom/crypto/ed25519"
+       "github.com/bytom/bytom/crypto/ed25519"
 )
 
 const format = "Private-key-format: v1.3\n"

diff --git a/wallet/annotated.go b/wallet/annotated.go
index 25449df..536ff0b 100644 (file)
--- a/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -6,18 +6,18 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/crypto/sha3pool"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/protocol/vm/vmutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // annotateTxs adds asset data to transactions

diff --git a/wallet/indexer.go b/wallet/indexer.go
index 0951a45..6040045 100644 (file)
--- a/wallet/indexer.go
+++ b/wallet/indexer.go
@@ -8,15 +8,15 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/crypto/sha3pool"
-       dbm "github.com/bytom/database/leveldb"
-       chainjson "github.com/bytom/encoding/json"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       chainjson "github.com/bytom/bytom/encoding/json"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/wallet/mnemonic/mnemonic.go b/wallet/mnemonic/mnemonic.go
index 4a15607..77b62e5 100644 (file)
--- a/wallet/mnemonic/mnemonic.go
+++ b/wallet/mnemonic/mnemonic.go
@@ -17,7 +17,7 @@ import (
        "github.com/johngb/langreg"
        "golang.org/x/crypto/pbkdf2"
 
-       "github.com/bytom/wallet/mnemonic/wordlists"
+       "github.com/bytom/bytom/wallet/mnemonic/wordlists"
 )
 
 var (

diff --git a/wallet/recovery.go b/wallet/recovery.go
index 4b03efe..a0b1c3d 100644 (file)
--- a/wallet/recovery.go
+++ b/wallet/recovery.go
@@ -8,14 +8,14 @@ import (
        "sync/atomic"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 const (

diff --git a/wallet/recovery_test.go b/wallet/recovery_test.go
index a814678..48be9c4 100644 (file)
--- a/wallet/recovery_test.go
+++ b/wallet/recovery_test.go
@@ -9,17 +9,17 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/common"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/common"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 // MockBlock mock a block

diff --git a/wallet/unconfirmed.go b/wallet/unconfirmed.go
index b616518..07249af 100644 (file)
--- a/wallet/unconfirmed.go
+++ b/wallet/unconfirmed.go
@@ -8,11 +8,11 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/wallet/unconfirmed_test.go b/wallet/unconfirmed_test.go
index b0d6602..b3906b7 100644 (file)
--- a/wallet/unconfirmed_test.go
+++ b/wallet/unconfirmed_test.go
@@ -5,17 +5,17 @@ import (
        "os"
        "testing"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/query"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/query"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
 )
 
 func TestWalletUnconfirmedTxs(t *testing.T) {

diff --git a/wallet/utxo.go b/wallet/utxo.go
index de61c05..0dc78d5 100644 (file)
--- a/wallet/utxo.go
+++ b/wallet/utxo.go
@@ -5,14 +5,14 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/segwit"
-       "github.com/bytom/crypto/sha3pool"
-       "github.com/bytom/errors"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/consensus/segwit"
+       "github.com/bytom/bytom/crypto/sha3pool"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 // GetAccountUtxos return all account unspent outputs

diff --git a/wallet/utxo_test.go b/wallet/utxo_test.go
index 43d36fa..e317422 100644 (file)
--- a/wallet/utxo_test.go
+++ b/wallet/utxo_test.go
@@ -8,12 +8,12 @@ import (
        "sort"
        "testing"
 
-       "github.com/bytom/account"
-       "github.com/bytom/consensus"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
-       "github.com/bytom/testutil"
-       dbm "github.com/bytom/database/leveldb"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/testutil"
+       dbm "github.com/bytom/bytom/database/leveldb"
 )
 
 func TestGetAccountUtxos(t *testing.T) {

diff --git a/wallet/wallet.go b/wallet/wallet.go
index e81259c..ed52121 100644 (file)
--- a/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -6,15 +6,15 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/errors"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/errors"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 const (

diff --git a/wallet/wallet_test.go b/wallet/wallet_test.go
index 23f3f66..0d0666e 100644 (file)
--- a/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -8,20 +8,20 @@ import (
        "testing"
        "time"
 
-       "github.com/bytom/account"
-       "github.com/bytom/asset"
-       "github.com/bytom/blockchain/pseudohsm"
-       "github.com/bytom/blockchain/signers"
-       "github.com/bytom/blockchain/txbuilder"
-       "github.com/bytom/config"
-       "github.com/bytom/consensus"
-       "github.com/bytom/crypto/ed25519/chainkd"
-       "github.com/bytom/database"
-       dbm "github.com/bytom/database/leveldb"
-       "github.com/bytom/event"
-       "github.com/bytom/protocol"
-       "github.com/bytom/protocol/bc"
-       "github.com/bytom/protocol/bc/types"
+       "github.com/bytom/bytom/account"
+       "github.com/bytom/bytom/asset"
+       "github.com/bytom/bytom/blockchain/pseudohsm"
+       "github.com/bytom/bytom/blockchain/signers"
+       "github.com/bytom/bytom/blockchain/txbuilder"
+       "github.com/bytom/bytom/config"
+       "github.com/bytom/bytom/consensus"
+       "github.com/bytom/bytom/crypto/ed25519/chainkd"
+       "github.com/bytom/bytom/database"
+       dbm "github.com/bytom/bytom/database/leveldb"
+       "github.com/bytom/bytom/event"
+       "github.com/bytom/bytom/protocol"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/bc/types"
 )
 
 func TestEncodeDecodeGlobalTxIndex(t *testing.T) {