From f37f56d4f1a71b7031b2914787b115f5f1ba9544 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Wed, 24 Aug 2016 01:44:20 -0400
Subject: [PATCH] fixes

---
 consensus/mempool_test.go | 4 ++--
 proxy/app_conn_test.go    | 6 +++---
 types/protobuf.go         | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go
index b2246ce54..5d36a7118 100644
--- a/consensus/mempool_test.go
+++ b/consensus/mempool_test.go
@@ -122,8 +122,8 @@ func NewCounterApplication() *CounterApplication {
 	return &CounterApplication{}
 }
 
-func (app *CounterApplication) Info() string {
-	return Fmt("txs:%v", app.txCount)
+func (app *CounterApplication) Info() (string, *tmsp.TMSPInfo, *tmsp.LastBlockInfo, *tmsp.ConfigInfo) {
+	return Fmt("txs:%v", app.txCount), nil, nil, nil
 }
 
 func (app *CounterApplication) SetOption(key string, value string) (log string) {
diff --git a/proxy/app_conn_test.go b/proxy/app_conn_test.go
index 3b7a3413e..d9814ec3c 100644
--- a/proxy/app_conn_test.go
+++ b/proxy/app_conn_test.go
@@ -16,7 +16,7 @@ import (
 type AppConnTest interface {
 	EchoAsync(string) *tmspcli.ReqRes
 	FlushSync() error
-	InfoSync() (res types.Result)
+	InfoSync() (types.Result, *types.TMSPInfo, *types.LastBlockInfo, *types.ConfigInfo)
 }
 
 type appConnTest struct {
@@ -35,7 +35,7 @@ func (app *appConnTest) FlushSync() error {
 	return app.appConn.FlushSync()
 }
 
-func (app *appConnTest) InfoSync() types.Result {
+func (app *appConnTest) InfoSync() (types.Result, *types.TMSPInfo, *types.LastBlockInfo, *types.ConfigInfo) {
 	return app.appConn.InfoSync()
 }
 
@@ -114,7 +114,7 @@ func TestInfo(t *testing.T) {
 	proxy := NewAppConnTest(cli)
 	t.Log("Connected")
 
-	res := proxy.InfoSync()
+	res, _, _, _ := proxy.InfoSync()
 	if res.IsErr() {
 		t.Errorf("Unexpected error: %v", err)
 	}
diff --git a/types/protobuf.go b/types/protobuf.go
index c6d33cf25..8d2f9b819 100644
--- a/types/protobuf.go
+++ b/types/protobuf.go
@@ -19,6 +19,7 @@ func (tm2pb) Header(header *Header) *types.Header {
 		LastBlockParts: TM2PB.PartSetHeader(header.LastBlockParts),
 		LastCommitHash: header.LastCommitHash,
 		DataHash:       header.DataHash,
+		AppHash:        header.AppHash,
 	}
 }