From 10d893ee9b50d9ee376fc3a0df2b239e56ba537e Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Wed, 29 Nov 2017 13:51:28 -0600
Subject: [PATCH] update deps

---
 glide.lock             |  6 +++---
 glide.yaml             |  4 ++--
 node/node.go           |  2 +-
 state/txindex/kv/kv.go | 22 ++--------------------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/glide.lock b/glide.lock
index 18a5d6a70..2e49ff5ab 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: ffe610ffb74c1ea5cbe8da5d0d3ae30d2640c7426fe9a889a60218ea36daaf53
-updated: 2017-11-29T17:21:18.25916493Z
+hash: b4e6f2f40e2738e45cec07ed91a5733d94d29cdfa0c7eb686a4d0a34512e2097
+updated: 2017-11-29T18:57:12.922510534Z
 imports:
 - name: github.com/btcsuite/btcd
   version: 8cea3866d0f7fb12d567a20744942c0d078c7d15
@@ -123,7 +123,7 @@ imports:
   subpackages:
   - iavl
 - name: github.com/tendermint/tmlibs
-  version: 1e12754b3a3b5f1c23bf44c2d882faae688fb2e8
+  version: 21fb7819891997c96838308b4eba5a50b07ff03f
   subpackages:
   - autofile
   - cli
diff --git a/glide.yaml b/glide.yaml
index 62c06fc9d..9d37891dd 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -18,7 +18,7 @@ import:
 - package: github.com/spf13/viper
   version: v1.0.0
 - package: github.com/tendermint/abci
-  version: 5c29adc081795b04f9d046fb51d76903c22cfa6d
+  version: develop
   subpackages:
   - client
   - example/dummy
@@ -34,7 +34,7 @@ import:
   subpackages:
   - iavl
 - package: github.com/tendermint/tmlibs
-  version: 1e12754b3a3b5f1c23bf44c2d882faae688fb2e8
+  version: develop
   subpackages:
   - autofile
   - cli
diff --git a/node/node.go b/node/node.go
index ea668f8f6..865b8741d 100644
--- a/node/node.go
+++ b/node/node.go
@@ -367,7 +367,7 @@ func (n *Node) OnStart() error {
 	}
 
 	// start tx indexer
-	_, err = n.indexerService.Start()
+	err = n.indexerService.Start()
 	if err != nil {
 		return err
 	}
diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go
index e5ae048cd..5228a3c43 100644
--- a/state/txindex/kv/kv.go
+++ b/state/txindex/kv/kv.go
@@ -68,7 +68,7 @@ func (txi *TxIndex) AddBatch(b *txindex.Batch) error {
 
 		// index tx by tags
 		for _, tag := range result.Result.Tags {
-			if stringInSlice(tag.Key, txi.tagsToIndex) {
+			if cmn.StringInSlice(tag.Key, txi.tagsToIndex) {
 				storeBatch.Set(keyForTag(tag, result), hash)
 			}
 		}
@@ -146,7 +146,7 @@ func (txi *TxIndex) Search(q *query.Query) ([]*types.TxResult, error) {
 
 	// for all other conditions
 	for i, c := range conditions {
-		if intInSlice(i, skipIndexes) {
+		if cmn.IntInSlice(i, skipIndexes) {
 			continue
 		}
 
@@ -356,24 +356,6 @@ func keyForTag(tag *abci.KVPair, result *types.TxResult) []byte {
 ///////////////////////////////////////////////////////////////////////////////
 // Utils
 
-func stringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-func intInSlice(a int, list []int) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
 func intersect(as, bs [][]byte) [][]byte {
 	i := make([][]byte, 0, cmn.MinInt(len(as), len(bs)))
 	for _, a := range as {