mirror of
https://github.com/tendermint/tendermint.git
synced 2026-09-27 18:34:39 +00:00
This change set implements the most recent version of `FinalizeBlock`. # What does this change actually contain? * This change set is rather large but fear not! The majority of the files touched and changes are renaming `ResponseDeliverTx` to `ExecTxResult`. This should be a pretty inoffensive change since they're effectively the same type but with a different name. * The `execBlockOnProxyApp` was totally removed since it served as just a wrapper around the logic that is now mostly encapsulated within `FinalizeBlock` * The `updateState` helper function has been made a public method on `State`. It was being exposed as a shim through the testing infrastructure, so this seemed innocuous. * Tests already existed to ensure that the application received the `ByzantineValidators` and the `ValidatorUpdates`, but one was fixed up to ensure that `LastCommitInfo` was being sent across. * Tests were removed from the `psql` indexer that seemed to search for an event in the indexer that was not being created. # Questions for reviewers * We store this [ABCIResponses](https://github.com/tendermint/tendermint/blob/5721a13ab1f4479f9807f449f0bf5c536b9a05f2/proto/tendermint/state/types.pb.go#L37) type in the data base as the block results. This type has changed since v0.35 to contain the `FinalizeBlock` response. I'm wondering if we need to do any shimming to keep the old data retrieveable? * Similarly, this change is exposed via the RPC through [ResultBlockResults](https://github.com/tendermint/tendermint/blob/5721a13ab1f4479f9807f449f0bf5c536b9a05f2/rpc/coretypes/responses.go#L69) changing. Should we somehow shim or notify for this change? closes: #7658
137 lines
3.3 KiB
Go
137 lines
3.3 KiB
Go
package kv_test
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
dbm "github.com/tendermint/tm-db"
|
|
|
|
abci "github.com/tendermint/tendermint/abci/types"
|
|
"github.com/tendermint/tendermint/internal/pubsub/query"
|
|
blockidxkv "github.com/tendermint/tendermint/internal/state/indexer/block/kv"
|
|
"github.com/tendermint/tendermint/types"
|
|
)
|
|
|
|
func TestBlockIndexer(t *testing.T) {
|
|
store := dbm.NewPrefixDB(dbm.NewMemDB(), []byte("block_events"))
|
|
indexer := blockidxkv.New(store)
|
|
|
|
require.NoError(t, indexer.Index(types.EventDataNewBlockHeader{
|
|
Header: types.Header{Height: 1},
|
|
ResultFinalizeBlock: abci.ResponseFinalizeBlock{
|
|
Events: []abci.Event{
|
|
{
|
|
Type: "finalize_event1",
|
|
Attributes: []abci.EventAttribute{
|
|
{
|
|
Key: "proposer",
|
|
Value: "FCAA001",
|
|
Index: true,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Type: "finalize_event2",
|
|
Attributes: []abci.EventAttribute{
|
|
{
|
|
Key: "foo",
|
|
Value: "100",
|
|
Index: true,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}))
|
|
|
|
for i := 2; i < 12; i++ {
|
|
var index bool
|
|
if i%2 == 0 {
|
|
index = true
|
|
}
|
|
require.NoError(t, indexer.Index(types.EventDataNewBlockHeader{
|
|
Header: types.Header{Height: int64(i)},
|
|
ResultFinalizeBlock: abci.ResponseFinalizeBlock{
|
|
Events: []abci.Event{
|
|
{
|
|
Type: "finalize_event1",
|
|
Attributes: []abci.EventAttribute{
|
|
{
|
|
Key: "proposer",
|
|
Value: "FCAA001",
|
|
Index: true,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Type: "finalize_event2",
|
|
Attributes: []abci.EventAttribute{
|
|
{
|
|
Key: "foo",
|
|
Value: fmt.Sprintf("%d", i),
|
|
Index: index,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}))
|
|
}
|
|
|
|
testCases := map[string]struct {
|
|
q *query.Query
|
|
results []int64
|
|
}{
|
|
"block.height = 100": {
|
|
q: query.MustCompile(`block.height = 100`),
|
|
results: []int64{},
|
|
},
|
|
"block.height = 5": {
|
|
q: query.MustCompile(`block.height = 5`),
|
|
results: []int64{5},
|
|
},
|
|
"finalize_event.key1 = 'value1'": {
|
|
q: query.MustCompile(`finalize_event1.key1 = 'value1'`),
|
|
results: []int64{},
|
|
},
|
|
"finalize_event.proposer = 'FCAA001'": {
|
|
q: query.MustCompile(`finalize_event1.proposer = 'FCAA001'`),
|
|
results: []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
|
|
},
|
|
"finalize_event.foo <= 5": {
|
|
q: query.MustCompile(`finalize_event2.foo <= 5`),
|
|
results: []int64{2, 4},
|
|
},
|
|
"finalize_event.foo >= 100": {
|
|
q: query.MustCompile(`finalize_event2.foo >= 100`),
|
|
results: []int64{1},
|
|
},
|
|
"block.height > 2 AND finalize_event2.foo <= 8": {
|
|
q: query.MustCompile(`block.height > 2 AND finalize_event2.foo <= 8`),
|
|
results: []int64{4, 6, 8},
|
|
},
|
|
"finalize_event.proposer CONTAINS 'FFFFFFF'": {
|
|
q: query.MustCompile(`finalize_event1.proposer CONTAINS 'FFFFFFF'`),
|
|
results: []int64{},
|
|
},
|
|
"finalize_event.proposer CONTAINS 'FCAA001'": {
|
|
q: query.MustCompile(`finalize_event1.proposer CONTAINS 'FCAA001'`),
|
|
results: []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
|
|
},
|
|
}
|
|
|
|
for name, tc := range testCases {
|
|
tc := tc
|
|
t.Run(name, func(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
results, err := indexer.Search(ctx, tc.q)
|
|
require.NoError(t, err)
|
|
require.Equal(t, tc.results, results)
|
|
})
|
|
}
|
|
}
|