Browse Source

fixes

pull/265/head
Ethan Buchman 8 years ago
parent
commit
f37f56d4f1
3 changed files with 6 additions and 5 deletions
  1. +2
    -2
      consensus/mempool_test.go
  2. +3
    -3
      proxy/app_conn_test.go
  3. +1
    -0
      types/protobuf.go

+ 2
- 2
consensus/mempool_test.go View File

@ -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) {


+ 3
- 3
proxy/app_conn_test.go View File

@ -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)
}


+ 1
- 0
types/protobuf.go View File

@ -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,
}
}


Loading…
Cancel
Save