diff options
| author | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
| commit | 24349144b6c0642755569268bab56b9033743212 (patch) | |
| tree | 9d9d2b6659fd8a56512dfc807aafe4b733165ae1 /swarm/api | |
| parent | 7d56602391e155e2ce9ba7c261300a1804ab9972 (diff) | |
| parent | d3441ebb563439bac0837d70591f92e2c6080303 (diff) | |
| download | go-tangerine-24349144b6c0642755569268bab56b9033743212.tar go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.gz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.bz2 go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.lz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.xz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.zst go-tangerine-24349144b6c0642755569268bab56b9033743212.zip | |
Merge branch 'master' into max-stream-peer-servers
Diffstat (limited to 'swarm/api')
| -rw-r--r-- | swarm/api/config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swarm/api/config.go b/swarm/api/config.go index aafb58956..be7385408 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -27,7 +27,7 @@ import ( "github.com/ethereum/go-ethereum/contracts/ens" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/network" "github.com/ethereum/go-ethereum/swarm/pss" @@ -119,7 +119,7 @@ func (c *Config) Init(prvKey *ecdsa.PrivateKey) { c.PublicKey = pubkeyhex c.BzzKey = keyhex - c.NodeID = discover.PubkeyID(&prvKey.PublicKey).String() + c.NodeID = enode.PubkeyToIDV4(&prvKey.PublicKey).String() if c.SwapEnabled { c.Swap.Init(c.Contract, prvKey) |