From c34e136be9590d1e1331ce00456f600afd51b8cf Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 12 Apr 2017 13:44:10 -0400 Subject: [PATCH 1/4] update go-rpc to support map and array params --- glide.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 9b11967a..9c2a25a3 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ hash: d9724aa287c40d1b3856b6565f09235d809c8b2f7c6537c04f597137c0d6cd26 -updated: 2017-04-11T15:24:16.619608243-04:00 +updated: 2017-04-12T13:43:29.528413882-04:00 imports: - name: github.com/btcsuite/btcd version: b8df516b4b267acf2de46be593a9d948d1d2c420 @@ -111,7 +111,7 @@ imports: subpackages: - upnp - name: github.com/tendermint/go-rpc - version: 9d18cbe74e66f875afa36d2fa3be280e4a2dc9e6 + version: c3295f4878019ff3fdfcac37a4c0e4bcf4bb02a7 subpackages: - client - server From cf875a51fde67db42deed3e5d573aebf98a0af30 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Wed, 22 Mar 2017 23:15:03 +0100 Subject: [PATCH 2/4] Fix draw_deps in Makefile and add resulting dependency graph --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3cafad38..e11152fc 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ test100: @for i in {1..100}; do make test; done draw_deps: - # requires brew install graphviz - go get github.com/hirokidaichi/goviz - goviz -i ./cmd/tendermint | dot -Tpng -o huge.png + # requires brew install graphviz or apt-get install graphviz + go get github.com/RobotsAndPencils/goviz + @goviz -i github.com/tendermint/tendermint/cmd/tendermint -d 3 | dot -Tpng -o dependency-graph.png list_deps: @go list -f '{{join .Deps "\n"}}' ./... | \ From 6bcbd14d5a532078dae4c312e6ff50dd5f4f60e0 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Thu, 23 Mar 2017 12:52:04 +0100 Subject: [PATCH 3/4] Add line counting badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a1ba8fb3..3fb5d864 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/6874 )](https://godoc.org/github.com/tendermint/tendermint) [![chat](https://img.shields.io/badge/slack-join%20chat-pink.svg)](http://forum.tendermint.com:3000/) [![license](https://img.shields.io/github/license/tendermint/tendermint.svg)](https://github.com/tendermint/tendermint/blob/master/LICENSE) +[![](https://tokei.rs/b1/github/tendermint/tendermint?category=lines)](https://github.com/tendermint/tendermint) + Branch | Tests | Coverage | Report Card ----------|-------|----------|------------- From 585ce45a5e253743da7b72d9a2385c01059fc6d5 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 12 Apr 2017 19:12:22 -0400 Subject: [PATCH 4/4] rpc: dial_seeds msg. addresses #403 --- rpc/core/net.go | 11 ++++++++++- rpc/core/types/responses.go | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rpc/core/net.go b/rpc/core/net.go index df491ba8..31d9c34e 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -1,6 +1,8 @@ package core import ( + "fmt" + ctypes "github.com/tendermint/tendermint/rpc/core/types" ) @@ -31,10 +33,17 @@ func NetInfo() (*ctypes.ResultNetInfo, error) { // Dial given list of seeds func UnsafeDialSeeds(seeds []string) (*ctypes.ResultDialSeeds, error) { + + if len(seeds) == 0 { + return &ctypes.ResultDialSeeds{}, fmt.Errorf("No seeds provided") + } // starts go routines to dial each seed after random delays log.Info("DialSeeds", "addrBook", addrBook, "seeds", seeds) err := p2pSwitch.DialSeeds(addrBook, seeds) - return &ctypes.ResultDialSeeds{}, err + if err != nil { + return &ctypes.ResultDialSeeds{}, err + } + return &ctypes.ResultDialSeeds{"Dialing seeds in progress. See /net_info for details"}, nil } //----------------------------------------------------------------------------- diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index bcab4f59..82087e25 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -45,6 +45,7 @@ type ResultNetInfo struct { } type ResultDialSeeds struct { + Log string `json:"log"` } type Peer struct {