Support new Query message for proofs

rpc/core/abci.go

@@ -1,25 +1,28 @@
 package core
 
 import (
+	abci "github.com/tendermint/abci/types"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 //-----------------------------------------------------------------------------
 
-func ABCIQuery(query []byte) (*ctypes.ResultABCIQuery, error) {
-	res := proxyAppQuery.QuerySync(query)
-	return &ctypes.ResultABCIQuery{res}, nil
-}
-
-func ABCIInfo() (*ctypes.ResultABCIInfo, error) {
-	res, err := proxyAppQuery.InfoSync()
+func ABCIQuery(path string, data []byte, prove bool) (*ctypes.ResultABCIQuery, error) {
+	resQuery, err := proxyAppQuery.QuerySync(abci.RequestQuery{
+		Path:  path,
+		Data:  data,
+		Prove: prove,
+	})
 	if err != nil {
 		return nil, err
 	}
-	return &ctypes.ResultABCIInfo{
-		Data:             res.Data,
-		Version:          res.Version,
-		LastBlockHeight:  res.LastBlockHeight,
-		LastBlockAppHash: res.LastBlockAppHash,
-	}, nil
+	return &ctypes.ResultABCIQuery{resQuery}, nil
+}
+
+func ABCIInfo() (*ctypes.ResultABCIInfo, error) {
+	resInfo, err := proxyAppQuery.InfoSync()
+	if err != nil {
+		return nil, err
+	}
+	return &ctypes.ResultABCIInfo{resInfo}, nil
 }