Merge branch 'hotfix/v0.6.3'

capacity_test.go

@@ -8,6 +8,8 @@ package emoney
 
 import (
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/spf13/viper"
 	"sync"
 	"time"
 
@@ -40,6 +42,9 @@ var _ = Describe("Staking", func() {
 			It("creates a new testnet", createNewTestnet)
 
 			It("Creates a lot of send transactions", func() {
+				viper.Set(flags.FlagTrustNode, true)
+				defer viper.Set(flags.FlagTrustNode, nil)
+
 				emcli := testnet.NewEmcli()
 
 				time.Sleep(2 * time.Second)
@@ -147,6 +152,7 @@ func sendTx(fromKey, toKey nt.Key, amount sdk.Coins, chainID string) (sdk.TxResp
 		WithCodec(cdc).
 		//WithBroadcastMode("block").
 		WithBroadcastMode("async").
+		WithTrustNode(true).
 		WithClient(rpcclient.NewHTTP("tcp://localhost:26657", "/websocket"))
 
 	to, err := sdk.AccAddressFromBech32(toKey.GetAddress())

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/Workiva/go-datastructures v1.0.50
-	github.com/cosmos/cosmos-sdk v0.37.9
+	github.com/cosmos/cosmos-sdk v0.37.13
 	github.com/emirpasic/gods v1.12.0
 	github.com/gorilla/mux v1.7.0
 	github.com/onsi/ginkgo v1.7.0
@@ -13,7 +13,7 @@ require (
 	github.com/spf13/viper v1.6.1
 	github.com/stretchr/testify v1.4.0
 	github.com/tendermint/go-amino v0.15.0
-	github.com/tendermint/tendermint v0.32.10
+	github.com/tendermint/tendermint v0.32.12
 	github.com/tendermint/tm-db v0.2.0
 	github.com/tidwall/gjson v1.3.2
 	github.com/tidwall/sjson v1.0.4

go.sum

@@ -43,10 +43,16 @@ github.com/cosmos/cosmos-sdk v0.37.8 h1:5KL3Cln5ezMKI+EvH7Dc9GgKgisdRzwbyrqiGPex
 github.com/cosmos/cosmos-sdk v0.37.8/go.mod h1:63Y8V75rRDzUrtRUwy+5cBOy5mr6xytI11PBk53tBrE=
 github.com/cosmos/cosmos-sdk v0.37.9 h1:3fwV1o41jx8S5hrDYjLfaxkaZZmWT2N/LjOZn39dKvA=
 github.com/cosmos/cosmos-sdk v0.37.9/go.mod h1:PG0SiXXlRej2X62VJLGbbiQuFa+i8TX/98vcfX71QLI=
+github.com/cosmos/cosmos-sdk v0.37.12 h1:rJnXjX6eUnfowrfFdq28b93Fe0hjdWhaBtQP5MpIBZw=
+github.com/cosmos/cosmos-sdk v0.37.12/go.mod h1:aaL8qeMIBfQWfpNqfhXDXzXQ8/g9MUM3pBhWJOlrB7Q=
+github.com/cosmos/cosmos-sdk v0.37.13 h1:mDSfa3nSQxDC0VMGD/KIYEYqxdiOZ92Na3wwDSrAfw0=
+github.com/cosmos/cosmos-sdk v0.37.13/go.mod h1:2ErVllaXXVfjSHD8BZO3TxbcqQ6em0W0mVBDJm+umH8=
 github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8 h1:Iwin12wRQtyZhH6FV3ykFcdGNlYEzoeR0jN8Vn+JWsI=
 github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/ledger-cosmos-go v0.10.3 h1:Qhi5yTR5Pg1CaTpd00pxlGwNl4sFRdtK1J96OTjeFFc=
 github.com/cosmos/ledger-cosmos-go v0.10.3/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
+github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
+github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
 github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
 github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
@@ -263,6 +269,10 @@ github.com/tendermint/tendermint v0.32.9 h1:++dR46xpBq/yfQx2c5KyrZmb15p2jw9Q5iEt
 github.com/tendermint/tendermint v0.32.9/go.mod h1:5/B1XZjNYtVBso8o1l/Eg4A0Mhu42lDcmftoQl95j/E=
 github.com/tendermint/tendermint v0.32.10 h1:2NSVddRwicGb8a2Hu0QccQAy8uW0zD8Y1y4JeWTLS0U=
 github.com/tendermint/tendermint v0.32.10/go.mod h1:5/B1XZjNYtVBso8o1l/Eg4A0Mhu42lDcmftoQl95j/E=
+github.com/tendermint/tendermint v0.32.11 h1:o770nBHgDPnANsMXG5bMR5ibMQYB14PFtUum64UA/Uc=
+github.com/tendermint/tendermint v0.32.11/go.mod h1:5/B1XZjNYtVBso8o1l/Eg4A0Mhu42lDcmftoQl95j/E=
+github.com/tendermint/tendermint v0.32.12 h1:JFD3aQZFySamBeU1bfDaqOVgFo6w8UpmiKylVB8eV00=
+github.com/tendermint/tendermint v0.32.12/go.mod h1:5/B1XZjNYtVBso8o1l/Eg4A0Mhu42lDcmftoQl95j/E=
 github.com/tendermint/tm-db v0.1.1/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw=
 github.com/tendermint/tm-db v0.2.0 h1:rJxgdqn6fIiVJZy4zLpY1qVlyD0TU6vhkT4kEf71TQQ=
 github.com/tendermint/tm-db v0.2.0/go.mod h1:0cPKWu2Mou3IlxecH+MEUSYc1Ch537alLe6CpFrKzgw=