Change import path to v2 to allow import from other packages

Signed-off-by: Yilun <[email protected]>
nknorg · Jul 3, 2020 · f83cde2 · f83cde2
1 parent 32fcc11
commit f83cde2
Show file tree

Hide file tree

Showing 121 changed files with 494 additions and 567 deletions.
diff --git a/api/common/common.go b/api/common/common.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/nknorg/nkn/node"
+	"github.com/nknorg/nkn/v2/node"
 )
 
 type Serverer interface {

diff --git a/api/common/helper.go b/api/common/helper.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/vault"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/vault"
 )
 
 func MakeTransferTransaction(wallet *vault.Wallet, receipt common.Uint160, nonce uint64, value, fee common.Fixed64) (*transaction.Transaction, error) {

diff --git a/api/common/interfaces.go b/api/common/interfaces.go
@@ -7,15 +7,15 @@ import (
 	"net"
 	"strings"
 
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/chain"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/node"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util/address"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/chain"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/node"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util/address"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 const (

diff --git a/api/httpjson/RPCserver.go b/api/httpjson/RPCserver.go
@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nknorg/nkn/api/common"
-	"github.com/nknorg/nkn/chain"
-	"github.com/nknorg/nkn/node"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
-	"github.com/nknorg/nkn/vault"
+	"github.com/nknorg/nkn/v2/api/common"
+	"github.com/nknorg/nkn/v2/chain"
+	"github.com/nknorg/nkn/v2/node"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
+	"github.com/nknorg/nkn/v2/vault"
 	"golang.org/x/time/rate"
 )
 

diff --git a/api/httpjson/client/client.go b/api/httpjson/client/client.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nknorg/nkn/api/common"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/api/common"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 const requestTimeout = 5 * time.Second

diff --git a/api/websocket/messagebuffer/messagebuffer.go b/api/websocket/messagebuffer/messagebuffer.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"sync"
 
-	"github.com/nknorg/nkn/pb"
+	"github.com/nknorg/nkn/v2/pb"
 )
 
 // MessageBuffer is the buffer to hold message for clients not online

diff --git a/api/websocket/server/relay.go b/api/websocket/server/relay.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/por"
-	"github.com/nknorg/nkn/util/address"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/por"
+	"github.com/nknorg/nkn/v2/util/address"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 type sigChainInfo struct {

diff --git a/api/websocket/server/server.go b/api/websocket/server/server.go
@@ -17,19 +17,19 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	api "github.com/nknorg/nkn/api/common"
-	"github.com/nknorg/nkn/api/websocket/messagebuffer"
-	"github.com/nknorg/nkn/api/websocket/session"
-	"github.com/nknorg/nkn/chain"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/event"
-	"github.com/nknorg/nkn/node"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/util/address"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
-	"github.com/nknorg/nkn/vault"
+	api "github.com/nknorg/nkn/v2/api/common"
+	"github.com/nknorg/nkn/v2/api/websocket/messagebuffer"
+	"github.com/nknorg/nkn/v2/api/websocket/session"
+	"github.com/nknorg/nkn/v2/chain"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/event"
+	"github.com/nknorg/nkn/v2/node"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/util/address"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
+	"github.com/nknorg/nkn/v2/vault"
 
 	"github.com/gorilla/websocket"
 )

diff --git a/api/websocket/websocket.go b/api/websocket/websocket.go
@@ -4,15 +4,15 @@ import (
 	"encoding/hex"
 	"encoding/json"
 
-	"github.com/nknorg/nkn/api/common"
-	"github.com/nknorg/nkn/api/websocket/server"
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/chain"
-	"github.com/nknorg/nkn/event"
-	"github.com/nknorg/nkn/node"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
-	"github.com/nknorg/nkn/vault"
+	"github.com/nknorg/nkn/v2/api/common"
+	"github.com/nknorg/nkn/v2/api/websocket/server"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/chain"
+	"github.com/nknorg/nkn/v2/event"
+	"github.com/nknorg/nkn/v2/node"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
+	"github.com/nknorg/nkn/v2/vault"
 )
 
 var ws *server.WsServer

diff --git a/block/block.go b/block/block.go
@@ -8,13 +8,13 @@ import (
 	"io"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/common/serialization"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/signature"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util/config"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/common/serialization"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/signature"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util/config"
 )
 
 type Block struct {

diff --git a/block/header.go b/block/header.go
@@ -8,11 +8,11 @@ import (
 	"io"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/common/serialization"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/program"
-	"github.com/nknorg/nkn/signature"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/common/serialization"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/program"
+	"github.com/nknorg/nkn/v2/signature"
 )
 
 type Header struct {

diff --git a/chain/blockValidator.go b/chain/blockValidator.go
@@ -9,16 +9,16 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/por"
-	"github.com/nknorg/nkn/signature"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/por"
+	"github.com/nknorg/nkn/v2/signature"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 const (

diff --git a/chain/blockchain.go b/chain/blockchain.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"sync"
 
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/event"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/event"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 type Blockchain struct {

diff --git a/chain/collector.go b/chain/collector.go
@@ -3,8 +3,8 @@ package chain
 import (
 	"sort"
 
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
 )
 
 const (

diff --git a/chain/db/db.go b/chain/db/db.go
@@ -1,7 +1,7 @@
 package db
 
 import (
-	"github.com/nknorg/nkn/util/config"
+	"github.com/nknorg/nkn/v2/util/config"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/syndtr/goleveldb/leveldb/filter"

diff --git a/chain/db/prefix.go b/chain/db/prefix.go
@@ -3,7 +3,7 @@ package db
 import (
 	"encoding/binary"
 
-	"github.com/nknorg/nkn/common"
+	"github.com/nknorg/nkn/v2/common"
 )
 
 type DataEntryPrefix byte

diff --git a/chain/ledger.go b/chain/ledger.go
@@ -3,9 +3,9 @@ package chain
 import (
 	"errors"
 
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
 )
 
 var DefaultLedger *Ledger

diff --git a/chain/ledgerStore.go b/chain/ledgerStore.go
@@ -3,9 +3,9 @@ package chain
 import (
 	"context"
 
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
 )
 
 // ILedgerStore provides func with store package.

diff --git a/chain/mining.go b/chain/mining.go
@@ -3,17 +3,17 @@ package chain
 import (
 	"context"
 
-	"github.com/nknorg/nkn/block"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/crypto"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/por"
-	"github.com/nknorg/nkn/signature"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
-	"github.com/nknorg/nkn/vault"
+	"github.com/nknorg/nkn/v2/block"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/crypto"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/por"
+	"github.com/nknorg/nkn/v2/signature"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
+	"github.com/nknorg/nkn/v2/vault"
 )
 
 type Mining interface {

diff --git a/chain/pool/pooler.go b/chain/pool/pooler.go
@@ -1,8 +1,8 @@
 package pool
 
 import (
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
 )
 
 type TxPooler interface {

diff --git a/chain/pool/txlist.go b/chain/pool/txlist.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"sync"
 
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 var (

diff --git a/chain/pool/txpool.go b/chain/pool/txpool.go
@@ -9,12 +9,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/nknorg/nkn/chain"
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/pb"
-	"github.com/nknorg/nkn/transaction"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/chain"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/pb"
+	"github.com/nknorg/nkn/v2/transaction"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 func compareTxnPriority(txn1, txn2 *transaction.Transaction) int {

diff --git a/chain/reward.go b/chain/reward.go
@@ -1,9 +1,9 @@
 package chain
 
 import (
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/util/config"
-	"github.com/nknorg/nkn/util/log"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/util/config"
+	"github.com/nknorg/nkn/v2/util/log"
 )
 
 var (

diff --git a/chain/store/account.go b/chain/store/account.go
@@ -7,8 +7,8 @@ import (
 	"io"
 	"sort"
 
-	"github.com/nknorg/nkn/common"
-	"github.com/nknorg/nkn/common/serialization"
+	"github.com/nknorg/nkn/v2/common"
+	"github.com/nknorg/nkn/v2/common/serialization"
 )
 
 type Operation int