From f5c4fdc82abd1cb6d15b09cd0e93abc21937264e Mon Sep 17 00:00:00 2001 From: rigelrozanski Date: Fri, 3 Mar 2017 01:27:41 -0500 Subject: [PATCH] seeds fix --- glide.lock | 14 +++++++------- glide.yaml | 2 +- rpc/core/net.go | 4 ++-- rpc/core/pipe.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/glide.lock b/glide.lock index e47b8d2f4..e282aac7a 100644 --- a/glide.lock +++ b/glide.lock @@ -2,7 +2,7 @@ hash: 9f2553f32b158ce61be7169d2b92e63a77a01cdd619629cb6c0064c196a7fa9c updated: 2017-03-03T01:22:09.83538904-05:00 imports: - name: github.com/btcsuite/btcd - version: d06c0bb181529331be8f8d9350288c420d9e60e4 + version: 583684b21bfbde9b5fc4403916fd7c807feb0289 subpackages: - btcec - name: github.com/BurntSushi/toml @@ -16,17 +16,17 @@ imports: - name: github.com/go-stack/stack version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 - name: github.com/gogo/protobuf - version: 2221ff550f109ae54cb617c0dc6ac62658c418d7 + version: d66ead2957a1d163be783c18c25bc388a201cdd0 subpackages: - proto - name: github.com/golang/protobuf - version: 8ee79997227bf9b34611aee7946ae64735e6fd93 + version: 69b215d01a5606c843240eab4937eab3acee6530 subpackages: - proto - name: github.com/golang/snappy version: d9eb7a3d35ec988b8585d4a0068e462c27d28380 - name: github.com/gorilla/websocket - version: 804cb600d06b10672f2fbc0a336a7bee507a428e + version: b258b4fadb573ac412f187b9f31974ea99d32f50 - name: github.com/jmhodges/levigo version: c42d9e0ca023e2198120196f842701bb4c55d7b9 - name: github.com/mattn/go-colorable @@ -47,7 +47,7 @@ imports: - assert - require - name: github.com/syndtr/goleveldb - version: 23851d93a2292dcc56e71a18ec9e0624d84a0f65 + version: 3c5717caf1475fd25964109a0fc640bd150fce43 subpackages: - leveldb - leveldb/cache @@ -128,7 +128,7 @@ imports: - ripemd160 - salsa20/salsa - name: golang.org/x/net - version: 61557ac0112b576429a0df080e1c2cef5dfbb642 + version: 906cda9512f77671ab44f8c8563b13a8e707b230 subpackages: - context - http2 @@ -142,7 +142,7 @@ imports: subpackages: - unix - name: google.golang.org/grpc - version: cbcceb2942a489498cf22b2f918536e819d33f0a + version: 1dab93372523195731c738b0f0cb4e452228e959 subpackages: - codes - credentials diff --git a/glide.yaml b/glide.yaml index 9a7e6744d..3cf2c36f8 100644 --- a/glide.yaml +++ b/glide.yaml @@ -19,7 +19,7 @@ import: - package: github.com/tendermint/go-merkle version: develop - package: github.com/tendermint/go-p2p - version: develop + version: seedsfix - package: github.com/tendermint/go-rpc version: develop - package: github.com/tendermint/go-wire diff --git a/rpc/core/net.go b/rpc/core/net.go index 9e9f027ea..3e9526d28 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -32,8 +32,8 @@ func NetInfo() (*ctypes.ResultNetInfo, error) { // Dial given list of seeds func UnsafeDialSeeds(seeds []string) (*ctypes.ResultDialSeeds, error) { // starts go routines to dial each seed after random delays - p2pSwitch.DialSeeds(seeds) - return &ctypes.ResultDialSeeds{}, nil + err := p2pSwitch.DialSeeds(seeds) + return &ctypes.ResultDialSeeds{}, err } //----------------------------------------------------------------------------- diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go index 40ef70817..fae2630cb 100644 --- a/rpc/core/pipe.go +++ b/rpc/core/pipe.go @@ -24,7 +24,7 @@ type P2P interface { NumPeers() (outbound, inbound, dialig int) NodeInfo() *p2p.NodeInfo IsListening() bool - DialSeeds([]string) + DialSeeds([]string) error } //----------------------------------------------