Merge branch 'master' into thane/7655-vote-extensions

test/app/test.sh

@@ -1,5 +1,5 @@
-#! /bin/bash
-set -ex
+#!/bin/bash
+set -exo pipefail
 
 #- kvstore over socket, curl
 
@@ -8,9 +8,19 @@ set -ex
 export PATH="$GOBIN:$PATH"
 export TMHOME=$HOME/.tendermint_app
 
-function kvstore_over_socket(){
-    rm -rf $TMHOME
+function init_validator() {
+    rm -rf -- "$TMHOME"
     tendermint init validator
+
+    # The default configuration sets a null indexer, but these tests require
+    # indexing to be enabled. Rewrite the config file to set the "kv" indexer
+    # before starting up the node.
+    sed -i'' -e '/indexer = \["null"\]/c\
+indexer = ["kv"]' "$TMHOME/config/config.toml"
+}
+
+function kvstore_over_socket() {
+    init_validator
     echo "Starting kvstore_over_socket"
     abci-cli kvstore > /dev/null &
     pid_kvstore=$!
@@ -25,9 +35,8 @@ function kvstore_over_socket(){
 }
 
 # start tendermint first
-function kvstore_over_socket_reorder(){
-    rm -rf $TMHOME
-    tendermint init validator
+function kvstore_over_socket_reorder() {
+    init_validator
     echo "Starting kvstore_over_socket_reorder (ie. start tendermint first)"
     tendermint start --mode validator > tendermint.log &
     pid_tendermint=$!
@@ -42,7 +51,7 @@ function kvstore_over_socket_reorder(){
     kill -9 $pid_kvstore $pid_tendermint
 }
 
-case "$1" in 
+case "$1" in
     "kvstore_over_socket")
     kvstore_over_socket
     ;;

test/docker/config-template.toml

@@ -1,2 +1,5 @@
 [rpc]
 laddr = "tcp://0.0.0.0:26657"
+
+[tx-index]
+indexer = ["kv"]

test/e2e/runner/setup.go

@@ -237,6 +237,7 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) {
 	cfg := config.DefaultConfig()
 	cfg.Moniker = node.Name
 	cfg.ProxyApp = AppAddressTCP
+	cfg.TxIndex = config.TestTxIndexConfig()
 
 	if node.LogLevel != "" {
 		cfg.LogLevel = node.LogLevel