gofmt project after changing package name

Honglei-Cong · Nov 28, 2019 · fc98b33 · fc98b33
1 parent 6274adf
commit fc98b33
Show file tree

Hide file tree

Showing 101 changed files with 123 additions and 123 deletions.
diff --git a/account/account.go b/account/account.go
@@ -22,11 +22,11 @@
 package account
 
 import (
-	"github.com/ontio/ontology-crypto/keypair"
-	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
+	s "github.com/ontio/ontology-crypto/signature"
 )
 
 /* crypto object */

diff --git a/account/client.go b/account/client.go
@@ -29,10 +29,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ontio/ontology-crypto/keypair"
-	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
+	s "github.com/ontio/ontology-crypto/signature"
 )
 
 //Client of wallet

diff --git a/account/file_store.go b/account/file_store.go
@@ -28,8 +28,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/common"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 /** AccountData - for wallet read and save, no crypto object included **/

diff --git a/account/file_store_test.go b/account/file_store_test.go
@@ -26,8 +26,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/account/identity.go b/account/identity.go
@@ -29,9 +29,9 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/DNAProject/DNA/core/types"
 	base58 "github.com/itchyny/base58-go"
 	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/DNAProject/DNA/core/types"
 	"golang.org/x/crypto/ripemd160"
 )
 

diff --git a/cmd/account.go b/cmd/account.go
@@ -24,11 +24,11 @@ package cmd
 import (
 	"bufio"
 	"fmt"
-	"github.com/ontio/ontology-crypto/keypair"
-	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/cmd/common"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common/config"
+	"github.com/ontio/ontology-crypto/keypair"
+	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/urfave/cli"
 	"strings"
 )

diff --git a/cmd/account_cmd.go b/cmd/account_cmd.go
@@ -25,13 +25,13 @@ import (
 	"bufio"
 	"encoding/hex"
 	"fmt"
-	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/cmd/common"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common/password"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
+	"github.com/ontio/ontology-crypto/signature"
 	"github.com/urfave/cli"
 	"os"
 )

diff --git a/cmd/export_cmd.go b/cmd/export_cmd.go
@@ -24,9 +24,9 @@ package cmd
 import (
 	"bufio"
 	"fmt"
-	"github.com/gosuri/uiprogress"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common/serialization"
+	"github.com/gosuri/uiprogress"
 	"github.com/urfave/cli"
 	"os"
 	"time"

diff --git a/cmd/import_cmd.go b/cmd/import_cmd.go
@@ -27,14 +27,14 @@ import (
 	"io"
 	"os"
 
-	"github.com/gosuri/uiprogress"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common/config"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/common/serialization"
 	"github.com/DNAProject/DNA/core/genesis"
 	"github.com/DNAProject/DNA/core/ledger"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/gosuri/uiprogress"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/sig_tx_cmd.go b/cmd/sig_tx_cmd.go
@@ -23,12 +23,12 @@ package cmd
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/ontio/ontology-crypto/keypair"
 	cmdcom "github.com/DNAProject/DNA/cmd/common"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/constants"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/urfave/cli"
 	"strings"
 )

diff --git a/cmd/sigsvr/handlers/create_account.go b/cmd/sigsvr/handlers/create_account.go
@@ -22,10 +22,10 @@ package handlers
 
 import (
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
-	s "github.com/ontio/ontology-crypto/signature"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	"github.com/DNAProject/DNA/common/log"
+	"github.com/ontio/ontology-crypto/keypair"
+	s "github.com/ontio/ontology-crypto/signature"
 )
 
 type CreateAccountReq struct {

diff --git a/cmd/sigsvr/handlers/sig_mutil_raw_tx.go b/cmd/sigsvr/handlers/sig_mutil_raw_tx.go
@@ -24,13 +24,13 @@ package handlers
 import (
 	"encoding/hex"
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	cliutil "github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/constants"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 type SigMutilRawTransactionReq struct {

diff --git a/cmd/sigsvr/handlers/sig_mutil_raw_tx_test.go b/cmd/sigsvr/handlers/sig_mutil_raw_tx_test.go
@@ -23,12 +23,12 @@ package handlers
 import (
 	"encoding/hex"
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology-crypto/signature"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
+	"github.com/ontio/ontology-crypto/signature"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

diff --git a/cmd/sigsvr/handlers/sig_native_invoke_tx_test.go b/cmd/sigsvr/handlers/sig_native_invoke_tx_test.go
@@ -23,11 +23,11 @@ package handlers
 
 import (
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/cmd/abi"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	nutils "github.com/DNAProject/DNA/smartcontract/service/native/utils"
+	"github.com/ontio/ontology-crypto/keypair"
+	"github.com/ontio/ontology-crypto/signature"
 	"testing"
 )
 

diff --git a/cmd/sigsvr/handlers/sig_raw_tx.go b/cmd/sigsvr/handlers/sig_raw_tx.go
@@ -24,12 +24,12 @@ package handlers
 import (
 	"encoding/hex"
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	cliutil "github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 type SigRawTransactionReq struct {

diff --git a/cmd/sigsvr/handlers/sig_raw_tx_test.go b/cmd/sigsvr/handlers/sig_raw_tx_test.go
@@ -24,14 +24,14 @@ package handlers
 import (
 	"encoding/hex"
 	"encoding/json"
-	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/account"
 	clisvrcom "github.com/DNAProject/DNA/cmd/sigsvr/common"
 	"github.com/DNAProject/DNA/cmd/sigsvr/store"
 	"github.com/DNAProject/DNA/cmd/utils"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
+	"github.com/ontio/ontology-crypto/keypair"
+	"github.com/ontio/ontology-crypto/signature"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"

diff --git a/cmd/sigsvr/store/wallet_store.go b/cmd/sigsvr/store/wallet_store.go
@@ -25,10 +25,10 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/ontio/ontology-crypto/keypair"
-	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
+	s "github.com/ontio/ontology-crypto/signature"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/filter"
 	"github.com/syndtr/goleveldb/leveldb/opt"

diff --git a/cmd/utils/ont.go b/cmd/utils/ont.go
@@ -26,8 +26,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/ontio/ontology-crypto/keypair"
-	sig "github.com/ontio/ontology-crypto/signature"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/constants"
@@ -41,6 +39,8 @@ import (
 	"github.com/DNAProject/DNA/smartcontract/service/native/ont"
 	"github.com/DNAProject/DNA/smartcontract/service/native/utils"
 	cstates "github.com/DNAProject/DNA/smartcontract/states"
+	"github.com/ontio/ontology-crypto/keypair"
+	sig "github.com/ontio/ontology-crypto/signature"
 	"io"
 	"math/rand"
 	"sort"

diff --git a/common/config/config.go b/common/config/config.go
@@ -29,11 +29,11 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/constants"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/errors"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 var Version = "" //Set value when build project

diff --git a/consensus/actor/actor.go b/consensus/actor/actor.go
@@ -25,12 +25,12 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ontio/ontology-eventbus/actor"
 	"github.com/DNAProject/DNA/core/types"
 	ontErrors "github.com/DNAProject/DNA/errors"
 	netActor "github.com/DNAProject/DNA/p2pserver/actor/server"
 	ptypes "github.com/DNAProject/DNA/p2pserver/message/types"
 	txpool "github.com/DNAProject/DNA/txnpool/common"
+	"github.com/ontio/ontology-eventbus/actor"
 )
 
 type TxPoolActor struct {

diff --git a/consensus/consensus.go b/consensus/consensus.go
@@ -22,12 +22,12 @@
 package consensus
 
 import (
-	"github.com/ontio/ontology-eventbus/actor"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/consensus/dbft"
 	"github.com/DNAProject/DNA/consensus/solo"
 	"github.com/DNAProject/DNA/consensus/vbft"
+	"github.com/ontio/ontology-eventbus/actor"
 )
 
 type ConsensusService interface {

diff --git a/consensus/dbft/consensus_context.go b/consensus/dbft/consensus_context.go
@@ -24,14 +24,14 @@ package dbft
 import (
 	"fmt"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/ledger"
 	"github.com/DNAProject/DNA/core/types"
 	"github.com/DNAProject/DNA/core/vote"
 	msg "github.com/DNAProject/DNA/p2pserver/message/types"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 const ContextVersion uint32 = 0

diff --git a/consensus/dbft/dbft_service.go b/consensus/dbft/dbft_service.go
@@ -26,7 +26,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/ontio/ontology-eventbus/actor"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/config"
@@ -41,6 +40,7 @@ import (
 	"github.com/DNAProject/DNA/events/message"
 	p2pmsg "github.com/DNAProject/DNA/p2pserver/message/types"
 	"github.com/DNAProject/DNA/validator/increment"
+	"github.com/ontio/ontology-eventbus/actor"
 )
 
 type DbftService struct {

diff --git a/consensus/solo/solo.go b/consensus/solo/solo.go
@@ -26,8 +26,6 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/ontio/ontology-crypto/keypair"
-	"github.com/ontio/ontology-eventbus/actor"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/config"
@@ -39,6 +37,8 @@ import (
 	"github.com/DNAProject/DNA/events"
 	"github.com/DNAProject/DNA/events/message"
 	"github.com/DNAProject/DNA/validator/increment"
+	"github.com/ontio/ontology-crypto/keypair"
+	"github.com/ontio/ontology-eventbus/actor"
 )
 
 /*

diff --git a/consensus/vbft/block_pool.go b/consensus/vbft/block_pool.go
@@ -28,10 +28,10 @@ import (
 	"math"
 	"sync"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/store/overlaydb"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 type BlockList []*Block

diff --git a/consensus/vbft/chain_store.go b/consensus/vbft/chain_store.go
@@ -24,13 +24,13 @@ package vbft
 import (
 	"fmt"
 
-	"github.com/ontio/ontology-eventbus/actor"
 	"github.com/DNAProject/DNA/common"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/ledger"
 	"github.com/DNAProject/DNA/core/store"
 	"github.com/DNAProject/DNA/core/store/overlaydb"
 	"github.com/DNAProject/DNA/events/message"
+	"github.com/ontio/ontology-eventbus/actor"
 )
 
 type PendingBlock struct {

diff --git a/consensus/vbft/chain_store_test.go b/consensus/vbft/chain_store_test.go
@@ -22,12 +22,12 @@
 package vbft
 
 import (
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/account"
 	"github.com/DNAProject/DNA/common/config"
 	"github.com/DNAProject/DNA/common/log"
 	"github.com/DNAProject/DNA/core/genesis"
 	"github.com/DNAProject/DNA/core/ledger"
+	"github.com/ontio/ontology-crypto/keypair"
 	"os"
 	"testing"
 )

diff --git a/consensus/vbft/config/types.go b/consensus/vbft/config/types.go
@@ -26,8 +26,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/ontio/ontology-crypto/keypair"
 	"github.com/DNAProject/DNA/core/types"
+	"github.com/ontio/ontology-crypto/keypair"
 )
 
 // PubkeyID returns a marshaled representation of the given public key.