mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-27 10:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

BeginBlock(hash, header)

Browse Source
This commit is contained in:
Ethan Buchman
2016-11-16 13:32:18 -05:00
parent 7901825ad9
commit ddb2b01631
10 changed files with 158 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/client.go
+2 -2
View File
@@ -33,11 +33,11 @@ type Client interface {
CommitSync() (res types.Result)
InitChainAsync(validators []*types.Validator) *ReqRes
BeginBlockAsync(header *types.Header) *ReqRes
BeginBlockAsync(hash []byte, header *types.Header) *ReqRes
EndBlockAsync(height uint64) *ReqRes
InitChainSync(validators []*types.Validator) (err error)
BeginBlockSync(header *types.Header) (err error)
BeginBlockSync(hash []byte, header *types.Header) (err error)
EndBlockSync(height uint64) (changedValidators []*types.Validator, err error)
}
client/grpc_client.go
+4 -4
View File
@@ -200,8 +200,8 @@ func (cli *grpcClient) InitChainAsync(validators []*types.Validator) *ReqRes {
return cli.finishAsyncCall(req, &types.Response{&types.Response_InitChain{res}})
}
func (cli *grpcClient) BeginBlockAsync(header *types.Header) *ReqRes {
req := types.ToRequestBeginBlock(header)
func (cli *grpcClient) BeginBlockAsync(hash []byte, header *types.Header) *ReqRes {
req := types.ToRequestBeginBlock(hash, header)
res, err := cli.client.BeginBlock(context.Background(), req.GetBeginBlock(), grpc.FailFast(true))
if err != nil {
cli.StopForError(err)
@@ -321,8 +321,8 @@ func (cli *grpcClient) InitChainSync(validators []*types.Validator) (err error)
return cli.Error()
}
func (cli *grpcClient) BeginBlockSync(header *types.Header) (err error) {
cli.BeginBlockAsync(header)
func (cli *grpcClient) BeginBlockSync(hash []byte, header *types.Header) (err error) {
cli.BeginBlockAsync(hash, header)
return cli.Error()
}
client/local_client.go
+5 -5
View File
@@ -122,14 +122,14 @@ func (app *localClient) InitChainAsync(validators []*types.Validator) *ReqRes {
return reqRes
}
func (app *localClient) BeginBlockAsync(header *types.Header) *ReqRes {
func (app *localClient) BeginBlockAsync(hash []byte, header *types.Header) *ReqRes {
app.mtx.Lock()
if bcApp, ok := app.Application.(types.BlockchainAware); ok {
bcApp.BeginBlock(header)
bcApp.BeginBlock(hash, header)
}
app.mtx.Unlock()
return app.callback(
types.ToRequestBeginBlock(header),
types.ToRequestBeginBlock(hash, header),
types.ToResponseBeginBlock(),
)
}
@@ -208,10 +208,10 @@ func (app *localClient) InitChainSync(validators []*types.Validator) (err error)
return nil
}
func (app *localClient) BeginBlockSync(header *types.Header) (err error) {
func (app *localClient) BeginBlockSync(hash []byte, header *types.Header) (err error) {
app.mtx.Lock()
if bcApp, ok := app.Application.(types.BlockchainAware); ok {
bcApp.BeginBlock(header)
bcApp.BeginBlock(hash, header)
}
app.mtx.Unlock()
return nil
client/socket_client.go
+4 -4
View File
@@ -263,8 +263,8 @@ func (cli *socketClient) InitChainAsync(validators []*types.Validator) *ReqRes {
return cli.queueRequest(types.ToRequestInitChain(validators))
}
func (cli *socketClient) BeginBlockAsync(header *types.Header) *ReqRes {
return cli.queueRequest(types.ToRequestBeginBlock(header))
func (cli *socketClient) BeginBlockAsync(hash []byte, header *types.Header) *ReqRes {
return cli.queueRequest(types.ToRequestBeginBlock(hash, header))
}
func (cli *socketClient) EndBlockAsync(height uint64) *ReqRes {
@@ -361,8 +361,8 @@ func (cli *socketClient) InitChainSync(validators []*types.Validator) (err error
return nil
}
func (cli *socketClient) BeginBlockSync(header *types.Header) (err error) {
cli.queueRequest(types.ToRequestBeginBlock(header))
func (cli *socketClient) BeginBlockSync(hash []byte, header *types.Header) (err error) {
cli.queueRequest(types.ToRequestBeginBlock(hash, header))
cli.FlushSync()
if err := cli.Error(); err != nil {
return err