aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
diff options
context:
space:
mode:
authorWei-Ning Huang <w@dexon.org>2019-04-18 14:15:11 +0800
committerJimmy Hu <jimmy.hu@dexon.org>2019-04-18 14:15:11 +0800
commitac3378ba084e1fbf25c11581c224009a3cf75062 (patch)
treec384c056df0a28bfd9dd47864daa03b24fb78ce8 /p2p
parent9abba1d1a25b47a21666b6abfc30a3ce4ff88ed6 (diff)
downloaddexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar.gz
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar.bz2
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar.lz
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar.xz
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.tar.zst
dexon-ac3378ba084e1fbf25c11581c224009a3cf75062.zip
crypto: use go-ethereum secp256k1 package to avoid symbol conflict (#374)
Diffstat (limited to 'p2p')
-rw-r--r--p2p/discover/node.go2
-rw-r--r--p2p/rlpx.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index 1c5560839..18b4aeadd 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -25,8 +25,8 @@ import (
"github.com/dexon-foundation/dexon/common/math"
"github.com/dexon-foundation/dexon/crypto"
- "github.com/dexon-foundation/dexon/crypto/secp256k1"
"github.com/dexon-foundation/dexon/p2p/enode"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
)
// node represents a host on the network.
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index a19eff7e9..45253e1e9 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -38,8 +38,8 @@ import (
"github.com/dexon-foundation/dexon/common/bitutil"
"github.com/dexon-foundation/dexon/crypto"
"github.com/dexon-foundation/dexon/crypto/ecies"
- "github.com/dexon-foundation/dexon/crypto/secp256k1"
"github.com/dexon-foundation/dexon/rlp"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/golang/snappy"
"golang.org/x/crypto/sha3"
)