From b2385b46cf3147fae0c74221ba764d40d76f967a Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 11 Dec 2017 16:22:27 -0600
Subject: [PATCH 1/3] wait 5 sec for a block on CircleCI

Fixes:
```
--- FAIL: TestHandshakeReplaySome (12.40s)
        replay_test.go:332: waited too long for tendermint to produce 6 blocks
```
---
 consensus/wal_generator.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go
index 6f8bb8df..c43e7c63 100644
--- a/consensus/wal_generator.go
+++ b/consensus/wal_generator.go
@@ -91,7 +91,7 @@ func WALWithNBlocks(numBlocks int) (data []byte, err error) {
 	case <-numBlocksWritten:
 		wr.Flush()
 		return b.Bytes(), nil
-	case <-time.After(time.Duration(2*numBlocks) * time.Second):
+	case <-time.After(time.Duration(5*numBlocks) * time.Second):
 		return b.Bytes(), fmt.Errorf("waited too long for tendermint to produce %d blocks", numBlocks)
 	}
 }

From d943f66abcda299685f6f7acd4e13d55b8e22761 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 11 Dec 2017 16:55:40 -0600
Subject: [PATCH 2/3] remove get_deps, update_deps and list_deps

Rationale: they only lead to broken builds and should not be used by
anyone.
---
 Makefile | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index b94cfd04..36ba6097 100644
--- a/Makefile
+++ b/Makefile
@@ -54,27 +54,14 @@ draw_deps:
 	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"}}' ./... | \
-		grep -v /vendor/ | sort | uniq | \
-		xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}'
-
-get_deps:
-	@echo "--> Running go get"
-	@go get -v -d $(PACKAGES)
-	@go list -f '{{join .TestImports "\n"}}' ./... | \
-		grep -v /vendor/ | sort | uniq | \
-		xargs go get -v -d
-
-update_deps:
-	@echo "--> Updating dependencies"
-	@go get -d -u ./...
-
 get_vendor_deps:
 	@hash glide 2>/dev/null || go get github.com/Masterminds/glide
 	@rm -rf vendor/
 	@echo "--> Running glide install"
-	$(GOPATH)/bin/glide install
+	@$(GOPATH)/bin/glide install
+
+update_vendor_deps:
+	@$(GOPATH)/bin/glide update
 
 update_tools:
 	@echo "--> Updating tools"
@@ -119,4 +106,4 @@ metalinter_test:
 		#--enable=vet \
 		#--enable=vetshadow \
 
-.PHONY: install build build_race dist test test_race test_integrations test100 draw_deps list_deps get_deps get_vendor_deps update_deps update_tools tools test_release
+.PHONY: install build build_race dist test test_race test_integrations test100 draw_deps get_vendor_deps update_vendor_deps update_tools tools test_release

From 69205594cc05506b53965c2196abda56696aa4a3 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Mon, 11 Dec 2017 16:57:30 -0600
Subject: [PATCH 3/3] add gopath to path on CircleCI

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index e606097c..3805eb80 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,6 +7,7 @@ machine:
     GOPATH: "$HOME/.go_project"
     PROJECT_PARENT_PATH: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME"
     PROJECT_PATH: "$PROJECT_PARENT_PATH/$CIRCLE_PROJECT_REPONAME"
+    PATH: "$HOME/.go_project/bin:${PATH}"
   hosts:
     localhost: 127.0.0.1