mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-04-19 15:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ProcessProposalSync

Browse Source
This commit is contained in:
Sergio Mena
2022-07-24 17:58:22 +02:00
parent 0a0812cce9
commit b8ae6501e4
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
abci/client/local_client.go
View File

@@ -4,7 +4,6 @@ import (
types "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/service"
tmsync "github.com/tendermint/tendermint/libs/sync"
"golang.org/x/net/context"
)
var _ Client = (*localClient)(nil)
@@ -354,10 +353,7 @@ func (app *localClient) PrepareProposalSync(req types.RequestPrepareProposal) (*
return &res, nil
}
func (app *localClient) ProcessProposalSync(
ctx context.Context,
req types.RequestProcessProposal,
) (*types.ResponseProcessProposal, error) {
func (app *localClient) ProcessProposalSync(req types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
app.mtx.Lock()
defer app.mtx.Unlock()

14
abci/client/socket_client.go
View File

@@ -15,7 +15,6 @@ import (
"github.com/tendermint/tendermint/libs/service"
tmsync "github.com/tendermint/tendermint/libs/sync"
"github.com/tendermint/tendermint/libs/timer"
"golang.org/x/net/context"
)
const (
@@ -435,16 +434,13 @@ func (cli *socketClient) PrepareProposalSync(req types.RequestPrepareProposal) (
return reqres.Response.GetPrepareProposal(), cli.Error()
}
func (cli *socketClient) ProcessProposalSync(
ctx context.Context,
req types.RequestProcessProposal,
) (*types.ResponseProcessProposal, error) {
reqres, err := cli.queueRequestAndFlushSync(ctx, types.ToRequestProcessProposal(req))
if err != nil {
func (cli *socketClient) ProcessProposalSync(req types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
reqres := cli.queueRequest(types.ToRequestProcessProposal(req))
if err := cli.FlushSync(); err != nil {
return nil, err
}
return reqres.Response.GetProcessProposal(), nil
return reqres.Response.GetProcessProposal(), cli.Error()
}
//----------------------------------------

3
state/execution.go
View File

@@ -141,13 +141,12 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
func (blockExec *BlockExecutor) ProcessProposal(
block *types.Block,
) (bool, error) {
ctx := context.Background()
req := abci.RequestProcessProposal{
Txs: block.Data.Txs.ToSliceOfBytes(),
Header: *block.Header.ToProto(),
}
resp, err := blockExec.proxyApp.ProcessProposalSync(ctx, req)
resp, err := blockExec.proxyApp.ProcessProposalSync(req)
if err != nil {
return false, ErrInvalidBlock(err)
}