mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-04 07:07:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cherry-picks

Browse Source
This commit is contained in:
Sergio Mena
2022-11-30 21:19:13 +01:00
parent b196a7d415
commit c91b578352
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abci/types/application.go
+3 -1
View File
@@ -103,7 +103,9 @@ func (BaseApplication) ExtendVote(_ context.Context, req *RequestExtendVote) (*R
}
func (BaseApplication) VerifyVoteExtension(_ context.Context, req *RequestVerifyVoteExtension) (*ResponseVerifyVoteExtension, error) {
return &ResponseVerifyVoteExtension{Result: OK}, nil
return &ResponseVerifyVoteExtension{
Status: ResponseVerifyVoteExtension_ACCEPT,
}, nil
}
func (BaseApplication) FinalizeBlock(_ context.Context, req *RequestFinalizeBlock) (*ResponseFinalizeBlock, error) {
proxy/app_conn.go
+10 -8
View File
@@ -89,6 +89,16 @@ func (app *appConnConsensus) ProcessProposal(ctx context.Context, req *types.Req
return app.appConn.ProcessProposal(ctx, req)
}
func (app *appConnConsensus) ExtendVote(ctx context.Context, req *types.RequestExtendVote) (*types.ResponseExtendVote, error) {
defer addTimeSample(app.metrics.MethodTimingSeconds.With("method", "deliver_tx", "type", "async"))()
return app.appConn.ExtendVote(ctx, req)
}
func (app *appConnConsensus) VerifyVoteExtension(ctx context.Context, req *types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) {
defer addTimeSample(app.metrics.MethodTimingSeconds.With("method", "deliver_tx", "type", "async"))()
return app.appConn.VerifyVoteExtension(ctx, req)
}
func (app *appConnConsensus) FinalizeBlock(ctx context.Context, req *types.RequestFinalizeBlock) (*types.ResponseFinalizeBlock, error) {
defer addTimeSample(app.metrics.MethodTimingSeconds.With("method", "deliver_tx", "type", "async"))()
return app.appConn.FinalizeBlock(ctx, req)
@@ -99,14 +109,6 @@ func (app *appConnConsensus) Commit(ctx context.Context) (*types.ResponseCommit,
return app.appConn.Commit(ctx, &types.RequestCommit{})
}
func (app *appConnConsensus) ExtendVoteSync(req types.RequestExtendVote) (*types.ResponseExtendVote, error) {
return app.appConn.ExtendVoteSync(req)
}
func (app *appConnConsensus) VerifyVoteExtensionSync(req types.RequestVerifyVoteExtension) (*types.ResponseVerifyVoteExtension, error) {
return app.appConn.VerifyVoteExtensionSync(req)
}
//------------------------------------------------
// Implements AppConnMempool (subset of abcicli.Client)
state/execution.go
+2 -2
View File
@@ -300,7 +300,7 @@ func (blockExec *BlockExecutor) ExtendVote(vote *types.Vote) ([]byte, error) {
Height: vote.Height,
}
resp, err := blockExec.proxyApp.ExtendVoteSync(req)
resp, err := blockExec.proxyApp.ExtendVote(context.TODO(), &req)
if err != nil {
panic(fmt.Errorf("ExtendVote call failed: %w", err))
}
@@ -315,7 +315,7 @@ func (blockExec *BlockExecutor) VerifyVoteExtension(vote *types.Vote) error {
VoteExtension: vote.Extension,
}
resp, err := blockExec.proxyApp.VerifyVoteExtensionSync(req)
resp, err := blockExec.proxyApp.VerifyVoteExtension(context.TODO(), &req)
if err != nil {
panic(fmt.Errorf("VerifyVoteExtension call failed: %w", err))
}