move several packages out of blockchain (#473)

* move account package out of blockchain

* move asset package out of blockchain

* move accesstoken out of blockchain

* move wallet package out of blockchain

diff --git a/blockchain/accesstoken/accesstoken.go b/accesstoken/accesstoken.go
similarity index 100%
rename from blockchain/accesstoken/accesstoken.go
rename to accesstoken/accesstoken.go

diff --git a/blockchain/accesstoken/accesstoken_test.go b/accesstoken/accesstoken_test.go
similarity index 100%
rename from blockchain/accesstoken/accesstoken_test.go
rename to accesstoken/accesstoken_test.go

diff --git a/blockchain/account/accounts.go b/account/accounts.go
similarity index 100%
rename from blockchain/account/accounts.go
rename to account/accounts.go

diff --git a/blockchain/account/accounts_test.go b/account/accounts_test.go
similarity index 100%
rename from blockchain/account/accounts_test.go
rename to account/accounts_test.go

diff --git a/blockchain/account/builder.go b/account/builder.go
similarity index 100%
rename from blockchain/account/builder.go
rename to account/builder.go

diff --git a/blockchain/account/indexer.go b/account/indexer.go
similarity index 100%
rename from blockchain/account/indexer.go
rename to account/indexer.go

diff --git a/blockchain/account/reserve.go b/account/reserve.go
similarity index 100%
rename from blockchain/account/reserve.go
rename to account/reserve.go

diff --git a/blockchain/account/reserve_test.go b/account/reserve_test.go
similarity index 100%
rename from blockchain/account/reserve_test.go
rename to account/reserve_test.go

diff --git a/blockchain/asset/annotate.go b/asset/annotate.go
similarity index 100%
rename from blockchain/asset/annotate.go
rename to asset/annotate.go

diff --git a/blockchain/asset/asset.go b/asset/asset.go
similarity index 100%
rename from blockchain/asset/asset.go
rename to asset/asset.go

diff --git a/blockchain/asset/asset_test.go b/asset/asset_test.go
similarity index 100%
rename from blockchain/asset/asset_test.go
rename to asset/asset_test.go

diff --git a/blockchain/asset/builder.go b/asset/builder.go
similarity index 100%
rename from blockchain/asset/builder.go
rename to asset/builder.go

diff --git a/blockchain/accounts.go b/blockchain/accounts.go
index 8fbdc92..42269d8 100644 (file)
--- a/blockchain/accounts.go
+++ b/blockchain/accounts.go
@@ -6,7 +6,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/common"
        "github.com/bytom/consensus"
        "github.com/bytom/crypto/ed25519/chainkd"

diff --git a/blockchain/api.go b/blockchain/api.go
index 1f49ecc..66dc219 100644 (file)
--- a/blockchain/api.go
+++ b/blockchain/api.go
@@ -11,7 +11,7 @@ import (
        log "github.com/sirupsen/logrus"
        cmn "github.com/tendermint/tmlibs/common"
 
-       "github.com/bytom/blockchain/accesstoken"
+       "github.com/bytom/accesstoken"
        cfg "github.com/bytom/config"
        "github.com/bytom/dashboard"
        "github.com/bytom/errors"
@@ -19,7 +19,7 @@ import (
        "github.com/bytom/net/http/httpjson"
        "github.com/bytom/net/http/static"
        "github.com/bytom/protocol"
-       "github.com/bytom/blockchain/wallet"
+       "github.com/bytom/wallet"
 )
 
 var (

diff --git a/blockchain/assets.go b/blockchain/assets.go
index 65d3bbc..e16480e 100644 (file)
--- a/blockchain/assets.go
+++ b/blockchain/assets.go
@@ -3,7 +3,7 @@ package blockchain
 import (
        "context"
 
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/asset"
        "github.com/bytom/crypto/ed25519/chainkd"
 
        log "github.com/sirupsen/logrus"

diff --git a/blockchain/blockchain_reactor.go b/blockchain/blockchain_reactor.go
index 1642276..e2a56c4 100644 (file)
--- a/blockchain/blockchain_reactor.go
+++ b/blockchain/blockchain_reactor.go
@@ -4,7 +4,7 @@ import (
        log "github.com/sirupsen/logrus"
 
        "github.com/bytom/blockchain/query"
-       "github.com/bytom/blockchain/wallet"
+       "github.com/bytom/wallet"
        "github.com/bytom/consensus"
        "github.com/bytom/consensus/difficulty"
        chainjson "github.com/bytom/encoding/json"

diff --git a/blockchain/errors.go b/blockchain/errors.go
index 4dc727f..1a0909c 100644 (file)
--- a/blockchain/errors.go
+++ b/blockchain/errors.go
@@ -3,7 +3,7 @@ package blockchain
 import (
        "context"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/blockchain/query"
        "github.com/bytom/blockchain/query/filter"
        "github.com/bytom/blockchain/rpc"

diff --git a/blockchain/query.go b/blockchain/query.go
index 39891be..364da93 100755 (executable)
--- a/blockchain/query.go
+++ b/blockchain/query.go
@@ -6,7 +6,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/blockchain/query"
 )
 

diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index 6d74689..4083f81 100755 (executable)
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -10,7 +10,7 @@ import (
        cmn "github.com/tendermint/tmlibs/common"
 
        "github.com/bytom/blockchain/txfeed"
-       "github.com/bytom/blockchain/wallet"
+       "github.com/bytom/wallet"
        "github.com/bytom/mining/cpuminer"
        "github.com/bytom/mining/miningpool"
        "github.com/bytom/p2p"

diff --git a/mining/cpuminer/cpuminer.go b/mining/cpuminer/cpuminer.go
index 9112980..80d7f8d 100644 (file)
--- a/mining/cpuminer/cpuminer.go
+++ b/mining/cpuminer/cpuminer.go
@@ -10,7 +10,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/consensus/difficulty"
        "github.com/bytom/mining"
        "github.com/bytom/protocol"

diff --git a/mining/mining.go b/mining/mining.go
index d0679b8..4166d23 100644 (file)
--- a/mining/mining.go
+++ b/mining/mining.go
@@ -10,7 +10,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/blockchain/txbuilder"
        "github.com/bytom/consensus"
        "github.com/bytom/consensus/difficulty"

diff --git a/mining/miningpool/minepool.go b/mining/miningpool/minepool.go
index 0fe2e41..58c57da 100644 (file)
--- a/mining/miningpool/minepool.go
+++ b/mining/miningpool/minepool.go
@@ -7,7 +7,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/mining"
        "github.com/bytom/protocol"
        "github.com/bytom/protocol/bc"

diff --git a/net/http/authn/authn.go b/net/http/authn/authn.go
index 923466c..b521478 100644 (file)
--- a/net/http/authn/authn.go
+++ b/net/http/authn/authn.go
@@ -9,7 +9,7 @@ import (
        "sync"
        "time"
 
-       "github.com/bytom/blockchain/accesstoken"
+       "github.com/bytom/accesstoken"
        "github.com/bytom/errors"
 )
 

diff --git a/net/http/authn/authn_test.go b/net/http/authn/authn_test.go
index 1c28c26..7b0ee8b 100644 (file)
--- a/net/http/authn/authn_test.go
+++ b/net/http/authn/authn_test.go
@@ -9,7 +9,7 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/accesstoken"
+       "github.com/bytom/accesstoken"
        "github.com/bytom/errors"
 )
 

diff --git a/node/node.go b/node/node.go
index 5cc5da7..59457f7 100755 (executable)
--- a/node/node.go
+++ b/node/node.go
@@ -15,13 +15,13 @@ import (
 
        "github.com/bytom/crypto/ed25519/chainkd"
        bc "github.com/bytom/blockchain"
-       "github.com/bytom/blockchain/accesstoken"
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/accesstoken"
+       "github.com/bytom/account"
+       "github.com/bytom/asset"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/blockchain/txdb"
        "github.com/bytom/blockchain/txfeed"
-       w "github.com/bytom/blockchain/wallet"
+       w "github.com/bytom/wallet"
        cfg "github.com/bytom/config"
        "github.com/bytom/env"
        "github.com/bytom/p2p"

diff --git a/test/integration/standard_transaction_test.go b/test/integration/standard_transaction_test.go
index 26bbcab..391ed7b 100644 (file)
--- a/test/integration/standard_transaction_test.go
+++ b/test/integration/standard_transaction_test.go
@@ -7,7 +7,7 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/crypto/ed25519/chainkd"
        "github.com/bytom/protocol/bc/types"

diff --git a/test/performance/mining_test.go b/test/performance/mining_test.go
index 2d7b189..6c3a619 100644 (file)
--- a/test/performance/mining_test.go
+++ b/test/performance/mining_test.go
@@ -6,7 +6,7 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/config"
        "github.com/bytom/mining"
        "github.com/bytom/test"

diff --git a/test/util.go b/test/util.go
index 376f946..a89a4bf 100644 (file)
--- a/test/util.go
+++ b/test/util.go
@@ -6,7 +6,7 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
+       "github.com/bytom/account"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/blockchain/txbuilder"
        "github.com/bytom/blockchain/txdb"

diff --git a/blockchain/wallet/annotated.go b/wallet/annotated.go
similarity index 98%
rename from blockchain/wallet/annotated.go
rename to wallet/annotated.go
index d2ef468..9936053 100755 (executable)
--- a/blockchain/wallet/annotated.go
+++ b/wallet/annotated.go
@@ -7,8 +7,8 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/account"
+       "github.com/bytom/asset"
        "github.com/bytom/blockchain/query"
        "github.com/bytom/blockchain/signers"
        "github.com/bytom/common"

diff --git a/blockchain/wallet/indexer.go b/wallet/indexer.go
similarity index 99%
rename from blockchain/wallet/indexer.go
rename to wallet/indexer.go
index 80f5133..a983f78 100755 (executable)
--- a/blockchain/wallet/indexer.go
+++ b/wallet/indexer.go
@@ -8,8 +8,8 @@ import (
        log "github.com/sirupsen/logrus"
        "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/account"
+       "github.com/bytom/asset"
        "github.com/bytom/blockchain/query"
        "github.com/bytom/consensus"
        "github.com/bytom/consensus/segwit"

diff --git a/blockchain/wallet/wallet.go b/wallet/wallet.go
similarity index 98%
rename from blockchain/wallet/wallet.go
rename to wallet/wallet.go
index e7603d2..8150020 100755 (executable)
--- a/blockchain/wallet/wallet.go
+++ b/wallet/wallet.go
@@ -8,9 +8,9 @@ import (
        "github.com/tendermint/go-wire/data/base58"
        "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/accesstoken"
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/accesstoken"
+       "github.com/bytom/account"
+       "github.com/bytom/asset"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/crypto/ed25519/chainkd"
        "github.com/bytom/crypto/sha3pool"

diff --git a/blockchain/wallet/wallet_test.go b/wallet/wallet_test.go
similarity index 98%
rename from blockchain/wallet/wallet_test.go
rename to wallet/wallet_test.go
index c7efb2c..2eff5f1 100755 (executable)
--- a/blockchain/wallet/wallet_test.go
+++ b/wallet/wallet_test.go
@@ -10,8 +10,8 @@ import (
        "github.com/tendermint/go-wire/data/base58"
        dbm "github.com/tendermint/tmlibs/db"
 
-       "github.com/bytom/blockchain/account"
-       "github.com/bytom/blockchain/asset"
+       "github.com/bytom/account"
+       "github.com/bytom/asset"
        "github.com/bytom/blockchain/pseudohsm"
        "github.com/bytom/blockchain/txbuilder"
        "github.com/bytom/blockchain/txdb"