aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMission Liao <mission.liao@dexon.org>2019-05-06 17:18:12 +0800
committerMission Liao <mission.liao@dexon.org>2019-05-07 15:09:40 +0800
commit39db303b3381462f11bdc11111d6fb1739d3aa63 (patch)
treee8643df4b8909e4c1be1a36cf752f84d3aa52412
parent9d7cc8733bdd9b7a2f1bbcaa2cf7f9a17a29e215 (diff)
downloaddexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar.gz
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar.bz2
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar.lz
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar.xz
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.tar.zst
dexon-39db303b3381462f11bdc11111d6fb1739d3aa63.zip
Fix import path
-rw-r--r--build/testtool/testtool.go2
-rw-r--r--cmd/govtool/main.go4
-rw-r--r--consensus/dexcon/dexcon.go2
-rw-r--r--consensus/dexcon/fake_dexcon.go16
-rw-r--r--core/blockchain.go4
-rw-r--r--core/blockchain_test.go2
-rw-r--r--core/dexon_chain_makers.go2
-rw-r--r--core/governance.go14
-rw-r--r--core/headerchain.go6
-rw-r--r--core/rawdb/accessors_core_block.go2
-rw-r--r--core/rawdb/accessors_core_chain_tip.go2
-rw-r--r--core/rawdb/accessors_core_dkg_private_key.go2
-rw-r--r--core/rawdb/accessors_core_dkg_protocol.go2
-rw-r--r--core/state_transition.go2
-rw-r--r--core/tx_pool.go2
-rw-r--r--core/vm/oracle_contracts.go16
-rw-r--r--core/vm/oracle_contracts_test.go14
-rw-r--r--dex/app.go4
-rw-r--r--dex/app_test.go8
-rw-r--r--dex/backend.go2
-rw-r--r--dex/blockproposer.go8
-rw-r--r--dex/cache.go6
-rw-r--r--dex/cache_test.go6
-rw-r--r--dex/consensus/core/agreement-mgr.go8
-rw-r--r--dex/consensus/core/agreement-state.go2
-rw-r--r--dex/consensus/core/agreement-state_test.go8
-rw-r--r--dex/consensus/core/agreement.go8
-rw-r--r--dex/consensus/core/agreement_test.go8
-rw-r--r--dex/consensus/core/blockchain.go8
-rw-r--r--dex/consensus/core/blockchain_test.go10
-rw-r--r--dex/consensus/core/configuration-chain.go12
-rw-r--r--dex/consensus/core/configuration-chain_test.go18
-rw-r--r--dex/consensus/core/consensus.go46
-rw-r--r--dex/consensus/core/consensus_test.go14
-rw-r--r--dex/consensus/core/constant.go2
-rw-r--r--dex/consensus/core/crypto/dkg/dkg.go4
-rw-r--r--dex/consensus/core/crypto/dkg/dkg_test.go4
-rw-r--r--dex/consensus/core/crypto/dkg/utils.go2
-rw-r--r--dex/consensus/core/crypto/ecdsa/ecdsa.go4
-rw-r--r--dex/consensus/core/crypto/ecdsa/ecdsa_test.go4
-rw-r--r--dex/consensus/core/crypto/interfaces.go2
-rw-r--r--dex/consensus/core/crypto/utils.go2
-rw-r--r--dex/consensus/core/db/interfaces.go6
-rw-r--r--dex/consensus/core/db/level-db.go6
-rw-r--r--dex/consensus/core/db/level-db_test.go6
-rw-r--r--dex/consensus/core/db/memory.go6
-rw-r--r--dex/consensus/core/db/memory_test.go6
-rw-r--r--dex/consensus/core/dkg-tsig-protocol.go18
-rw-r--r--dex/consensus/core/dkg-tsig-protocol_test.go16
-rw-r--r--dex/consensus/core/interfaces.go8
-rw-r--r--dex/consensus/core/leader-selector.go6
-rw-r--r--dex/consensus/core/leader-selector_test.go8
-rw-r--r--dex/consensus/core/nonblocking.go4
-rw-r--r--dex/consensus/core/nonblocking_test.go4
-rw-r--r--dex/consensus/core/syncer/agreement.go10
-rw-r--r--dex/consensus/core/syncer/consensus.go12
-rw-r--r--dex/consensus/core/syncer/watch-cat.go8
-rw-r--r--dex/consensus/core/syncer/watch-cat_test.go4
-rw-r--r--dex/consensus/core/test/app.go6
-rw-r--r--dex/consensus/core/test/app_test.go14
-rw-r--r--dex/consensus/core/test/block-revealer.go6
-rw-r--r--dex/consensus/core/test/block-revealer_test.go6
-rw-r--r--dex/consensus/core/test/fake-transport.go4
-rw-r--r--dex/consensus/core/test/governance.go10
-rw-r--r--dex/consensus/core/test/governance_test.go12
-rw-r--r--dex/consensus/core/test/interface.go6
-rw-r--r--dex/consensus/core/test/marshaller.go4
-rw-r--r--dex/consensus/core/test/network.go10
-rw-r--r--dex/consensus/core/test/network_test.go10
-rw-r--r--dex/consensus/core/test/state-change-request.go8
-rw-r--r--dex/consensus/core/test/state-change-request_test.go2
-rw-r--r--dex/consensus/core/test/state.go10
-rw-r--r--dex/consensus/core/test/state_test.go14
-rw-r--r--dex/consensus/core/test/tcp-transport.go10
-rw-r--r--dex/consensus/core/test/transport_test.go4
-rw-r--r--dex/consensus/core/test/utils.go12
-rw-r--r--dex/consensus/core/ticker.go2
-rw-r--r--dex/consensus/core/types/block-randomness.go2
-rw-r--r--dex/consensus/core/types/block.go4
-rw-r--r--dex/consensus/core/types/block_test.go4
-rw-r--r--dex/consensus/core/types/dkg/dkg.go8
-rw-r--r--dex/consensus/core/types/dkg/dkg_test.go8
-rw-r--r--dex/consensus/core/types/node.go4
-rw-r--r--dex/consensus/core/types/nodeset.go4
-rw-r--r--dex/consensus/core/types/nodeset_test.go2
-rw-r--r--dex/consensus/core/types/vote.go6
-rw-r--r--dex/consensus/core/utils.go8
-rw-r--r--dex/consensus/core/utils/crypto.go8
-rw-r--r--dex/consensus/core/utils/crypto_test.go12
-rw-r--r--dex/consensus/core/utils/nodeset-cache.go6
-rw-r--r--dex/consensus/core/utils/nodeset-cache_test.go8
-rw-r--r--dex/consensus/core/utils/penalty-helper.go4
-rw-r--r--dex/consensus/core/utils/penalty-helper_test.go12
-rw-r--r--dex/consensus/core/utils/round-based-config.go2
-rw-r--r--dex/consensus/core/utils/round-based-config_test.go2
-rw-r--r--dex/consensus/core/utils/round-event.go6
-rw-r--r--dex/consensus/core/utils/signer.go10
-rw-r--r--dex/consensus/core/utils/signer_test.go6
-rw-r--r--dex/consensus/core/utils/utils.go6
-rw-r--r--dex/consensus/core/utils/utils_test.go10
-rw-r--r--dex/consensus/core/utils/vote-filter.go2
-rw-r--r--dex/consensus/core/utils/vote-filter_test.go4
-rw-r--r--dex/consensus/core/utils_test.go8
-rw-r--r--dex/consensus/integration_test/byzantine_test.go14
-rw-r--r--dex/consensus/integration_test/consensus_test.go16
-rw-r--r--dex/consensus/integration_test/round-event_test.go16
-rw-r--r--dex/db/db.go8
-rw-r--r--dex/downloader/downloader.go2
-rw-r--r--dex/downloader/downloader_test.go4
-rw-r--r--dex/downloader/testchain_test.go4
-rw-r--r--dex/governance.go4
-rw-r--r--dex/handler.go10
-rw-r--r--dex/network.go8
-rw-r--r--dex/peer.go6
-rw-r--r--dex/protocol_test.go10
115 files changed, 415 insertions, 415 deletions
diff --git a/build/testtool/testtool.go b/build/testtool/testtool.go
index f9d238695..c187eb6c5 100644
--- a/build/testtool/testtool.go
+++ b/build/testtool/testtool.go
@@ -11,7 +11,7 @@ import (
"strings"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
"github.com/dexon-foundation/dexon"
"github.com/dexon-foundation/dexon/accounts/abi"
diff --git a/cmd/govtool/main.go b/cmd/govtool/main.go
index 1425b9faf..99ba4f132 100644
--- a/cmd/govtool/main.go
+++ b/cmd/govtool/main.go
@@ -6,10 +6,10 @@ import (
"math/big"
"os"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/cmd/utils"
"github.com/dexon-foundation/dexon/core/vm"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/rlp"
"gopkg.in/urfave/cli.v1"
)
diff --git a/consensus/dexcon/dexcon.go b/consensus/dexcon/dexcon.go
index ae7ff0368..2b382ac5b 100644
--- a/consensus/dexcon/dexcon.go
+++ b/consensus/dexcon/dexcon.go
@@ -21,12 +21,12 @@ import (
"fmt"
"math/big"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
"github.com/dexon-foundation/dexon/core/state"
"github.com/dexon-foundation/dexon/core/types"
"github.com/dexon-foundation/dexon/core/vm"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/rpc"
)
diff --git a/consensus/dexcon/fake_dexcon.go b/consensus/dexcon/fake_dexcon.go
index 430d9bc6b..14f6ac2d9 100644
--- a/consensus/dexcon/fake_dexcon.go
+++ b/consensus/dexcon/fake_dexcon.go
@@ -4,14 +4,14 @@ import (
"crypto/ecdsa"
"math/big"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- coreTypesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ coreEcdsa "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ coreTypesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ coreUtils "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
diff --git a/core/blockchain.go b/core/blockchain.go
index c243c8fc5..6dbfb1339 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -28,8 +28,8 @@ import (
"sync/atomic"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
lru "github.com/hashicorp/golang-lru"
"github.com/dexon-foundation/dexon/common"
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index f8956da46..b31fe6428 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -25,7 +25,7 @@ import (
"testing"
"time"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
diff --git a/core/dexon_chain_makers.go b/core/dexon_chain_makers.go
index 010b30c84..3eb6c2514 100644
--- a/core/dexon_chain_makers.go
+++ b/core/dexon_chain_makers.go
@@ -22,7 +22,7 @@ import (
"math/rand"
"time"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
diff --git a/core/governance.go b/core/governance.go
index 277b3bb89..bfca2c48a 100644
--- a/core/governance.go
+++ b/core/governance.go
@@ -7,13 +7,13 @@ import (
"sync"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreEcdsa "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ coreUtils "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/hashicorp/golang-lru/simplelru"
"github.com/dexon-foundation/dexon/common"
diff --git a/core/headerchain.go b/core/headerchain.go
index ef77aa28a..cd90594bb 100644
--- a/core/headerchain.go
+++ b/core/headerchain.go
@@ -27,9 +27,9 @@ import (
"sync/atomic"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
lru "github.com/hashicorp/golang-lru"
"github.com/dexon-foundation/dexon/common"
diff --git a/core/rawdb/accessors_core_block.go b/core/rawdb/accessors_core_block.go
index 5fa5c8f86..32e359600 100644
--- a/core/rawdb/accessors_core_block.go
+++ b/core/rawdb/accessors_core_block.go
@@ -3,7 +3,7 @@ package rawdb
import (
"bytes"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/log"
diff --git a/core/rawdb/accessors_core_chain_tip.go b/core/rawdb/accessors_core_chain_tip.go
index 95fa8854f..b9a54b93d 100644
--- a/core/rawdb/accessors_core_chain_tip.go
+++ b/core/rawdb/accessors_core_chain_tip.go
@@ -3,7 +3,7 @@ package rawdb
import (
"bytes"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/core/rawdb/accessors_core_dkg_private_key.go b/core/rawdb/accessors_core_dkg_private_key.go
index 036e311aa..a8473f018 100644
--- a/core/rawdb/accessors_core_dkg_private_key.go
+++ b/core/rawdb/accessors_core_dkg_private_key.go
@@ -3,7 +3,7 @@ package rawdb
import (
"bytes"
- coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
+ coreDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/core/rawdb/accessors_core_dkg_protocol.go b/core/rawdb/accessors_core_dkg_protocol.go
index ba087b00d..64ff40e4d 100644
--- a/core/rawdb/accessors_core_dkg_protocol.go
+++ b/core/rawdb/accessors_core_dkg_protocol.go
@@ -3,7 +3,7 @@ package rawdb
import (
"bytes"
- coreDb "github.com/dexon-foundation/dexon-consensus/core/db"
+ coreDb "github.com/dexon-foundation/dexon/dex/consensus/core/db"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/core/state_transition.go b/core/state_transition.go
index f5ac9bde6..36bbfd311 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -23,9 +23,9 @@ import (
"math/big"
"sync/atomic"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core/vm"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
"github.com/dexon-foundation/dexon/log"
"github.com/dexon-foundation/dexon/params"
)
diff --git a/core/tx_pool.go b/core/tx_pool.go
index e7dbab0d2..45d666e9a 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -24,7 +24,7 @@ import (
"sync"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/common/prque"
diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go
index 3a84015b5..ee3691de1 100644
--- a/core/vm/oracle_contracts.go
+++ b/core/vm/oracle_contracts.go
@@ -33,14 +33,14 @@ import (
"github.com/dexon-foundation/dexon/params"
"github.com/dexon-foundation/dexon/rlp"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils"
-
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreUtils "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
+
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
type Bytes32 [32]byte
diff --git a/core/vm/oracle_contracts_test.go b/core/vm/oracle_contracts_test.go
index c77313ba7..5e11fbd0f 100644
--- a/core/vm/oracle_contracts_test.go
+++ b/core/vm/oracle_contracts_test.go
@@ -26,13 +26,13 @@ import (
"testing"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- coreUtils "github.com/dexon-foundation/dexon-consensus/core/utils"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreEcdsa "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ coreUtils "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core/state"
diff --git a/dex/app.go b/dex/app.go
index 5a268a09d..af29baebb 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -25,8 +25,8 @@ import (
"sync"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core"
diff --git a/dex/app_test.go b/dex/app_test.go
index a62d9001f..7b1bdde79 100644
--- a/dex/app_test.go
+++ b/dex/app_test.go
@@ -10,10 +10,6 @@ import (
"testing"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/common/math"
"github.com/dexon-foundation/dexon/consensus/dexcon"
@@ -22,6 +18,10 @@ import (
"github.com/dexon-foundation/dexon/core/types"
"github.com/dexon-foundation/dexon/core/vm"
"github.com/dexon-foundation/dexon/crypto"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreEcdsa "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/ethdb"
"github.com/dexon-foundation/dexon/event"
"github.com/dexon-foundation/dexon/rlp"
diff --git a/dex/backend.go b/dex/backend.go
index 26a0b49eb..87c3dcf32 100644
--- a/dex/backend.go
+++ b/dex/backend.go
@@ -21,7 +21,6 @@ import (
"fmt"
"time"
- "github.com/dexon-foundation/dexon-consensus/core/syncer"
"github.com/dexon-foundation/dexon/accounts"
"github.com/dexon-foundation/dexon/consensus"
"github.com/dexon-foundation/dexon/consensus/dexcon"
@@ -29,6 +28,7 @@ import (
"github.com/dexon-foundation/dexon/core/bloombits"
"github.com/dexon-foundation/dexon/core/rawdb"
"github.com/dexon-foundation/dexon/core/vm"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/syncer"
"github.com/dexon-foundation/dexon/dex/downloader"
"github.com/dexon-foundation/dexon/eth/filters"
"github.com/dexon-foundation/dexon/eth/gasprice"
diff --git a/dex/blockproposer.go b/dex/blockproposer.go
index d675da4ac..ff35b44a3 100644
--- a/dex/blockproposer.go
+++ b/dex/blockproposer.go
@@ -7,10 +7,10 @@ import (
"sync/atomic"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/syncer"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreEcdsa "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/syncer"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/core"
"github.com/dexon-foundation/dexon/dex/db"
diff --git a/dex/cache.go b/dex/cache.go
index dbd4b7b5d..d8e240041 100644
--- a/dex/cache.go
+++ b/dex/cache.go
@@ -20,9 +20,9 @@ package dex
import (
"sync"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreDb "github.com/dexon-foundation/dexon-consensus/core/db"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreDb "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type voteKey struct {
diff --git a/dex/cache_test.go b/dex/cache_test.go
index 04bca06ef..cc951a96f 100644
--- a/dex/cache_test.go
+++ b/dex/cache_test.go
@@ -24,9 +24,9 @@ import (
"strings"
"testing"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreDb "github.com/dexon-foundation/dexon-consensus/core/db"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreDb "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type byHash []*coreTypes.Vote
diff --git a/dex/consensus/core/agreement-mgr.go b/dex/consensus/core/agreement-mgr.go
index 17def6747..d84aaf51c 100644
--- a/dex/consensus/core/agreement-mgr.go
+++ b/dex/consensus/core/agreement-mgr.go
@@ -26,10 +26,10 @@ import (
lru "github.com/hashicorp/golang-lru"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors returned from BA modules
diff --git a/dex/consensus/core/agreement-state.go b/dex/consensus/core/agreement-state.go
index 0d1ae58bc..edc02af5a 100644
--- a/dex/consensus/core/agreement-state.go
+++ b/dex/consensus/core/agreement-state.go
@@ -20,7 +20,7 @@ package core
import (
"fmt"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// Errors for agreement state module.
diff --git a/dex/consensus/core/agreement-state_test.go b/dex/consensus/core/agreement-state_test.go
index 32ce8ac88..3e943b3f1 100644
--- a/dex/consensus/core/agreement-state_test.go
+++ b/dex/consensus/core/agreement-state_test.go
@@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type AgreementStateTestSuite struct {
diff --git a/dex/consensus/core/agreement.go b/dex/consensus/core/agreement.go
index d90afc610..2497f1611 100644
--- a/dex/consensus/core/agreement.go
+++ b/dex/consensus/core/agreement.go
@@ -24,9 +24,9 @@ import (
"sync/atomic"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// closedchan is a reusable closed channel.
@@ -147,7 +147,7 @@ func newAgreement(
ID: ID,
leader: leader,
},
- aID: &atomic.Value{},
+ aID: &atomic.Value{},
pendingAgreementResult: make(map[types.Position]*types.AgreementResult),
candidateBlock: make(map[common.Hash]*types.Block),
fastForward: make(chan uint64, 1),
diff --git a/dex/consensus/core/agreement_test.go b/dex/consensus/core/agreement_test.go
index 9332762c3..7af86723b 100644
--- a/dex/consensus/core/agreement_test.go
+++ b/dex/consensus/core/agreement_test.go
@@ -21,10 +21,10 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/blockchain.go b/dex/consensus/core/blockchain.go
index 4fae221c7..68471843e 100644
--- a/dex/consensus/core/blockchain.go
+++ b/dex/consensus/core/blockchain.go
@@ -26,10 +26,10 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors for sanity check error.
diff --git a/dex/consensus/core/blockchain_test.go b/dex/consensus/core/blockchain_test.go
index c3d2cb725..3132b2185 100644
--- a/dex/consensus/core/blockchain_test.go
+++ b/dex/consensus/core/blockchain_test.go
@@ -23,11 +23,11 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/configuration-chain.go b/dex/consensus/core/configuration-chain.go
index 3b4cdbbc8..b1aa1f86a 100644
--- a/dex/consensus/core/configuration-chain.go
+++ b/dex/consensus/core/configuration-chain.go
@@ -23,12 +23,12 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors for configuration chain..
diff --git a/dex/consensus/core/configuration-chain_test.go b/dex/consensus/core/configuration-chain_test.go
index f8a923afd..aa96717f0 100644
--- a/dex/consensus/core/configuration-chain_test.go
+++ b/dex/consensus/core/configuration-chain_test.go
@@ -27,15 +27,15 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type ConfigurationChainTestSuite struct {
diff --git a/dex/consensus/core/consensus.go b/dex/consensus/core/consensus.go
index fd8456487..310530830 100644
--- a/dex/consensus/core/consensus.go
+++ b/dex/consensus/core/consensus.go
@@ -24,13 +24,13 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ cryptoDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors for consensus core.
@@ -694,22 +694,22 @@ func newConsensusForRound(
tsigVerifierCache, signer, logger)
// Construct Consensus instance.
con := &Consensus{
- ID: ID,
- app: appModule,
- debugApp: debugApp,
- gov: gov,
- db: db,
- network: network,
- baConfirmedBlock: make(map[common.Hash]chan<- *types.Block),
- dkgReady: sync.NewCond(&sync.Mutex{}),
- cfgModule: cfgModule,
- bcModule: bcModule,
- dMoment: dMoment,
- nodeSetCache: nodeSetCache,
- tsigVerifierCache: tsigVerifierCache,
- signer: signer,
- event: common.NewEvent(),
- logger: logger,
+ ID: ID,
+ app: appModule,
+ debugApp: debugApp,
+ gov: gov,
+ db: db,
+ network: network,
+ baConfirmedBlock: make(map[common.Hash]chan<- *types.Block),
+ dkgReady: sync.NewCond(&sync.Mutex{}),
+ cfgModule: cfgModule,
+ bcModule: bcModule,
+ dMoment: dMoment,
+ nodeSetCache: nodeSetCache,
+ tsigVerifierCache: tsigVerifierCache,
+ signer: signer,
+ event: common.NewEvent(),
+ logger: logger,
resetDeliveryGuardTicker: make(chan struct{}),
msgChan: make(chan types.Msg, 1024),
priorityMsgChan: make(chan interface{}, 1024),
diff --git a/dex/consensus/core/consensus_test.go b/dex/consensus/core/consensus_test.go
index fb164ad48..2aa78b0ed 100644
--- a/dex/consensus/core/consensus_test.go
+++ b/dex/consensus/core/consensus_test.go
@@ -26,13 +26,13 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// network implements core.Network.
diff --git a/dex/consensus/core/constant.go b/dex/consensus/core/constant.go
index 29dae8b73..73047a7f1 100644
--- a/dex/consensus/core/constant.go
+++ b/dex/consensus/core/constant.go
@@ -17,7 +17,7 @@
package core
-import "github.com/dexon-foundation/dexon-consensus/core/utils"
+import "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
// ConfigRoundShift refers to the difference between block's round and config
// round derived from its state.
diff --git a/dex/consensus/core/crypto/dkg/dkg.go b/dex/consensus/core/crypto/dkg/dkg.go
index ab43f5130..e9730fbb2 100644
--- a/dex/consensus/core/crypto/dkg/dkg.go
+++ b/dex/consensus/core/crypto/dkg/dkg.go
@@ -27,8 +27,8 @@ import (
"github.com/dexon-foundation/bls/ffi/go/bls"
"github.com/dexon-foundation/dexon/rlp"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
var (
diff --git a/dex/consensus/core/crypto/dkg/dkg_test.go b/dex/consensus/core/crypto/dkg/dkg_test.go
index 84dc2d4ac..43120e222 100644
--- a/dex/consensus/core/crypto/dkg/dkg_test.go
+++ b/dex/consensus/core/crypto/dkg/dkg_test.go
@@ -29,8 +29,8 @@ import (
"github.com/dexon-foundation/dexon/rlp"
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
type DKGTestSuite struct {
diff --git a/dex/consensus/core/crypto/dkg/utils.go b/dex/consensus/core/crypto/dkg/utils.go
index 9e470f0cf..9eb63fb50 100644
--- a/dex/consensus/core/crypto/dkg/utils.go
+++ b/dex/consensus/core/crypto/dkg/utils.go
@@ -24,7 +24,7 @@ import (
"github.com/dexon-foundation/bls/ffi/go/bls"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
// PartialSignature is a partial signature in DKG+TSIG protocol.
diff --git a/dex/consensus/core/crypto/ecdsa/ecdsa.go b/dex/consensus/core/crypto/ecdsa/ecdsa.go
index 9ef3260a1..56e67c593 100644
--- a/dex/consensus/core/crypto/ecdsa/ecdsa.go
+++ b/dex/consensus/core/crypto/ecdsa/ecdsa.go
@@ -22,8 +22,8 @@ import (
dexCrypto "github.com/dexon-foundation/dexon/crypto"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
const cryptoType = "ecdsa"
diff --git a/dex/consensus/core/crypto/ecdsa/ecdsa_test.go b/dex/consensus/core/crypto/ecdsa/ecdsa_test.go
index ada27b24b..58365cfbb 100644
--- a/dex/consensus/core/crypto/ecdsa/ecdsa_test.go
+++ b/dex/consensus/core/crypto/ecdsa/ecdsa_test.go
@@ -20,8 +20,8 @@ package ecdsa
import (
"testing"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/crypto/interfaces.go b/dex/consensus/core/crypto/interfaces.go
index f3e01e42c..50888cf6c 100644
--- a/dex/consensus/core/crypto/interfaces.go
+++ b/dex/consensus/core/crypto/interfaces.go
@@ -18,7 +18,7 @@
package crypto
import (
- "github.com/dexon-foundation/dexon-consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
)
// Signature is the basic signature type in DEXON.
diff --git a/dex/consensus/core/crypto/utils.go b/dex/consensus/core/crypto/utils.go
index 59e91f5a5..8cc0d57b5 100644
--- a/dex/consensus/core/crypto/utils.go
+++ b/dex/consensus/core/crypto/utils.go
@@ -23,7 +23,7 @@ import (
"github.com/dexon-foundation/dexon/crypto"
- "github.com/dexon-foundation/dexon-consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
)
var (
diff --git a/dex/consensus/core/db/interfaces.go b/dex/consensus/core/db/interfaces.go
index a571a8021..e074b2fae 100644
--- a/dex/consensus/core/db/interfaces.go
+++ b/dex/consensus/core/db/interfaces.go
@@ -21,9 +21,9 @@ import (
"errors"
"fmt"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
var (
diff --git a/dex/consensus/core/db/level-db.go b/dex/consensus/core/db/level-db.go
index da8bc0bc1..61f90adc4 100644
--- a/dex/consensus/core/db/level-db.go
+++ b/dex/consensus/core/db/level-db.go
@@ -23,9 +23,9 @@ import (
"github.com/syndtr/goleveldb/leveldb"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/db/level-db_test.go b/dex/consensus/core/db/level-db_test.go
index 8b3c448ca..d68b290ab 100644
--- a/dex/consensus/core/db/level-db_test.go
+++ b/dex/consensus/core/db/level-db_test.go
@@ -28,9 +28,9 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/db/memory.go b/dex/consensus/core/db/memory.go
index 6555de855..97de9df41 100644
--- a/dex/consensus/core/db/memory.go
+++ b/dex/consensus/core/db/memory.go
@@ -23,9 +23,9 @@ import (
"os"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type blockSeqIterator struct {
diff --git a/dex/consensus/core/db/memory_test.go b/dex/consensus/core/db/memory_test.go
index 33e011121..e6f399c3e 100644
--- a/dex/consensus/core/db/memory_test.go
+++ b/dex/consensus/core/db/memory_test.go
@@ -22,9 +22,9 @@ import (
"os"
"testing"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/dkg-tsig-protocol.go b/dex/consensus/core/dkg-tsig-protocol.go
index ce5c89c47..ad69a2974 100644
--- a/dex/consensus/core/dkg-tsig-protocol.go
+++ b/dex/consensus/core/dkg-tsig-protocol.go
@@ -21,13 +21,13 @@ import (
"fmt"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors for dkg module.
@@ -160,8 +160,8 @@ func (d *dkgProtocol) toDKGProtocolInfo() db.DKGProtocolInfo {
PrvSharesReceived: d.prvSharesReceived,
NodeComplained: d.nodeComplained,
AntiComplaintReceived: d.antiComplaintReceived,
- Step: uint64(d.step),
- Reset: d.reset,
+ Step: uint64(d.step),
+ Reset: d.reset,
}
if d.masterPrivateShare != nil {
diff --git a/dex/consensus/core/dkg-tsig-protocol_test.go b/dex/consensus/core/dkg-tsig-protocol_test.go
index 184460b1b..560f0c522 100644
--- a/dex/consensus/core/dkg-tsig-protocol_test.go
+++ b/dex/consensus/core/dkg-tsig-protocol_test.go
@@ -22,14 +22,14 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type DKGTSIGProtocolTestSuite struct {
diff --git a/dex/consensus/core/interfaces.go b/dex/consensus/core/interfaces.go
index c88b3dcb4..603c473ad 100644
--- a/dex/consensus/core/interfaces.go
+++ b/dex/consensus/core/interfaces.go
@@ -20,10 +20,10 @@ package core
import (
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
// Application describes the application interface that interacts with DEXON
diff --git a/dex/consensus/core/leader-selector.go b/dex/consensus/core/leader-selector.go
index 91b2e9979..234d048c6 100644
--- a/dex/consensus/core/leader-selector.go
+++ b/dex/consensus/core/leader-selector.go
@@ -21,9 +21,9 @@ import (
"math/big"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type validLeaderFn func(block *types.Block, crs common.Hash) (bool, error)
diff --git a/dex/consensus/core/leader-selector_test.go b/dex/consensus/core/leader-selector_test.go
index 473866308..03f39f7d9 100644
--- a/dex/consensus/core/leader-selector_test.go
+++ b/dex/consensus/core/leader-selector_test.go
@@ -22,10 +22,10 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type LeaderSelectorTestSuite struct {
diff --git a/dex/consensus/core/nonblocking.go b/dex/consensus/core/nonblocking.go
index 10b47b822..84a469f46 100644
--- a/dex/consensus/core/nonblocking.go
+++ b/dex/consensus/core/nonblocking.go
@@ -21,8 +21,8 @@ import (
"fmt"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type blockConfirmedEvent struct {
diff --git a/dex/consensus/core/nonblocking_test.go b/dex/consensus/core/nonblocking_test.go
index 4816186aa..a9251f9de 100644
--- a/dex/consensus/core/nonblocking_test.go
+++ b/dex/consensus/core/nonblocking_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// slowApp is an Application instance slow things down in every method.
diff --git a/dex/consensus/core/syncer/agreement.go b/dex/consensus/core/syncer/agreement.go
index d39c24627..157685af7 100644
--- a/dex/consensus/core/syncer/agreement.go
+++ b/dex/consensus/core/syncer/agreement.go
@@ -23,11 +23,11 @@ import (
"fmt"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Struct agreement implements struct of BA (Byzantine Agreement) protocol
diff --git a/dex/consensus/core/syncer/consensus.go b/dex/consensus/core/syncer/consensus.go
index 496c0f9a8..7f5737a98 100644
--- a/dex/consensus/core/syncer/consensus.go
+++ b/dex/consensus/core/syncer/consensus.go
@@ -24,12 +24,12 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
var (
diff --git a/dex/consensus/core/syncer/watch-cat.go b/dex/consensus/core/syncer/watch-cat.go
index f2e197ebe..c93137706 100644
--- a/dex/consensus/core/syncer/watch-cat.go
+++ b/dex/consensus/core/syncer/watch-cat.go
@@ -21,10 +21,10 @@ import (
"context"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type configReader interface {
diff --git a/dex/consensus/core/syncer/watch-cat_test.go b/dex/consensus/core/syncer/watch-cat_test.go
index b1f1bf818..f0c107b91 100644
--- a/dex/consensus/core/syncer/watch-cat_test.go
+++ b/dex/consensus/core/syncer/watch-cat_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type WatchCatTestSuite struct {
diff --git a/dex/consensus/core/test/app.go b/dex/consensus/core/test/app.go
index 769683ecc..913b59750 100644
--- a/dex/consensus/core/test/app.go
+++ b/dex/consensus/core/test/app.go
@@ -23,9 +23,9 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
var (
diff --git a/dex/consensus/core/test/app_test.go b/dex/consensus/core/test/app_test.go
index 828a3c35b..aa9ffae71 100644
--- a/dex/consensus/core/test/app_test.go
+++ b/dex/consensus/core/test/app_test.go
@@ -24,13 +24,13 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/block-revealer.go b/dex/consensus/core/test/block-revealer.go
index e104f04e6..c473acabb 100644
--- a/dex/consensus/core/test/block-revealer.go
+++ b/dex/consensus/core/test/block-revealer.go
@@ -21,9 +21,9 @@ import (
"errors"
"sort"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// Errors returns from block-revealer.
diff --git a/dex/consensus/core/test/block-revealer_test.go b/dex/consensus/core/test/block-revealer_test.go
index dd2aeb862..1cb4a68ab 100644
--- a/dex/consensus/core/test/block-revealer_test.go
+++ b/dex/consensus/core/test/block-revealer_test.go
@@ -20,9 +20,9 @@ package test
import (
"testing"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/fake-transport.go b/dex/consensus/core/test/fake-transport.go
index cecac5430..ea01061b4 100644
--- a/dex/consensus/core/test/fake-transport.go
+++ b/dex/consensus/core/test/fake-transport.go
@@ -21,8 +21,8 @@ import (
"fmt"
"time"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type fakePeerRecord struct {
diff --git a/dex/consensus/core/test/governance.go b/dex/consensus/core/test/governance.go
index 204e68bf8..f22876945 100644
--- a/dex/consensus/core/test/governance.go
+++ b/dex/consensus/core/test/governance.go
@@ -25,11 +25,11 @@ import (
"sort"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
// TODO(mission): add a method to compare config/crs between governance
diff --git a/dex/consensus/core/test/governance_test.go b/dex/consensus/core/test/governance_test.go
index e07563841..01691f488 100644
--- a/dex/consensus/core/test/governance_test.go
+++ b/dex/consensus/core/test/governance_test.go
@@ -21,12 +21,12 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/interface.go b/dex/consensus/core/test/interface.go
index 58a3cedfa..33bb2b781 100644
--- a/dex/consensus/core/test/interface.go
+++ b/dex/consensus/core/test/interface.go
@@ -20,9 +20,9 @@ package test
import (
"time"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// BlockRevealer defines the interface to reveal a group
diff --git a/dex/consensus/core/test/marshaller.go b/dex/consensus/core/test/marshaller.go
index 91a3057ed..e07cd3723 100644
--- a/dex/consensus/core/test/marshaller.go
+++ b/dex/consensus/core/test/marshaller.go
@@ -21,8 +21,8 @@ import (
"encoding/json"
"fmt"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
// DefaultMarshaller is the default marshaller for testing core.Consensus.
diff --git a/dex/consensus/core/test/network.go b/dex/consensus/core/test/network.go
index c0ec255e7..d4979cd4f 100644
--- a/dex/consensus/core/test/network.go
+++ b/dex/consensus/core/test/network.go
@@ -27,11 +27,11 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
const (
diff --git a/dex/consensus/core/test/network_test.go b/dex/consensus/core/test/network_test.go
index 27d25e6dc..f4714444d 100644
--- a/dex/consensus/core/test/network_test.go
+++ b/dex/consensus/core/test/network_test.go
@@ -25,11 +25,11 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/state-change-request.go b/dex/consensus/core/test/state-change-request.go
index 4ddd40f29..995393bb3 100644
--- a/dex/consensus/core/test/state-change-request.go
+++ b/dex/consensus/core/test/state-change-request.go
@@ -21,10 +21,10 @@ import (
"fmt"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/test/state-change-request_test.go b/dex/consensus/core/test/state-change-request_test.go
index 517a929bf..7581b18e4 100644
--- a/dex/consensus/core/test/state-change-request_test.go
+++ b/dex/consensus/core/test/state-change-request_test.go
@@ -20,7 +20,7 @@ package test
import (
"testing"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/state.go b/dex/consensus/core/test/state.go
index 759737793..9ff6a227b 100644
--- a/dex/consensus/core/test/state.go
+++ b/dex/consensus/core/test/state.go
@@ -24,11 +24,11 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/test/state_test.go b/dex/consensus/core/test/state_test.go
index 63f9d27b4..366e2a6d5 100644
--- a/dex/consensus/core/test/state_test.go
+++ b/dex/consensus/core/test/state_test.go
@@ -22,13 +22,13 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/tcp-transport.go b/dex/consensus/core/test/tcp-transport.go
index fdc47d5a8..11ca02f6c 100644
--- a/dex/consensus/core/test/tcp-transport.go
+++ b/dex/consensus/core/test/tcp-transport.go
@@ -34,11 +34,11 @@ import (
"syscall"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
const (
diff --git a/dex/consensus/core/test/transport_test.go b/dex/consensus/core/test/transport_test.go
index 9140649ac..2b33b2033 100644
--- a/dex/consensus/core/test/transport_test.go
+++ b/dex/consensus/core/test/transport_test.go
@@ -26,8 +26,8 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/test/utils.go b/dex/consensus/core/test/utils.go
index e02e194eb..271c98459 100644
--- a/dex/consensus/core/test/utils.go
+++ b/dex/consensus/core/test/utils.go
@@ -24,12 +24,12 @@ import (
"net"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/ticker.go b/dex/consensus/core/ticker.go
index 636fb8c49..b50fdc1c7 100644
--- a/dex/consensus/core/ticker.go
+++ b/dex/consensus/core/ticker.go
@@ -23,7 +23,7 @@ import (
"sync"
"time"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// TickerType is the type of ticker.
diff --git a/dex/consensus/core/types/block-randomness.go b/dex/consensus/core/types/block-randomness.go
index 1c7454398..e5ed11310 100644
--- a/dex/consensus/core/types/block-randomness.go
+++ b/dex/consensus/core/types/block-randomness.go
@@ -21,7 +21,7 @@ import (
"encoding/hex"
"fmt"
- "github.com/dexon-foundation/dexon-consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
)
// AgreementResult describes an agremeent result.
diff --git a/dex/consensus/core/types/block.go b/dex/consensus/core/types/block.go
index b55cfabf9..a930625be 100644
--- a/dex/consensus/core/types/block.go
+++ b/dex/consensus/core/types/block.go
@@ -27,9 +27,9 @@ import (
"github.com/dexon-foundation/dexon/rlp"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
dexCommon "github.com/dexon-foundation/dexon/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
// GenesisHeight refers to the initial height the genesis block should be.
diff --git a/dex/consensus/core/types/block_test.go b/dex/consensus/core/types/block_test.go
index 9ffbc4fbd..34133b1fe 100644
--- a/dex/consensus/core/types/block_test.go
+++ b/dex/consensus/core/types/block_test.go
@@ -26,8 +26,8 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/types/dkg/dkg.go b/dex/consensus/core/types/dkg/dkg.go
index cb921e586..3d9da92ca 100644
--- a/dex/consensus/core/types/dkg/dkg.go
+++ b/dex/consensus/core/types/dkg/dkg.go
@@ -25,10 +25,10 @@ import (
"github.com/dexon-foundation/dexon/rlp"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ cryptoDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// Errors for typesDKG package.
diff --git a/dex/consensus/core/types/dkg/dkg_test.go b/dex/consensus/core/types/dkg/dkg_test.go
index ea6a56548..bbf709354 100644
--- a/dex/consensus/core/types/dkg/dkg_test.go
+++ b/dex/consensus/core/types/dkg/dkg_test.go
@@ -24,10 +24,10 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ cryptoDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/rlp"
)
diff --git a/dex/consensus/core/types/node.go b/dex/consensus/core/types/node.go
index 18b6831e0..7e052f11b 100644
--- a/dex/consensus/core/types/node.go
+++ b/dex/consensus/core/types/node.go
@@ -21,8 +21,8 @@ import (
"bytes"
"encoding/hex"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
// NodeID is the ID type for nodes.
diff --git a/dex/consensus/core/types/nodeset.go b/dex/consensus/core/types/nodeset.go
index 806000763..80adade55 100644
--- a/dex/consensus/core/types/nodeset.go
+++ b/dex/consensus/core/types/nodeset.go
@@ -22,8 +22,8 @@ import (
"encoding/binary"
"math/big"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
)
// NodeSet is the node set structure as defined in DEXON consensus core.
diff --git a/dex/consensus/core/types/nodeset_test.go b/dex/consensus/core/types/nodeset_test.go
index ef9ac244b..205546e84 100644
--- a/dex/consensus/core/types/nodeset_test.go
+++ b/dex/consensus/core/types/nodeset_test.go
@@ -20,7 +20,7 @@ package types
import (
"testing"
- "github.com/dexon-foundation/dexon-consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/types/vote.go b/dex/consensus/core/types/vote.go
index 8bc0c78c2..96fc320bd 100644
--- a/dex/consensus/core/types/vote.go
+++ b/dex/consensus/core/types/vote.go
@@ -20,9 +20,9 @@ package types
import (
"fmt"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- cryptoDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ cryptoDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
)
// VoteType is the type of vote.
diff --git a/dex/consensus/core/utils.go b/dex/consensus/core/utils.go
index c4d7b0fc3..f04e9e244 100644
--- a/dex/consensus/core/utils.go
+++ b/dex/consensus/core/utils.go
@@ -25,10 +25,10 @@ import (
"sort"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
// Errors for utils.
diff --git a/dex/consensus/core/utils/crypto.go b/dex/consensus/core/utils/crypto.go
index 96bbe85a0..c4a0a6322 100644
--- a/dex/consensus/core/utils/crypto.go
+++ b/dex/consensus/core/utils/crypto.go
@@ -21,12 +21,12 @@ import (
"bytes"
"encoding/binary"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
dexCommon "github.com/dexon-foundation/dexon/common"
dexCrypto "github.com/dexon-foundation/dexon/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
func hashWitness(witness *types.Witness) (common.Hash, error) {
diff --git a/dex/consensus/core/utils/crypto_test.go b/dex/consensus/core/utils/crypto_test.go
index 29396c59b..07858fa02 100644
--- a/dex/consensus/core/utils/crypto_test.go
+++ b/dex/consensus/core/utils/crypto_test.go
@@ -21,12 +21,12 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/utils/nodeset-cache.go b/dex/consensus/core/utils/nodeset-cache.go
index 89dcfc86b..3705046f9 100644
--- a/dex/consensus/core/utils/nodeset-cache.go
+++ b/dex/consensus/core/utils/nodeset-cache.go
@@ -21,9 +21,9 @@ import (
"errors"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
var (
diff --git a/dex/consensus/core/utils/nodeset-cache_test.go b/dex/consensus/core/utils/nodeset-cache_test.go
index b9052c888..9b1e22036 100644
--- a/dex/consensus/core/utils/nodeset-cache_test.go
+++ b/dex/consensus/core/utils/nodeset-cache_test.go
@@ -21,10 +21,10 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/utils/penalty-helper.go b/dex/consensus/core/utils/penalty-helper.go
index 0b38474a6..d99ddc00e 100644
--- a/dex/consensus/core/utils/penalty-helper.go
+++ b/dex/consensus/core/utils/penalty-helper.go
@@ -20,8 +20,8 @@ package utils
import (
"errors"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
var (
diff --git a/dex/consensus/core/utils/penalty-helper_test.go b/dex/consensus/core/utils/penalty-helper_test.go
index 3e4f8b547..23dff9953 100644
--- a/dex/consensus/core/utils/penalty-helper_test.go
+++ b/dex/consensus/core/utils/penalty-helper_test.go
@@ -22,12 +22,12 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
type PenaltyHelperTestSuite struct {
diff --git a/dex/consensus/core/utils/round-based-config.go b/dex/consensus/core/utils/round-based-config.go
index 4c83d046b..98e459843 100644
--- a/dex/consensus/core/utils/round-based-config.go
+++ b/dex/consensus/core/utils/round-based-config.go
@@ -20,7 +20,7 @@ package utils
import (
"fmt"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// RoundBasedConfig is based config for rounds and provide boundary checking
diff --git a/dex/consensus/core/utils/round-based-config_test.go b/dex/consensus/core/utils/round-based-config_test.go
index 084efe25b..bc0c85f7e 100644
--- a/dex/consensus/core/utils/round-based-config_test.go
+++ b/dex/consensus/core/utils/round-based-config_test.go
@@ -20,7 +20,7 @@ package utils
import (
"testing"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/utils/round-event.go b/dex/consensus/core/utils/round-event.go
index bda4383fa..ac40981f6 100644
--- a/dex/consensus/core/utils/round-event.go
+++ b/dex/consensus/core/utils/round-event.go
@@ -22,9 +22,9 @@ import (
"fmt"
"sync"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
// ErrUnmatchedBlockHeightWithConfig is for invalid parameters for NewRoundEvent.
diff --git a/dex/consensus/core/utils/signer.go b/dex/consensus/core/utils/signer.go
index fe9ea9095..b4ff51014 100644
--- a/dex/consensus/core/utils/signer.go
+++ b/dex/consensus/core/utils/signer.go
@@ -20,13 +20,13 @@ package utils
import (
"errors"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
dexCrypto "github.com/dexon-foundation/dexon/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
// Errors for signer.
diff --git a/dex/consensus/core/utils/signer_test.go b/dex/consensus/core/utils/signer_test.go
index b0faee4da..a444c28a9 100644
--- a/dex/consensus/core/utils/signer_test.go
+++ b/dex/consensus/core/utils/signer_test.go
@@ -22,9 +22,9 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/core/utils/utils.go b/dex/consensus/core/utils/utils.go
index f259f34bb..efc75eff5 100644
--- a/dex/consensus/core/utils/utils.go
+++ b/dex/consensus/core/utils/utils.go
@@ -21,9 +21,9 @@ import (
"context"
"fmt"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
var dkgDelayRound uint64
diff --git a/dex/consensus/core/utils/utils_test.go b/dex/consensus/core/utils/utils_test.go
index c6f85433d..49cdcee1c 100644
--- a/dex/consensus/core/utils/utils_test.go
+++ b/dex/consensus/core/utils/utils_test.go
@@ -24,11 +24,11 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/ecdsa"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
type UtilsTestSuite struct {
diff --git a/dex/consensus/core/utils/vote-filter.go b/dex/consensus/core/utils/vote-filter.go
index 446d88a64..607d710bc 100644
--- a/dex/consensus/core/utils/vote-filter.go
+++ b/dex/consensus/core/utils/vote-filter.go
@@ -18,7 +18,7 @@
package utils
import (
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
// VoteFilter filters votes that are useless for now.
diff --git a/dex/consensus/core/utils/vote-filter_test.go b/dex/consensus/core/utils/vote-filter_test.go
index 4e7a7b98a..1e891df6f 100644
--- a/dex/consensus/core/utils/vote-filter_test.go
+++ b/dex/consensus/core/utils/vote-filter_test.go
@@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
)
type VoteFilterTestSuite struct {
diff --git a/dex/consensus/core/utils_test.go b/dex/consensus/core/utils_test.go
index 560e92369..59294f3d5 100644
--- a/dex/consensus/core/utils_test.go
+++ b/dex/consensus/core/utils_test.go
@@ -23,10 +23,10 @@ import (
"github.com/stretchr/testify/suite"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
)
type UtilsTestSuite struct {
diff --git a/dex/consensus/integration_test/byzantine_test.go b/dex/consensus/integration_test/byzantine_test.go
index 34c59f76c..cf8449ad3 100644
--- a/dex/consensus/integration_test/byzantine_test.go
+++ b/dex/consensus/integration_test/byzantine_test.go
@@ -26,13 +26,13 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/integration_test/consensus_test.go b/dex/consensus/integration_test/consensus_test.go
index bf2970ac9..63e3bbc4f 100644
--- a/dex/consensus/integration_test/consensus_test.go
+++ b/dex/consensus/integration_test/consensus_test.go
@@ -26,14 +26,14 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/db"
- "github.com/dexon-foundation/dexon-consensus/core/syncer"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/syncer"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/consensus/integration_test/round-event_test.go b/dex/consensus/integration_test/round-event_test.go
index dca0834dc..c6c48c474 100644
--- a/dex/consensus/integration_test/round-event_test.go
+++ b/dex/consensus/integration_test/round-event_test.go
@@ -23,14 +23,14 @@ import (
"testing"
"time"
- "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/test"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- typesDKG "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
- "github.com/dexon-foundation/dexon-consensus/core/utils"
+ "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/test"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ typesDKG "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/utils"
"github.com/stretchr/testify/suite"
)
diff --git a/dex/db/db.go b/dex/db/db.go
index 5cb809055..56057b12b 100644
--- a/dex/db/db.go
+++ b/dex/db/db.go
@@ -18,10 +18,10 @@
package db
import (
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreDKG "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- coreDb "github.com/dexon-foundation/dexon-consensus/core/db"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreDKG "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ coreDb "github.com/dexon-foundation/dexon/dex/consensus/core/db"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core/rawdb"
diff --git a/dex/downloader/downloader.go b/dex/downloader/downloader.go
index 0847cd062..81c1cc32e 100644
--- a/dex/downloader/downloader.go
+++ b/dex/downloader/downloader.go
@@ -23,7 +23,7 @@ import (
"sync/atomic"
"time"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
ethereum "github.com/dexon-foundation/dexon"
"github.com/dexon-foundation/dexon/common"
diff --git a/dex/downloader/downloader_test.go b/dex/downloader/downloader_test.go
index e01e0d96b..7fd466755 100644
--- a/dex/downloader/downloader_test.go
+++ b/dex/downloader/downloader_test.go
@@ -26,8 +26,8 @@ import (
"time"
ethereum "github.com/dexon-foundation/dexon"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus/dexcon"
diff --git a/dex/downloader/testchain_test.go b/dex/downloader/testchain_test.go
index e5c5e4d23..a67fb9c3e 100644
--- a/dex/downloader/testchain_test.go
+++ b/dex/downloader/testchain_test.go
@@ -21,8 +21,8 @@ import (
"fmt"
"math/big"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus/dexcon"
diff --git a/dex/governance.go b/dex/governance.go
index ec09969b0..9b6245171 100644
--- a/dex/governance.go
+++ b/dex/governance.go
@@ -22,8 +22,8 @@ import (
"crypto/ecdsa"
"math/big"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core"
diff --git a/dex/handler.go b/dex/handler.go
index 7bf23758c..7e8b4110d 100644
--- a/dex/handler.go
+++ b/dex/handler.go
@@ -45,11 +45,11 @@ import (
"sync/atomic"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- dexCore "github.com/dexon-foundation/dexon-consensus/core"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ dexCore "github.com/dexon-foundation/dexon/dex/consensus/core"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/consensus"
diff --git a/dex/network.go b/dex/network.go
index ab676a349..ac51275ff 100644
--- a/dex/network.go
+++ b/dex/network.go
@@ -18,10 +18,10 @@
package dex
import (
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
)
type DexconNetwork struct {
diff --git a/dex/peer.go b/dex/peer.go
index 68576564f..b90b16a53 100644
--- a/dex/peer.go
+++ b/dex/peer.go
@@ -41,9 +41,9 @@ import (
"time"
mapset "github.com/deckarep/golang-set"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core/types"
diff --git a/dex/protocol_test.go b/dex/protocol_test.go
index 81550d918..118079536 100644
--- a/dex/protocol_test.go
+++ b/dex/protocol_test.go
@@ -24,11 +24,11 @@ import (
"testing"
"time"
- coreCommon "github.com/dexon-foundation/dexon-consensus/common"
- coreCrypto "github.com/dexon-foundation/dexon-consensus/core/crypto"
- "github.com/dexon-foundation/dexon-consensus/core/crypto/dkg"
- coreTypes "github.com/dexon-foundation/dexon-consensus/core/types"
- dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg"
+ coreCommon "github.com/dexon-foundation/dexon/dex/consensus/common"
+ coreCrypto "github.com/dexon-foundation/dexon/dex/consensus/core/crypto"
+ "github.com/dexon-foundation/dexon/dex/consensus/core/crypto/dkg"
+ coreTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types"
+ dkgTypes "github.com/dexon-foundation/dexon/dex/consensus/core/types/dkg"
"github.com/dexon-foundation/dexon/common"
"github.com/dexon-foundation/dexon/core/types"