From 8765fa32fada2d97235c43c4688d5134617a2cb0 Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Tue, 30 Jan 2018 20:01:25 +0100
Subject: [PATCH] Expose rootMultiStore query in BaseApp

---
 baseapp/baseapp.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
index 1727c2a42..c4f326b08 100644
--- a/baseapp/baseapp.go
+++ b/baseapp/baseapp.go
@@ -199,9 +199,14 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
 }
 
 // Implements ABCI.
+// Delegates to CommitMultiStore if it implements Queryable
 func (app *BaseApp) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
-	// TODO: See app/query.go
-	return
+	query, ok := app.cms.(sdk.Queryable)
+	if !ok {
+		msg := "application doesn't support queries"
+		return sdk.ErrUnknownRequest(msg).Result().ToQuery()
+	}
+	return query.Query(req)
 }
 
 // Implements ABCI.