OSDN Git Service

fix wrong import issue
authorpaladz <453256728@qq.com>
Sat, 23 Sep 2017 05:58:10 +0000 (13:58 +0800)
committerpaladz <453256728@qq.com>
Sat, 23 Sep 2017 05:58:10 +0000 (13:58 +0800)
node/node.go
protocol/bc/legacy/map_test.go
protocol/mempool_test.go
protocol/validation/validation_test.go

index b6943de..80d91ba 100644 (file)
@@ -1,7 +1,6 @@
 package node
 
 import (
-       "blockchain/consensus"
        "context"
        "crypto/tls"
        "net"
@@ -13,6 +12,7 @@ import (
 
        bc "github.com/bytom/blockchain"
        cfg "github.com/bytom/config"
+       "github.com/bytom/consensus"
        p2p "github.com/bytom/p2p"
        "github.com/bytom/protocol/bc/legacy"
        rpccore "github.com/bytom/rpc/core"
@@ -27,8 +27,8 @@ import (
        //rpc "github.com/blockchain/rpc/lib"
        "github.com/bytom/blockchain/account"
        "github.com/bytom/blockchain/asset"
-       "github.com/bytom/blockchain/txdb"
        "github.com/bytom/blockchain/pseudohsm"
+       "github.com/bytom/blockchain/txdb"
        "github.com/bytom/net/http/reqid"
        "github.com/bytom/protocol"
        rpcserver "github.com/bytom/rpc/lib/server"
@@ -215,16 +215,16 @@ func NewNode(config *cfg.Config, logger log.Logger) *Node {
 
        //Todo HSM
        /*
-       if config.HsmUrl != ""{
-               // todo remoteHSM
-               cmn.Exit(cmn.Fmt("not implement"))
-
-       } else {
-               hsm, err = pseudohsm.New(config.KeysDir())
-               if err != nil {
-                       cmn.Exit(cmn.Fmt("initialize HSM failed: %v", err))
-               }
-       }*/
+               if config.HsmUrl != ""{
+                       // todo remoteHSM
+                       cmn.Exit(cmn.Fmt("not implement"))
+
+               } else {
+                       hsm, err = pseudohsm.New(config.KeysDir())
+                       if err != nil {
+                               cmn.Exit(cmn.Fmt("initialize HSM failed: %v", err))
+                       }
+               }*/
 
        hsm, err := pseudohsm.New(config.KeysDir())
        if err != nil {
index 88d55a2..0c993e5 100644 (file)
@@ -1,13 +1,12 @@
 package legacy
 
 import (
-       "blockchain/consensus"
        "bytes"
        "testing"
 
-       "github.com/davecgh/go-spew/spew"
-
+       "github.com/bytom/consensus"
        "github.com/bytom/protocol/bc"
+       "github.com/davecgh/go-spew/spew"
 )
 
 func TestMapTx(t *testing.T) {
index 5180df4..d721a8d 100644 (file)
@@ -1,9 +1,9 @@
 package protocol
 
 import (
-       "blockchain/consensus"
        "testing"
 
+       "github.com/bytom/consensus"
        "github.com/bytom/protocol/bc/legacy"
 )
 
index 9ac3bd7..4dee5f0 100644 (file)
@@ -1,12 +1,12 @@
 package validation
 
 import (
-       "blockchain/consensus"
        "fmt"
        "math"
        "testing"
        "time"
 
+       "github.com/bytom/consensus"
        "github.com/bytom/crypto/sha3pool"
        "github.com/bytom/errors"
        "github.com/bytom/protocol/bc"