fix: add more fixing for abci.Client, Async()

light/rpc/client_test.go

@@ -7,9 +7,6 @@ import (
 	"testing"
 
 	ics23 "github.com/confio/ics23/go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
 	abci "github.com/line/ostracon/abci/types"
 	"github.com/line/ostracon/crypto/merkle"
@@ -19,7 +16,6 @@ import (
 	rpcmock "github.com/line/ostracon/rpc/client/mocks"
 	ctypes "github.com/line/ostracon/rpc/core/types"
 	"github.com/line/ostracon/types"
-	"github.com/line/tm-db/v2/memdb"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

proxy/app_conn_test.go

@@ -16,7 +16,7 @@ import (
 //----------------------------------------
 
 type AppConnTest interface {
-	FlushSync() error
+	FlushSync() (*types.ResponseFlush, error)
 	EchoAsync(string, abcicli.ResponseCallback) *abcicli.ReqRes
 	InfoSync(types.RequestInfo) (*types.ResponseInfo, error)
 }
@@ -33,7 +33,7 @@ func (app *appConnTest) EchoAsync(msg string, cb abcicli.ResponseCallback) *abci
 	return app.appConn.EchoAsync(msg, cb)
 }
 
-func (app *appConnTest) FlushSync() error {
+func (app *appConnTest) FlushSync() (*types.ResponseFlush, error) {
 	return app.appConn.FlushSync()
 }
 
@@ -77,8 +77,9 @@ func TestEcho(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		proxy.EchoAsync(fmt.Sprintf("echo-%v", i), nil)
 	}
-	if err := proxy.FlushSync(); err != nil {
-		t.Error(err)
+	_, err2 := proxy.FlushSync()
+	if err2 != nil {
+		t.Error(err2)
 	}
 }
 
@@ -117,8 +118,9 @@ func BenchmarkEcho(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		proxy.EchoAsync(echoString, nil)
 	}
-	if err := proxy.FlushSync(); err != nil {
-		b.Error(err)
+	_, err2 := proxy.FlushSync()
+	if err2 != nil {
+		b.Error(err2)
 	}
 
 	b.StopTimer()