update circle and glide

Makefile

@@ -43,6 +43,10 @@ get_deps:
 		grep -v /vendor/ | sort | uniq | \
 		xargs go get
 
+get_vendor_deps:
+	go get github.com/Masterminds/glide
+	glide install
+
 update_deps:
 	go get -d -u github.com/tendermint/tendermint/...
 

circle.yml

@@ -16,8 +16,8 @@ checkout:
 
 dependencies:
   override:
-    - "cd $REPO && make get_deps"
+    - "cd $REPO && make get_vendor_deps"
 
 test:
   override:
-    - "cd $REPO && make test"
+    - "cd $REPO && make test_race"

consensus/state_test.go

@@ -346,7 +346,7 @@ func TestLockNoPOL(t *testing.T) {
 
 	// we should now be stuck in limbo forever, waiting for more prevotes
 	// prevote arrives from cs2:
-	signAddVoteToFrom(types.VoteTypePrevote, cs1, cs2, cs1.ProposalBlock.Hash(), cs1.ProposalBlockParts.Header())
+	signAddVoteToFrom(types.VoteTypePrevote, cs1, cs2, rs.ProposalBlock.Hash(), rs.ProposalBlockParts.Header())
 	<-voteCh // prevote
 
 	<-voteCh // precommit

glide.lock

@@ -56,7 +56,7 @@ imports:
 - name: github.com/tendermint/go-common
   version: dcfa46af1341d03b80d32e4901019d1668b978b9
 - name: github.com/tendermint/go-config
-  version: cfcef384d64b94e50909596e39b32ffb3cc20573
+  version: e64b424499acd0eb9856b88e10c0dff41628c0d6
 - name: github.com/tendermint/go-crypto
   version: 41cfb7b677f4e16cdfd22b6ce0946c89919fbc7b
 - name: github.com/tendermint/go-db
@@ -68,7 +68,7 @@ imports:
 - name: github.com/tendermint/go-merkle
   version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8
 - name: github.com/tendermint/go-p2p
-  version: 5bd7692323ec60d6461678f09b5024a952164151
+  version: 929cf433b9c8e987af5f7f3ca3ce717e1e3eda53
   subpackages:
   - upnp
 - name: github.com/tendermint/go-rpc