merge master

CHANGELOG.md

@@ -22,6 +22,7 @@ program](https://hackerone.com/tendermint).
   - [libs] Remove unused `db/debugDB` and `common/colors.go` & `errors/errors.go` files (@marbar3778)
   - [libs] [\#2432](https://github.com/tendermint/tendermint/issues/2432) Remove unused `common/heap.go` file (@marbar3778)
   - [libs] Remove unused `date.go`, `io.go`. Remove `GoPath()`, `Prompt()` and `IsDirEmpty()` functions from `os.go` (@marbar3778)
+  - [libs] Remove unused `FailRand()` func and minor clean up to `fail.go`(@marbar3778)
 
 ### FEATURES:
 

libs/circle.yml

@@ -1,21 +0,0 @@
-machine:
-  environment:
-    GOPATH: "${HOME}/.go_workspace"
-    PROJECT_PARENT_PATH: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME"
-    PROJECT_PATH: $GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
-  hosts:
-    localhost: 127.0.0.1
-
-dependencies:
-  override:
-    - mkdir -p "$PROJECT_PARENT_PATH"
-    - ln -sf "$HOME/$CIRCLE_PROJECT_REPONAME/" "$PROJECT_PATH"
-  post:
-    - go version
-
-test:
-  override:
-    - cd $PROJECT_PATH && make get_tools && bash ./test.sh
-  post:
-    - cd "$PROJECT_PATH" && bash <(curl -s https://codecov.io/bash) -f coverage.txt
-    - cd "$PROJECT_PATH" && mv coverage.txt "${CIRCLE_ARTIFACTS}"

libs/fail/fail.go

@@ -2,36 +2,30 @@ package fail
 
 import (
 	"fmt"
-	"math/rand"
 	"os"
 	"strconv"
 )
 
-var callIndexToFail int
+func envSet() int {
-
-func init() {
 	callIndexToFailS := os.Getenv("FAIL_TEST_INDEX")
 
 	if callIndexToFailS == "" {
-		callIndexToFail = -1
+		return -1
 	} else {
 		var err error
-		callIndexToFail, err = strconv.Atoi(callIndexToFailS)
+		callIndexToFail, err := strconv.Atoi(callIndexToFailS)
 		if err != nil {
-			callIndexToFail = -1
+			return -1
 		}
+		return callIndexToFail
 	}
 }
 
 // Fail when FAIL_TEST_INDEX == callIndex
-var (
+var callIndex int //indexes Fail calls
-	callIndex int //indexes Fail calls
-
-	callRandIndex       int  // indexes a run of FailRand calls
-	callRandIndexToFail = -1 // the callRandIndex to fail on in FailRand
-)
 
 func Fail() {
+	callIndexToFail := envSet()
 	if callIndexToFail < 0 {
 		return
 	}
@@ -43,33 +37,6 @@ func Fail() {
 	callIndex += 1
 }
 
-// FailRand should be called n successive times.
-// It will fail on a random one of those calls
-// n must be greater than 0
-func FailRand(n int) {
-	if callIndexToFail < 0 {
-		return
-	}
-
-	if callRandIndexToFail < 0 {
-		// first call in the loop, pick a random index to fail at
-		callRandIndexToFail = rand.Intn(n)
-		callRandIndex = 0
-	}
-
-	if callIndex == callIndexToFail {
-		if callRandIndex == callRandIndexToFail {
-			Exit()
-		}
-	}
-
-	callRandIndex += 1
-
-	if callRandIndex == n {
-		callIndex += 1
-	}
-}
-
 func Exit() {
 	fmt.Printf("*** fail-test %d ***\n", callIndex)
 	os.Exit(1)

libs/test/assert.go

@@ -1,14 +0,0 @@
-package test
-
-import (
-	"testing"
-)
-
-func AssertPanics(t *testing.T, msg string, f func()) {
-	defer func() {
-		if err := recover(); err == nil {
-			t.Errorf("Should have panic'd, but didn't: %v", msg)
-		}
-	}()
-	f()
-}

libs/version/version.go

@@ -1,3 +0,0 @@
-package version
-
-const Version = "0.9.0"

types/vote_set_test.go

@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/tendermint/tendermint/crypto"
 	cmn "github.com/tendermint/tendermint/libs/common"
-	tst "github.com/tendermint/tendermint/libs/test"
 	tmtime "github.com/tendermint/tendermint/types/time"
 )
 
@@ -490,7 +491,7 @@ func TestMakeCommit(t *testing.T) {
 	}
 
 	// MakeCommit should fail.
-	tst.AssertPanics(t, "Doesn't have +2/3 majority", func() { voteSet.MakeCommit() })
+	assert.Panics(t, func() { voteSet.MakeCommit() }, "Doesn't have +2/3 majority")
 
 	// 7th voted for some other block.
 	{

types/vote_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	amino "github.com/tendermint/go-amino"
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/ed25519"