diff --git a/glide.lock b/glide.lock index 1624d7441..e99b9f854 100644 --- a/glide.lock +++ b/glide.lock @@ -84,7 +84,7 @@ imports: subpackages: - term - name: github.com/tendermint/tmsp - version: f41bc5f11969e22b357d94b4247403fd62d40445 + version: 49a67aee8a7984a68eabe2c45ff6eb0ff51e31f9 subpackages: - client - example/dummy diff --git a/mempool/mempool.go b/mempool/mempool.go index 71ee65a32..0833cb4a6 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -194,6 +194,8 @@ func (mem *Mempool) resCbNormal(req *tmsp.Request, res *tmsp.Response) { log.Info("Bad Transaction", "res", r) // remove from cache (it might be good later) + // note this is an async callback, + // so we need to grab the lock in removeTxFromCacheMap mem.removeTxFromCacheMap(req.GetCheckTx().Tx) // TODO: handle other retcodes diff --git a/test/rpc/counter_test.sh b/test/rpc/counter_test.sh index bece24019..809a22128 100644 --- a/test/rpc/counter_test.sh +++ b/test/rpc/counter_test.sh @@ -13,9 +13,6 @@ function sendTx() { CODE=`echo $RESPONSE | jq .result[1].code` ERROR=`echo $RESPONSE | jq .error` ERROR=$(echo "$ERROR" | tr -d '"') # remove surrounding quotes - echo "ERROR: $ERROR" - echo "CODE: $CODE" - echo "" } # 0 should pass once and get in block, with no error