From 318345f9969ac28e3a2006182bc0e3b6462ba66e Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Fri, 22 Sep 2017 00:10:13 -0400
Subject: [PATCH] fix tests

---
 example/block_aware/block_aware_test.go |  2 +-
 example/dummy/dummy_test.go             |  6 +++---
 types/messages.go                       | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/example/block_aware/block_aware_test.go b/example/block_aware/block_aware_test.go
index 64b6755e..2777ce1a 100644
--- a/example/block_aware/block_aware_test.go
+++ b/example/block_aware/block_aware_test.go
@@ -37,7 +37,7 @@ func TestChainAware(t *testing.T) {
 	hash := []byte("fake block hash")
 	header := &types.Header{}
 	for i := uint64(0); i < n; i++ {
-		client.BeginBlockSync(&types.RequestBeginBlock{hash, header})
+		client.BeginBlockSync(types.RequestBeginBlock{hash, header})
 		client.EndBlockSync(i)
 		client.CommitSync()
 	}
diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go
index e180af3e..495e7858 100644
--- a/example/dummy/dummy_test.go
+++ b/example/dummy/dummy_test.go
@@ -91,7 +91,7 @@ func TestPersistentDummyInfo(t *testing.T) {
 	header := &types.Header{
 		Height: uint64(height),
 	}
-	dummy.BeginBlock(hash, header)
+	dummy.BeginBlock(types.RequestBeginBlock{hash, header})
 	dummy.EndBlock(height)
 	dummy.Commit()
 
@@ -120,7 +120,7 @@ func TestValSetChanges(t *testing.T) {
 		vals[i] = &types.Validator{pubkey, uint64(power)}
 	}
 	// iniitalize with the first nInit
-	dummy.InitChain(vals[:nInit])
+	dummy.InitChain(types.RequestInitChain{vals[:nInit]})
 
 	vals1, vals2 := vals[:nInit], dummy.Validators()
 	valsEqual(t, vals1, vals2)
@@ -180,7 +180,7 @@ func makeApplyBlock(t *testing.T, dummy types.Application, heightInt int, diff [
 		Height: height,
 	}
 
-	dummy.BeginBlock(hash, header)
+	dummy.BeginBlock(types.RequestBeginBlock{hash, header})
 	for _, tx := range txs {
 		if r := dummy.DeliverTx(tx); r.IsErr() {
 			t.Fatal(r)
diff --git a/types/messages.go b/types/messages.go
index c7f24a13..7918e0ef 100644
--- a/types/messages.go
+++ b/types/messages.go
@@ -49,21 +49,21 @@ func ToRequestCommit() *Request {
 	}
 }
 
-func ToRequestQuery(reqQuery RequestQuery) *Request {
+func ToRequestQuery(req RequestQuery) *Request {
 	return &Request{
-		Value: &Request_Query{&reqQuery},
+		Value: &Request_Query{&req},
 	}
 }
 
-func ToRequestInitChain(reqInitChain RequestInitChain) *Request {
+func ToRequestInitChain(req RequestInitChain) *Request {
 	return &Request{
-		Value: &Request_InitChain{&reqInitChain},
+		Value: &Request_InitChain{&req},
 	}
 }
 
-func ToRequestBeginBlock(reqBeginBlock RequestBeginBlock) *Request {
+func ToRequestBeginBlock(req RequestBeginBlock) *Request {
 	return &Request{
-		Value: &Request_BeginBlock{&reqBeginBlock},
+		Value: &Request_BeginBlock{&req},
 	}
 }