From b0c6c750dfb5d0ea72b004810d6444242b228850 Mon Sep 17 00:00:00 2001
From: Anthony <anthony@mesg.com>
Date: Thu, 6 Feb 2020 22:27:23 +0700
Subject: [PATCH] Merge PR #5618: Add test of missing verifier in cli context

---
 CHANGELOG.md            | 1 +
 client/context/query.go | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc45a176b4..6d53438b58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ balances or a single balance by denom when the `denom` query parameter is presen
 ### Bug Fixes
 
 * (x/bank) [\#5531](https://github.com/cosmos/cosmos-sdk/issues/5531) Added missing amount event to MsgMultiSend, emitted for each output.
+* (client) [\#5618](https://github.com/cosmos/cosmos-sdk/pull/5618) Fix crash on the client when the verifier is not set. 
 
 ### State Machine Breaking
 
diff --git a/client/context/query.go b/client/context/query.go
index b5686f8641..c0c45a226f 100644
--- a/client/context/query.go
+++ b/client/context/query.go
@@ -130,6 +130,9 @@ func (ctx CLIContext) query(path string, key tmbytes.HexBytes) ([]byte, int64, e
 
 // Verify verifies the consensus proof at given height.
 func (ctx CLIContext) Verify(height int64) (tmtypes.SignedHeader, error) {
+	if ctx.Verifier == nil {
+		return tmtypes.SignedHeader{}, fmt.Errorf("missing valid certifier to verify data from distrusted node")
+	}
 	check, err := tmliteProxy.GetCertifiedCommit(height, ctx.Client, ctx.Verifier)
 	switch {
 	case tmliteErr.IsErrCommitNotFound(err):