fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-14 13:51:21 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Ethan Buchman
2016-08-24 01:44:20 -04:00
parent a0e4253edc
commit f37f56d4f1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/mempool_test.go
View File

@ -122,8 +122,8 @@ func NewCounterApplication() *CounterApplication {
return &CounterApplication{} return &CounterApplication{}
} }
func (app *CounterApplication) Info() string { func (app *CounterApplication) Info() (string, *tmsp.TMSPInfo, *tmsp.LastBlockInfo, *tmsp.ConfigInfo) {
return Fmt("txs:%v", app.txCount) return Fmt("txs:%v", app.txCount), nil, nil, nil
} }
func (app *CounterApplication) SetOption(key string, value string) (log string) { func (app *CounterApplication) SetOption(key string, value string) (log string) {

6
proxy/app_conn_test.go
View File

@ -16,7 +16,7 @@ import (
type AppConnTest interface { type AppConnTest interface {
EchoAsync(string) *tmspcli.ReqRes EchoAsync(string) *tmspcli.ReqRes
FlushSync() error FlushSync() error
InfoSync() (res types.Result) InfoSync() (types.Result, *types.TMSPInfo, *types.LastBlockInfo, *types.ConfigInfo)
} }
type appConnTest struct { type appConnTest struct {
@ -35,7 +35,7 @@ func (app *appConnTest) FlushSync() error {
return app.appConn.FlushSync() 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() return app.appConn.InfoSync()
} }
@ -114,7 +114,7 @@ func TestInfo(t *testing.T) {
proxy := NewAppConnTest(cli) proxy := NewAppConnTest(cli)
t.Log("Connected") t.Log("Connected")
res := proxy.InfoSync() res, _, _, _ := proxy.InfoSync()
if res.IsErr() { if res.IsErr() {
t.Errorf("Unexpected error: %v", err) t.Errorf("Unexpected error: %v", err)
} }

1
types/protobuf.go
View File

@ -19,6 +19,7 @@ func (tm2pb) Header(header *Header) *types.Header {
LastBlockParts: TM2PB.PartSetHeader(header.LastBlockParts), LastBlockParts: TM2PB.PartSetHeader(header.LastBlockParts),
LastCommitHash: header.LastCommitHash, LastCommitHash: header.LastCommitHash,
DataHash: header.DataHash, DataHash: header.DataHash,
AppHash: header.AppHash,
} }
} }