From 1d82cdbbbcb6bb64c3624a17aed906e02b205e87 Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Tue, 8 May 2018 16:15:35 -0400
Subject: [PATCH] subspace query tests, changelog

---
 CHANGELOG.md            |  2 ++
 store/iavlstore_test.go | 48 ++++++++++++++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77b4ffba89..1ca0189666 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,8 @@ FEATURES:
   * New genesis account keys are automatically added to the client keybase (introduce `--client-home` flag)
   * Initialize with genesis txs using `--gen-txs` flag
 * Context now has access to the application-configured logger
+* Add (non-proof) subspace query helper functions 
+* Add more staking query functions: candidates, delegator-bonds
 
 BUG FIXES
 * Gaia now uses stake, ported from github.com/cosmos/gaia
diff --git a/store/iavlstore_test.go b/store/iavlstore_test.go
index 4557dea06f..ebfe36e335 100644
--- a/store/iavlstore_test.go
+++ b/store/iavlstore_test.go
@@ -263,43 +263,63 @@ func TestIAVLStoreQuery(t *testing.T) {
 	tree := iavl.NewVersionedTree(db, cacheSize)
 	iavlStore := newIAVLStore(tree, numHistory)
 
-	k, v := []byte("wind"), []byte("blows")
-	k2, v2 := []byte("water"), []byte("flows")
-	v3 := []byte("is cold")
-	// k3, v3 := []byte("earth"), []byte("soes")
-	// k4, v4 := []byte("fire"), []byte("woes")
+	k1, v1 := []byte("aaa"), []byte("val1")
+	k2, v2 := []byte("bbb"), []byte("val2")
+	v3 := []byte("val3")
+
+	ksub = []byte("w")
+	KVs1, KVs2 := []KV{v1, v2}, []KV{v3, v2}
+	valExpSub1 := cdc.MustMarshalBinary(KVs1)
+	valExpSub2 := cdc.MustMarshalBinary(KVs2)
 
 	cid := iavlStore.Commit()
 	ver := cid.Version
-	query := abci.RequestQuery{Path: "/key", Data: k, Height: ver}
+	query := abci.RequestQuery{Path: "/key", Data: k1, Height: ver}
+	querySub := abci.RequestQuery{Path: "/subspace", Data: ksub, Height: ver}
 
 	// set data without commit, doesn't show up
-	iavlStore.Set(k, v)
+	iavlStore.Set(k1, v1)
 	qres := iavlStore.Query(query)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
 	assert.Nil(t, qres.Value)
+	qres = iavlStore.Query(querySub)
+	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
+	assert.Nil(t, qres.Value)
 
 	// commit it, but still don't see on old version
 	cid = iavlStore.Commit()
 	qres = iavlStore.Query(query)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
 	assert.Nil(t, qres.Value)
+	qres = iavlStore.Query(querySub)
+	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
+	assert.Nil(t, qres.Value)
 
 	// but yes on the new version
 	query.Height = cid.Version
 	qres = iavlStore.Query(query)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
-	assert.Equal(t, v, qres.Value)
+	assert.Equal(t, v1, qres.Value)
+
+	// and for the subspace
+	qres = iavlStore.Query(querySub)
+	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
+	assert.Equal(t, valExpSub1, qres.Value)
 
 	// modify
 	iavlStore.Set(k2, v2)
-	iavlStore.Set(k, v3)
+	iavlStore.Set(k1, v3)
 	cid = iavlStore.Commit()
 
 	// query will return old values, as height is fixed
 	qres = iavlStore.Query(query)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
-	assert.Equal(t, v, qres.Value)
+	assert.Equal(t, v1, qres.Value)
+
+	// and for the subspace
+	qres = iavlStore.Query(querySub)
+	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
+	assert.Equal(t, valExpSub1, qres.Value)
 
 	// update to latest in the query and we are happy
 	query.Height = cid.Version
@@ -310,10 +330,14 @@ func TestIAVLStoreQuery(t *testing.T) {
 	qres = iavlStore.Query(query2)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
 	assert.Equal(t, v2, qres.Value)
+	// and for the subspace
+	qres = iavlStore.Query(querySub)
+	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
+	assert.Equal(t, valExpSub2, qres.Value)
 
 	// default (height 0) will show latest -1
-	query0 := abci.RequestQuery{Path: "/store", Data: k}
+	query0 := abci.RequestQuery{Path: "/store", Data: k1}
 	qres = iavlStore.Query(query0)
 	assert.Equal(t, uint32(sdk.CodeOK), qres.Code)
-	assert.Equal(t, v, qres.Value)
+	assert.Equal(t, v1, qres.Value)
 }