From a9ff8da368cef2ed92c71cf7c379d9ac47b62522 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 16 Nov 2022 14:59:46 +0100 Subject: [PATCH] use misbehavior instead of misbehaviors to avoid breaking the api --- abci/client/unsync_local_client.go | 1 - abci/example/kvstore/kvstore.go | 2 +- abci/types/types.pb.go | 438 ++++++++++++++--------------- proto/tendermint/abci/types.proto | 6 +- state/execution.go | 6 +- state/execution_test.go | 38 +-- state/helpers_test.go | 2 +- 7 files changed, 246 insertions(+), 247 deletions(-) diff --git a/abci/client/unsync_local_client.go b/abci/client/unsync_local_client.go index 782eb8f8f..0d0cb0ab8 100644 --- a/abci/client/unsync_local_client.go +++ b/abci/client/unsync_local_client.go @@ -40,4 +40,3 @@ func (app *unsyncLocalClient) Flush(_ context.Context) error { func (app *unsyncLocalClient) Echo(ctx context.Context, msg string) (*types.ResponseEcho, error) { return &types.ResponseEcho{Message: msg}, nil } - diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index eb9a466f5..5b79f0925 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -196,7 +196,7 @@ func (app *Application) FinalizeBlock(_ context.Context, req *types.RequestFinal app.stagedTxs = make([][]byte, 0) // Punish validators who committed equivocation. - for _, ev := range req.Misbehaviors { + for _, ev := range req.Misbehavior { if ev.Type == types.MisbehaviorType_DUPLICATE_VOTE { addr := string(ev.Validator.Address) if pubKey, ok := app.valAddrToPubKeyMap[addr]; ok { diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index c64c2d271..6bf451e76 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1037,7 +1037,7 @@ type RequestPrepareProposal struct { // sent to the app for possible modifications. Txs [][]byte `protobuf:"bytes,2,rep,name=txs,proto3" json:"txs,omitempty"` LocalLastCommit ExtendedCommitInfo `protobuf:"bytes,3,opt,name=local_last_commit,json=localLastCommit,proto3" json:"local_last_commit"` - Misbehaviors []Misbehavior `protobuf:"bytes,4,rep,name=misbehaviors,proto3" json:"misbehaviors"` + Misbehavior []Misbehavior `protobuf:"bytes,4,rep,name=misbehavior,proto3" json:"misbehavior"` Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"` Time time.Time `protobuf:"bytes,6,opt,name=time,proto3,stdtime" json:"time"` NextValidatorsHash []byte `protobuf:"bytes,7,opt,name=next_validators_hash,json=nextValidatorsHash,proto3" json:"next_validators_hash,omitempty"` @@ -1099,9 +1099,9 @@ func (m *RequestPrepareProposal) GetLocalLastCommit() ExtendedCommitInfo { return ExtendedCommitInfo{} } -func (m *RequestPrepareProposal) GetMisbehaviors() []Misbehavior { +func (m *RequestPrepareProposal) GetMisbehavior() []Misbehavior { if m != nil { - return m.Misbehaviors + return m.Misbehavior } return nil } @@ -1137,7 +1137,7 @@ func (m *RequestPrepareProposal) GetProposerAddress() []byte { type RequestProcessProposal struct { Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` ProposedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=proposed_last_commit,json=proposedLastCommit,proto3" json:"proposed_last_commit"` - Misbehaviors []Misbehavior `protobuf:"bytes,3,rep,name=misbehaviors,proto3" json:"misbehaviors"` + Misbehavior []Misbehavior `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"` // hash is the merkle root hash of the fields of the proposed block. Hash []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"` Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"` @@ -1194,9 +1194,9 @@ func (m *RequestProcessProposal) GetProposedLastCommit() CommitInfo { return CommitInfo{} } -func (m *RequestProcessProposal) GetMisbehaviors() []Misbehavior { +func (m *RequestProcessProposal) GetMisbehavior() []Misbehavior { if m != nil { - return m.Misbehaviors + return m.Misbehavior } return nil } @@ -1239,7 +1239,7 @@ func (m *RequestProcessProposal) GetProposerAddress() []byte { type RequestFinalizeBlock struct { Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` DecidedLastCommit CommitInfo `protobuf:"bytes,2,opt,name=decided_last_commit,json=decidedLastCommit,proto3" json:"decided_last_commit"` - Misbehaviors []Misbehavior `protobuf:"bytes,3,rep,name=misbehaviors,proto3" json:"misbehaviors"` + Misbehavior []Misbehavior `protobuf:"bytes,3,rep,name=misbehavior,proto3" json:"misbehavior"` // hash is the merkle root hash of the fields of the decided block. Hash []byte `protobuf:"bytes,4,opt,name=hash,proto3" json:"hash,omitempty"` Height int64 `protobuf:"varint,5,opt,name=height,proto3" json:"height,omitempty"` @@ -1296,9 +1296,9 @@ func (m *RequestFinalizeBlock) GetDecidedLastCommit() CommitInfo { return CommitInfo{} } -func (m *RequestFinalizeBlock) GetMisbehaviors() []Misbehavior { +func (m *RequestFinalizeBlock) GetMisbehavior() []Misbehavior { if m != nil { - return m.Misbehaviors + return m.Misbehavior } return nil } @@ -3325,192 +3325,192 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2945 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4b, 0x6f, 0x23, 0xc7, - 0xf1, 0xe7, 0xf0, 0xcd, 0xe2, 0x6b, 0xd4, 0x2b, 0xaf, 0xb9, 0xf4, 0xae, 0x24, 0x8f, 0x61, 0x7b, - 0xbd, 0xb6, 0x25, 0xff, 0xe5, 0xff, 0xfa, 0x01, 0xdb, 0x01, 0x28, 0x9a, 0x1b, 0x4a, 0x2b, 0x4b, - 0xf2, 0x88, 0x5a, 0xc3, 0x79, 0x78, 0xdc, 0x22, 0x5b, 0xe4, 0x78, 0x49, 0xce, 0x78, 0xa6, 0x29, - 0x53, 0x3e, 0x26, 0x48, 0x0e, 0x3e, 0xf9, 0x12, 0x20, 0x08, 0xe0, 0x43, 0x0e, 0xf9, 0x0e, 0x39, - 0xe5, 0x94, 0x83, 0x0f, 0x39, 0xf8, 0x90, 0x43, 0x0e, 0x81, 0x13, 0xd8, 0x97, 0x20, 0x5f, 0xc0, - 0xb7, 0x20, 0xe8, 0xc7, 0x0c, 0x67, 0x48, 0x8e, 0x48, 0x39, 0x86, 0x81, 0x00, 0xb9, 0x4d, 0xd7, - 0x54, 0x55, 0xf7, 0x54, 0x57, 0x57, 0xd5, 0xaf, 0xa6, 0xe1, 0x31, 0x4a, 0x86, 0x1d, 0xe2, 0x0c, - 0xcc, 0x21, 0xdd, 0xc2, 0xa7, 0x6d, 0x73, 0x8b, 0x5e, 0xd8, 0xc4, 0xdd, 0xb4, 0x1d, 0x8b, 0x5a, - 0xa8, 0x3c, 0x79, 0xb9, 0xc9, 0x5e, 0x56, 0x6f, 0x05, 0xb8, 0xdb, 0xce, 0x85, 0x4d, 0xad, 0x2d, - 0xdb, 0xb1, 0xac, 0x33, 0xc1, 0x5f, 0xbd, 0x39, 0xfb, 0xfa, 0x21, 0xb9, 0x90, 0xda, 0x42, 0xc2, - 0x7c, 0x96, 0x2d, 0x1b, 0x3b, 0x78, 0xe0, 0xbd, 0x5e, 0xef, 0x5a, 0x56, 0xb7, 0x4f, 0xb6, 0xf8, - 0xe8, 0x74, 0x74, 0xb6, 0x45, 0xcd, 0x01, 0x71, 0x29, 0x1e, 0xd8, 0x92, 0x61, 0xb5, 0x6b, 0x75, - 0x2d, 0xfe, 0xb8, 0xc5, 0x9e, 0x04, 0x55, 0xfb, 0x55, 0x16, 0x32, 0x3a, 0xf9, 0x70, 0x44, 0x5c, - 0x8a, 0xb6, 0x21, 0x49, 0xda, 0x3d, 0xab, 0xa2, 0x6c, 0x28, 0xb7, 0xf3, 0xdb, 0x37, 0x37, 0xa7, - 0x96, 0xbf, 0x29, 0xf9, 0x1a, 0xed, 0x9e, 0xd5, 0x8c, 0xe9, 0x9c, 0x17, 0xdd, 0x85, 0xd4, 0x59, - 0x7f, 0xe4, 0xf6, 0x2a, 0x71, 0x2e, 0x74, 0x2b, 0x4a, 0xe8, 0x1e, 0x63, 0x6a, 0xc6, 0x74, 0xc1, - 0xcd, 0xa6, 0x32, 0x87, 0x67, 0x56, 0x25, 0x71, 0xf9, 0x54, 0xbb, 0xc3, 0x33, 0x3e, 0x15, 0xe3, - 0x45, 0x3b, 0x00, 0xe6, 0xd0, 0xa4, 0x46, 0xbb, 0x87, 0xcd, 0x61, 0x25, 0xc5, 0x25, 0x1f, 0x8f, - 0x96, 0x34, 0x69, 0x9d, 0x31, 0x36, 0x63, 0x7a, 0xce, 0xf4, 0x06, 0x6c, 0xb9, 0x1f, 0x8e, 0x88, - 0x73, 0x51, 0x49, 0x5f, 0xbe, 0xdc, 0xb7, 0x19, 0x13, 0x5b, 0x2e, 0xe7, 0x46, 0xaf, 0x43, 0xb6, - 0xdd, 0x23, 0xed, 0x87, 0x06, 0x1d, 0x57, 0xb2, 0x5c, 0x72, 0x3d, 0x4a, 0xb2, 0xce, 0xf8, 0x5a, - 0xe3, 0x66, 0x4c, 0xcf, 0xb4, 0xc5, 0x23, 0x7a, 0x05, 0xd2, 0x6d, 0x6b, 0x30, 0x30, 0x69, 0x25, - 0xcf, 0x65, 0xd7, 0x22, 0x65, 0x39, 0x57, 0x33, 0xa6, 0x4b, 0x7e, 0x74, 0x00, 0xa5, 0xbe, 0xe9, - 0x52, 0xc3, 0x1d, 0x62, 0xdb, 0xed, 0x59, 0xd4, 0xad, 0x14, 0xb8, 0x86, 0x27, 0xa3, 0x34, 0xec, - 0x9b, 0x2e, 0x3d, 0xf6, 0x98, 0x9b, 0x31, 0xbd, 0xd8, 0x0f, 0x12, 0x98, 0x3e, 0xeb, 0xec, 0x8c, - 0x38, 0xbe, 0xc2, 0x4a, 0xf1, 0x72, 0x7d, 0x87, 0x8c, 0xdb, 0x93, 0x67, 0xfa, 0xac, 0x20, 0x01, - 0xfd, 0x18, 0xae, 0xf5, 0x2d, 0xdc, 0xf1, 0xd5, 0x19, 0xed, 0xde, 0x68, 0xf8, 0xb0, 0x52, 0xe2, - 0x4a, 0x9f, 0x89, 0x5c, 0xa4, 0x85, 0x3b, 0x9e, 0x8a, 0x3a, 0x13, 0x68, 0xc6, 0xf4, 0x95, 0xfe, - 0x34, 0x11, 0xbd, 0x07, 0xab, 0xd8, 0xb6, 0xfb, 0x17, 0xd3, 0xda, 0xcb, 0x5c, 0xfb, 0x9d, 0x28, - 0xed, 0x35, 0x26, 0x33, 0xad, 0x1e, 0xe1, 0x19, 0x2a, 0x6a, 0x81, 0x6a, 0x3b, 0xc4, 0xc6, 0x0e, - 0x31, 0x6c, 0xc7, 0xb2, 0x2d, 0x17, 0xf7, 0x2b, 0x2a, 0xd7, 0xfd, 0x74, 0x94, 0xee, 0x23, 0xc1, - 0x7f, 0x24, 0xd9, 0x9b, 0x31, 0xbd, 0x6c, 0x87, 0x49, 0x42, 0xab, 0xd5, 0x26, 0xae, 0x3b, 0xd1, - 0xba, 0xb2, 0x48, 0x2b, 0xe7, 0x0f, 0x6b, 0x0d, 0x91, 0xd8, 0xc6, 0x9d, 0x99, 0x43, 0xdc, 0x37, - 0x3f, 0x26, 0xc6, 0x69, 0xdf, 0x6a, 0x3f, 0xac, 0xac, 0x5e, 0xbe, 0x71, 0xf7, 0x24, 0xf7, 0x0e, - 0x63, 0x66, 0x1b, 0x77, 0x16, 0x24, 0xec, 0x64, 0x20, 0x75, 0x8e, 0xfb, 0x23, 0xb2, 0x97, 0xcc, - 0x26, 0xd5, 0xd4, 0x5e, 0x32, 0x9b, 0x51, 0xb3, 0x7b, 0xc9, 0x6c, 0x4e, 0x85, 0xbd, 0x64, 0x16, - 0xd4, 0xbc, 0xf6, 0x34, 0xe4, 0x03, 0xc7, 0x1d, 0x55, 0x20, 0x33, 0x20, 0xae, 0x8b, 0xbb, 0x84, - 0x47, 0x87, 0x9c, 0xee, 0x0d, 0xb5, 0x12, 0x14, 0x82, 0x47, 0x5c, 0xfb, 0x54, 0xf1, 0x25, 0xd9, - 0xe9, 0x65, 0x92, 0xe7, 0xc4, 0x71, 0x4d, 0x6b, 0xe8, 0x49, 0xca, 0x21, 0x7a, 0x02, 0x8a, 0xfc, - 0x53, 0x0c, 0xef, 0x3d, 0x0b, 0x21, 0x49, 0xbd, 0xc0, 0x89, 0x0f, 0x24, 0xd3, 0x3a, 0xe4, 0xed, - 0x6d, 0xdb, 0x67, 0x49, 0x70, 0x16, 0xb0, 0xb7, 0x6d, 0x8f, 0xe1, 0x71, 0x28, 0xb0, 0xef, 0xf6, - 0x39, 0x92, 0x7c, 0x92, 0x3c, 0xa3, 0x49, 0x16, 0xed, 0x4f, 0x71, 0x50, 0xa7, 0xc3, 0x02, 0x7a, - 0x05, 0x92, 0x2c, 0x42, 0xca, 0x60, 0x57, 0xdd, 0x14, 0xe1, 0x73, 0xd3, 0x0b, 0x9f, 0x9b, 0x2d, - 0x2f, 0x7c, 0xee, 0x64, 0x3f, 0xff, 0x72, 0x3d, 0xf6, 0xe9, 0xdf, 0xd6, 0x15, 0x9d, 0x4b, 0xa0, - 0x1b, 0x2c, 0x18, 0x60, 0x73, 0x68, 0x98, 0x1d, 0xbe, 0xe4, 0x1c, 0x3b, 0xe9, 0xd8, 0x1c, 0xee, - 0x76, 0xd0, 0x3e, 0xa8, 0x6d, 0x6b, 0xe8, 0x92, 0xa1, 0x3b, 0x72, 0x0d, 0x11, 0x9e, 0x65, 0x88, - 0x0b, 0x05, 0x2a, 0x91, 0x24, 0xea, 0x1e, 0xe7, 0x11, 0x67, 0xd4, 0xcb, 0xed, 0x30, 0x01, 0xdd, - 0x03, 0x38, 0xc7, 0x7d, 0xb3, 0x83, 0xa9, 0xe5, 0xb8, 0x95, 0xe4, 0x46, 0xe2, 0x76, 0x7e, 0x7b, - 0x63, 0x66, 0xc3, 0x1f, 0x78, 0x2c, 0x27, 0x76, 0x07, 0x53, 0xb2, 0x93, 0x64, 0xcb, 0xd5, 0x03, - 0x92, 0xe8, 0x29, 0x28, 0x63, 0xdb, 0x36, 0x5c, 0x8a, 0x29, 0x31, 0x4e, 0x2f, 0x28, 0x71, 0x79, - 0xf4, 0x2c, 0xe8, 0x45, 0x6c, 0xdb, 0xc7, 0x8c, 0xba, 0xc3, 0x88, 0xe8, 0x49, 0x28, 0xb1, 0x48, - 0x69, 0xe2, 0xbe, 0xd1, 0x23, 0x66, 0xb7, 0x47, 0x79, 0x94, 0x4c, 0xe8, 0x45, 0x49, 0x6d, 0x72, - 0xa2, 0xd6, 0xf1, 0x77, 0x9c, 0x47, 0x49, 0x84, 0x20, 0xd9, 0xc1, 0x14, 0x73, 0x4b, 0x16, 0x74, - 0xfe, 0xcc, 0x68, 0x36, 0xa6, 0x3d, 0x69, 0x1f, 0xfe, 0x8c, 0xae, 0x43, 0x5a, 0xaa, 0x4d, 0x70, - 0xb5, 0x72, 0x84, 0x56, 0x21, 0x65, 0x3b, 0xd6, 0x39, 0xe1, 0x5b, 0x97, 0xd5, 0xc5, 0x40, 0xd3, - 0xa1, 0x14, 0x8e, 0xa8, 0xa8, 0x04, 0x71, 0x3a, 0x96, 0xb3, 0xc4, 0xe9, 0x18, 0xbd, 0x00, 0x49, - 0x66, 0x48, 0x3e, 0x47, 0x69, 0x4e, 0x0e, 0x91, 0x72, 0xad, 0x0b, 0x9b, 0xe8, 0x9c, 0x53, 0x2b, - 0x43, 0x31, 0x14, 0x69, 0xb5, 0xeb, 0xb0, 0x3a, 0x2f, 0x70, 0x6a, 0x3d, 0x9f, 0x1e, 0x0a, 0x80, - 0xe8, 0x2e, 0x64, 0xfd, 0xc8, 0x29, 0x1c, 0xe7, 0xc6, 0xcc, 0xb4, 0x1e, 0xb3, 0xee, 0xb3, 0x32, - 0x8f, 0x61, 0x1b, 0xd0, 0xc3, 0x32, 0x4f, 0x16, 0xf4, 0x0c, 0xb6, 0xed, 0x26, 0x76, 0x7b, 0xda, - 0xfb, 0x50, 0x89, 0x8a, 0x8a, 0x01, 0x83, 0x29, 0xdc, 0xed, 0x3d, 0x83, 0x5d, 0x87, 0xf4, 0x99, - 0xe5, 0x0c, 0x30, 0xe5, 0xca, 0x8a, 0xba, 0x1c, 0x31, 0x43, 0x8a, 0x08, 0x99, 0xe0, 0x64, 0x31, - 0xd0, 0x0c, 0xb8, 0x11, 0x19, 0x19, 0x99, 0x88, 0x39, 0xec, 0x10, 0x61, 0xd6, 0xa2, 0x2e, 0x06, - 0x13, 0x45, 0x62, 0xb1, 0x62, 0xc0, 0xa6, 0x75, 0xf9, 0xb7, 0x72, 0xfd, 0x39, 0x5d, 0x8e, 0xb4, - 0xdf, 0x24, 0xe0, 0xfa, 0xfc, 0xf8, 0x88, 0x36, 0xa0, 0x30, 0xc0, 0x63, 0x83, 0x8e, 0xa5, 0xdb, - 0x29, 0x7c, 0xe3, 0x61, 0x80, 0xc7, 0xad, 0xb1, 0xf0, 0x39, 0x15, 0x12, 0x74, 0xec, 0x56, 0xe2, - 0x1b, 0x89, 0xdb, 0x05, 0x9d, 0x3d, 0xa2, 0x13, 0x58, 0xe9, 0x5b, 0x6d, 0xdc, 0x37, 0xfa, 0xd8, - 0xa5, 0x86, 0x4c, 0x9c, 0xe2, 0x10, 0x3d, 0x31, 0x63, 0xec, 0xc6, 0x98, 0x53, 0x3a, 0x62, 0x3f, - 0x59, 0xc0, 0x91, 0xfe, 0x5f, 0xe6, 0x3a, 0xf6, 0xb1, 0xb7, 0xd5, 0xe8, 0x1e, 0x14, 0x06, 0xa6, - 0x7b, 0x4a, 0x7a, 0xf8, 0xdc, 0x9c, 0x1c, 0xa7, 0x59, 0xaf, 0x79, 0x6b, 0xc2, 0x24, 0x55, 0x85, - 0xe4, 0x02, 0x9b, 0x92, 0x0a, 0x79, 0xb1, 0x17, 0x4f, 0xd2, 0x57, 0x8e, 0x27, 0x2f, 0xc0, 0xea, - 0x90, 0x8c, 0xa9, 0x31, 0x39, 0xb1, 0xc2, 0x53, 0x32, 0xdc, 0xf8, 0x88, 0xbd, 0xf3, 0xcf, 0xb8, - 0xcb, 0x9c, 0x06, 0x3d, 0xc3, 0x73, 0x8c, 0x6d, 0xb9, 0xc4, 0x31, 0x70, 0xa7, 0xe3, 0x10, 0xd7, - 0xe5, 0x65, 0x49, 0x81, 0x27, 0x0e, 0x4e, 0xaf, 0x09, 0xb2, 0xf6, 0x49, 0x70, 0x73, 0xc2, 0x39, - 0x45, 0x9a, 0x5e, 0x99, 0x98, 0xfe, 0x18, 0x56, 0xa5, 0x7c, 0x27, 0x64, 0x7d, 0x51, 0xdb, 0x3d, - 0x36, 0x7b, 0xc2, 0xa6, 0xad, 0x8e, 0x3c, 0xf1, 0x4b, 0x0c, 0x9f, 0xf8, 0x96, 0x86, 0x47, 0x90, - 0xe4, 0x66, 0x49, 0x8a, 0x30, 0xc3, 0x9e, 0xff, 0xdb, 0x36, 0xe3, 0x97, 0x09, 0x3f, 0xae, 0x84, - 0xf2, 0xf3, 0x9c, 0xad, 0x78, 0x1b, 0xae, 0x75, 0x48, 0xdb, 0xec, 0x7c, 0xdb, 0x9d, 0x58, 0x91, - 0xd2, 0xff, 0xdb, 0x88, 0x79, 0x1b, 0xf1, 0x8f, 0x2c, 0x64, 0x75, 0xe2, 0xda, 0x2c, 0xe1, 0xa2, - 0x1d, 0xc8, 0x91, 0x71, 0x9b, 0xd8, 0xd4, 0xab, 0x51, 0xf2, 0xdb, 0xda, 0x9c, 0xb2, 0x4a, 0x70, - 0x37, 0x3c, 0x4e, 0x86, 0x2b, 0x7c, 0x31, 0xf4, 0xa2, 0x84, 0x4e, 0xd1, 0x28, 0x48, 0x8a, 0x07, - 0xb1, 0xd3, 0x4b, 0x1e, 0x76, 0x4a, 0x44, 0xc2, 0x02, 0x21, 0x35, 0x05, 0x9e, 0x5e, 0x94, 0xe0, - 0x29, 0xb9, 0x60, 0xb2, 0x10, 0x7a, 0xaa, 0x87, 0xd0, 0x53, 0x7a, 0xc1, 0x67, 0x46, 0xc0, 0xa7, - 0x97, 0x3c, 0xf8, 0x94, 0x59, 0xb0, 0xe2, 0x29, 0xfc, 0xf4, 0x46, 0x00, 0x3f, 0xe5, 0xb8, 0xe8, - 0x46, 0xa4, 0xe8, 0x1c, 0x00, 0xf5, 0xaa, 0x0f, 0xa0, 0x0a, 0x91, 0xe0, 0x4b, 0x0a, 0x4f, 0x23, - 0xa8, 0xc3, 0x19, 0x04, 0x25, 0x10, 0xcf, 0x53, 0x91, 0x2a, 0x16, 0x40, 0xa8, 0xc3, 0x19, 0x08, - 0x55, 0x5a, 0xa0, 0x70, 0x01, 0x86, 0xfa, 0xc9, 0x7c, 0x0c, 0x15, 0x8d, 0x72, 0xe4, 0x32, 0x97, - 0x03, 0x51, 0x46, 0x04, 0x88, 0x12, 0x40, 0xe7, 0xd9, 0x48, 0xf5, 0x4b, 0xa3, 0xa8, 0x93, 0x39, - 0x28, 0x4a, 0xe0, 0x9d, 0xdb, 0x91, 0xca, 0x97, 0x80, 0x51, 0x27, 0x73, 0x60, 0x14, 0x5a, 0xa8, - 0x76, 0x21, 0x8e, 0x3a, 0x9c, 0xc1, 0x51, 0x8f, 0x2c, 0xd8, 0xbd, 0xe5, 0x81, 0x54, 0x4a, 0x4d, - 0xef, 0x25, 0xb3, 0x59, 0x35, 0x27, 0x20, 0xd4, 0x5e, 0x32, 0x9b, 0x57, 0x0b, 0xda, 0x33, 0xb0, - 0x32, 0x13, 0x3b, 0x58, 0x81, 0x45, 0x1c, 0xc7, 0x72, 0x24, 0x24, 0x12, 0x03, 0xed, 0x36, 0x2b, - 0xac, 0x27, 0x71, 0xe2, 0x12, 0xd0, 0xc5, 0x0b, 0xd9, 0x40, 0x6c, 0xd0, 0x7e, 0xaf, 0x4c, 0x64, - 0x39, 0xec, 0x0a, 0x16, 0xe5, 0x39, 0x59, 0x94, 0x07, 0xa0, 0x58, 0x3c, 0x0c, 0xc5, 0xd6, 0x21, - 0xcf, 0x0a, 0xd4, 0x29, 0x94, 0x85, 0x6d, 0x1f, 0x65, 0xdd, 0x81, 0x15, 0x9e, 0x86, 0x04, 0x60, - 0x93, 0xa1, 0x3e, 0xc9, 0x43, 0x7d, 0x99, 0xbd, 0x10, 0xd6, 0x11, 0x31, 0xff, 0x79, 0xb8, 0x16, - 0xe0, 0xf5, 0x0b, 0x5f, 0x01, 0x39, 0x54, 0x9f, 0xbb, 0x26, 0x2b, 0xe0, 0x3f, 0x2a, 0x13, 0x0b, - 0x4d, 0xe0, 0xd9, 0x3c, 0x24, 0xa5, 0x7c, 0x47, 0x48, 0x2a, 0xfe, 0xad, 0x91, 0x54, 0xb0, 0x90, - 0x4f, 0x84, 0x0b, 0xf9, 0x6f, 0x94, 0xc9, 0x9e, 0xf8, 0xb8, 0xa8, 0x6d, 0x75, 0x88, 0x2c, 0xad, - 0xf9, 0x33, 0x4b, 0xf4, 0x7d, 0xab, 0x2b, 0x0b, 0x68, 0xf6, 0xc8, 0xb8, 0xfc, 0x60, 0x9e, 0x93, - 0xb1, 0xda, 0xaf, 0xca, 0x45, 0x32, 0x95, 0x55, 0xb9, 0x0a, 0x89, 0x87, 0x44, 0x74, 0xae, 0x0a, - 0x3a, 0x7b, 0x64, 0x7c, 0xdc, 0xf9, 0x64, 0x52, 0x14, 0x03, 0xf4, 0x0a, 0xe4, 0x78, 0x57, 0xd1, - 0xb0, 0x6c, 0x57, 0x76, 0xab, 0x42, 0x05, 0x83, 0x68, 0x2d, 0x6e, 0x1e, 0x31, 0x9e, 0x43, 0xdb, - 0xd5, 0xb3, 0xb6, 0x7c, 0x0a, 0x64, 0xf1, 0x5c, 0x28, 0x8b, 0xdf, 0x84, 0x1c, 0x5b, 0xbd, 0x6b, - 0xe3, 0x36, 0xa9, 0x00, 0x5f, 0xe8, 0x84, 0xa0, 0xfd, 0x35, 0x0e, 0xe5, 0xa9, 0xe0, 0x3d, 0xf7, - 0xdb, 0x3d, 0x97, 0x8c, 0x07, 0x70, 0xe2, 0x72, 0xf6, 0x58, 0x03, 0xe8, 0x62, 0xd7, 0xf8, 0x08, - 0x0f, 0x29, 0xe9, 0x48, 0xa3, 0x04, 0x28, 0xa8, 0x0a, 0x59, 0x36, 0x1a, 0xb9, 0xa4, 0x23, 0x21, - 0xab, 0x3f, 0x46, 0x4d, 0x48, 0x93, 0x73, 0x32, 0xa4, 0x6e, 0x25, 0xc3, 0xb7, 0xfd, 0xfa, 0x2c, - 0x86, 0x60, 0xaf, 0x77, 0x2a, 0x6c, 0xb3, 0xff, 0xf9, 0xe5, 0xba, 0x2a, 0xb8, 0x9f, 0xb3, 0x06, - 0x26, 0x25, 0x03, 0x9b, 0x5e, 0xe8, 0x52, 0x3e, 0x6c, 0x85, 0xec, 0x94, 0x15, 0x02, 0xe8, 0x28, - 0x17, 0x44, 0x47, 0x6c, 0x6d, 0xb6, 0x63, 0x5a, 0x8e, 0x49, 0x2f, 0xb8, 0xe9, 0x12, 0xba, 0x3f, - 0x46, 0x4f, 0x40, 0x71, 0x40, 0x06, 0xb6, 0x65, 0xf5, 0x0d, 0x11, 0x0e, 0xf2, 0x5c, 0xb4, 0x20, - 0x89, 0x0d, 0x1e, 0x15, 0x6a, 0x0c, 0x08, 0x07, 0xb3, 0x1b, 0x13, 0x73, 0x08, 0xc5, 0xe6, 0xd0, - 0x08, 0xe1, 0xe9, 0x82, 0x20, 0x8a, 0x53, 0xb8, 0x97, 0xcc, 0x2a, 0x6a, 0x7c, 0x2f, 0x99, 0x8d, - 0xab, 0x09, 0xed, 0x08, 0x1e, 0x99, 0x9b, 0xdd, 0xd0, 0xcb, 0x90, 0x9b, 0x24, 0x46, 0x85, 0xdb, - 0xe7, 0x12, 0x40, 0x3b, 0xe1, 0xd5, 0xfe, 0xa0, 0x4c, 0x54, 0x86, 0x21, 0x72, 0x03, 0xd2, 0x0e, - 0x71, 0x47, 0x7d, 0x01, 0x5a, 0x4b, 0xdb, 0xcf, 0x2f, 0x97, 0x17, 0x19, 0x75, 0xd4, 0xa7, 0xba, - 0x14, 0xd6, 0xde, 0x83, 0xb4, 0xa0, 0xa0, 0x3c, 0x64, 0x4e, 0x0e, 0xee, 0x1f, 0x1c, 0xbe, 0x73, - 0xa0, 0xc6, 0x10, 0x40, 0xba, 0x56, 0xaf, 0x37, 0x8e, 0x5a, 0xaa, 0x82, 0x72, 0x90, 0xaa, 0xed, - 0x1c, 0xea, 0x2d, 0x35, 0xce, 0xc8, 0x7a, 0x63, 0xaf, 0x51, 0x6f, 0xa9, 0x09, 0xb4, 0x02, 0x45, - 0xf1, 0x6c, 0xdc, 0x3b, 0xd4, 0xdf, 0xaa, 0xb5, 0xd4, 0x64, 0x80, 0x74, 0xdc, 0x38, 0x78, 0xb3, - 0xa1, 0xab, 0x29, 0xed, 0xff, 0x18, 0x2a, 0x8e, 0xc8, 0xa4, 0x13, 0xfc, 0xab, 0x04, 0xf0, 0xaf, - 0xf6, 0xeb, 0x38, 0x54, 0xa3, 0xd3, 0x23, 0xda, 0x9b, 0xfa, 0xf0, 0xed, 0x2b, 0xe4, 0xd6, 0xa9, - 0xaf, 0x47, 0x4f, 0x42, 0xc9, 0x21, 0x67, 0x84, 0xb6, 0x7b, 0x22, 0x5d, 0x8b, 0x98, 0x55, 0xd4, - 0x8b, 0x92, 0xca, 0x85, 0x5c, 0xc1, 0xf6, 0x01, 0x69, 0x53, 0x43, 0x38, 0x9b, 0xa8, 0xe9, 0x73, - 0x8c, 0x8d, 0x51, 0x8f, 0x05, 0x51, 0x7b, 0xff, 0x4a, 0xb6, 0xcc, 0x41, 0x4a, 0x6f, 0xb4, 0xf4, - 0x77, 0xd5, 0x04, 0x42, 0x50, 0xe2, 0x8f, 0xc6, 0xf1, 0x41, 0xed, 0xe8, 0xb8, 0x79, 0xc8, 0x6c, - 0x79, 0x0d, 0xca, 0x9e, 0x2d, 0x3d, 0x62, 0x4a, 0x7b, 0x16, 0x1e, 0x8d, 0xc8, 0xed, 0xb3, 0xd0, - 0x46, 0xfb, 0xad, 0x12, 0xe4, 0x9e, 0xce, 0xcf, 0x69, 0x97, 0x62, 0x3a, 0x72, 0xa5, 0x11, 0x5f, - 0x5e, 0x36, 0xd9, 0x6f, 0x7a, 0x0f, 0xc7, 0x5c, 0x5c, 0x97, 0x6a, 0xb4, 0xbb, 0x50, 0x0a, 0xbf, - 0x89, 0xb6, 0xc1, 0xc4, 0x89, 0xe2, 0xda, 0x37, 0xf1, 0x89, 0x7f, 0x87, 0xa1, 0xda, 0x24, 0x9e, - 0x28, 0xff, 0x61, 0x3c, 0x79, 0x1d, 0x80, 0x8e, 0x0d, 0xb1, 0xe3, 0x5e, 0x52, 0xba, 0x35, 0xa7, - 0xc3, 0x41, 0xda, 0xad, 0xb1, 0xf4, 0x8f, 0x1c, 0x95, 0x4f, 0x0c, 0xab, 0xaf, 0xf8, 0x89, 0xc9, - 0x18, 0xf1, 0x84, 0xe5, 0x41, 0xba, 0x65, 0x33, 0x9b, 0x7a, 0x1e, 0x26, 0xbb, 0xe8, 0x5d, 0x78, - 0x74, 0x2a, 0xeb, 0xfa, 0xaa, 0x93, 0xcb, 0x26, 0xdf, 0x47, 0xc2, 0xc9, 0xd7, 0x53, 0xfd, 0x14, - 0x94, 0x71, 0xd7, 0x21, 0xa4, 0xc3, 0x2b, 0x02, 0x9e, 0x08, 0xbc, 0x26, 0x24, 0x27, 0xd7, 0x6c, - 0xfb, 0x4d, 0x4c, 0xb1, 0xf6, 0x2e, 0xc0, 0x04, 0xcc, 0xb2, 0x93, 0xe8, 0x58, 0xa3, 0x61, 0x87, - 0xbb, 0x43, 0x4a, 0x17, 0x03, 0x74, 0x17, 0x52, 0xe7, 0x16, 0x5b, 0x54, 0x3c, 0x22, 0x64, 0x3d, - 0xb0, 0x28, 0x09, 0x80, 0x61, 0xc1, 0xad, 0x99, 0x80, 0x66, 0xfb, 0x45, 0x11, 0x53, 0xbc, 0x11, - 0x9e, 0xe2, 0xf1, 0xc8, 0xce, 0xd3, 0xfc, 0xa9, 0x3e, 0x86, 0x14, 0x77, 0x03, 0x96, 0xce, 0x78, - 0x93, 0x52, 0xd6, 0x61, 0xec, 0x19, 0xfd, 0x14, 0x00, 0x53, 0xea, 0x98, 0xa7, 0xa3, 0xc9, 0x04, - 0xeb, 0xf3, 0xdd, 0xa8, 0xe6, 0xf1, 0xed, 0xdc, 0x94, 0xfe, 0xb4, 0x3a, 0x11, 0x0d, 0xf8, 0x54, - 0x40, 0xa1, 0x76, 0x00, 0xa5, 0xb0, 0xac, 0x57, 0x39, 0x88, 0x35, 0x84, 0x2b, 0x07, 0x51, 0x08, - 0xca, 0xca, 0xc1, 0xaf, 0x3b, 0x12, 0xa2, 0x13, 0xcb, 0x07, 0xda, 0xbf, 0x14, 0x28, 0x04, 0xbd, - 0xf0, 0x3b, 0x4e, 0xee, 0xb7, 0xe6, 0x24, 0xf7, 0x5c, 0x17, 0xbb, 0xef, 0x88, 0xdc, 0x7e, 0x63, - 0x26, 0xb7, 0x67, 0xba, 0xd8, 0x3d, 0xf9, 0x1e, 0x53, 0xbb, 0xf6, 0x0b, 0x05, 0xb2, 0xfe, 0xc7, - 0x87, 0x9b, 0xb2, 0xa1, 0x2e, 0xb6, 0xb0, 0x5d, 0x3c, 0xd8, 0x49, 0x15, 0x3d, 0xeb, 0x84, 0xdf, - 0xb3, 0x7e, 0xcd, 0x4f, 0x12, 0x51, 0xe0, 0x3d, 0x68, 0x69, 0xe9, 0x53, 0x5e, 0x4e, 0x7c, 0x0d, - 0x72, 0xfe, 0x41, 0x66, 0xc5, 0xbc, 0xd7, 0xe4, 0x50, 0x64, 0x25, 0x2a, 0x86, 0xbc, 0x9f, 0x6e, - 0x7d, 0x24, 0xdb, 0xb4, 0x09, 0x5d, 0x0c, 0xb4, 0x0e, 0x94, 0xa7, 0xa2, 0x00, 0x7a, 0x0d, 0x32, - 0xf6, 0xe8, 0xd4, 0xf0, 0x5c, 0x63, 0xaa, 0x17, 0xe4, 0x95, 0x89, 0xa3, 0xd3, 0xbe, 0xd9, 0xbe, - 0x4f, 0x2e, 0xbc, 0xc5, 0xd8, 0xa3, 0xd3, 0xfb, 0xc2, 0x83, 0xc4, 0x2c, 0xf1, 0xe0, 0x2c, 0xe7, - 0x90, 0xf5, 0x0e, 0x04, 0xfa, 0x01, 0xe4, 0xfc, 0x00, 0xe3, 0xff, 0x66, 0x89, 0x8c, 0x4c, 0x52, - 0xfd, 0x44, 0x84, 0x61, 0x0e, 0xd7, 0xec, 0x0e, 0xbd, 0x0e, 0x98, 0x80, 0x6b, 0x71, 0xee, 0x99, - 0x65, 0xf1, 0x62, 0xdf, 0xc3, 0x12, 0xda, 0xef, 0x14, 0x50, 0xa7, 0x4f, 0xe4, 0xf7, 0xb9, 0x00, - 0x96, 0x8a, 0xd9, 0xc9, 0x37, 0x08, 0x5b, 0x84, 0x0f, 0xa2, 0x0a, 0x7a, 0x91, 0x51, 0x1b, 0x1e, - 0x51, 0xfb, 0x79, 0x1c, 0xf2, 0x81, 0xfe, 0x1a, 0xfa, 0xff, 0x40, 0x78, 0x28, 0xcd, 0x09, 0xdc, - 0x01, 0xde, 0xc9, 0x7f, 0x8c, 0xf0, 0x87, 0xc5, 0xaf, 0xfe, 0x61, 0x51, 0x7f, 0x62, 0xbc, 0x6e, - 0x5d, 0xf2, 0xca, 0xdd, 0xba, 0xe7, 0x00, 0x51, 0x8b, 0xe2, 0xbe, 0x71, 0x6e, 0x51, 0x73, 0xd8, - 0x35, 0x84, 0x6b, 0x88, 0xc3, 0xac, 0xf2, 0x37, 0x0f, 0xf8, 0x8b, 0x23, 0xee, 0x25, 0x3f, 0x53, - 0x20, 0xeb, 0x17, 0x8c, 0x57, 0xfd, 0xcb, 0x71, 0x1d, 0xd2, 0xb2, 0x26, 0x12, 0xbf, 0x39, 0xe4, - 0x68, 0x6e, 0x5b, 0xb2, 0x0a, 0xd9, 0x01, 0xa1, 0x38, 0x90, 0x6d, 0xfc, 0xf1, 0x9d, 0x57, 0x21, - 0x1f, 0xf8, 0x43, 0xc4, 0x82, 0xd5, 0x41, 0xe3, 0x1d, 0x35, 0x56, 0xcd, 0x7c, 0xf2, 0xd9, 0x46, - 0xe2, 0x80, 0x7c, 0xc4, 0x4e, 0x98, 0xde, 0xa8, 0x37, 0x1b, 0xf5, 0xfb, 0xaa, 0x52, 0xcd, 0x7f, - 0xf2, 0xd9, 0x46, 0x46, 0x27, 0xbc, 0x23, 0x75, 0xe7, 0x3e, 0x94, 0xa7, 0x36, 0x26, 0x5c, 0x55, - 0x20, 0x28, 0xbd, 0x79, 0x72, 0xb4, 0xbf, 0x5b, 0xaf, 0xb5, 0x1a, 0xc6, 0x83, 0xc3, 0x56, 0x43, - 0x55, 0xd0, 0xa3, 0x70, 0x6d, 0x7f, 0xf7, 0x87, 0xcd, 0x96, 0x51, 0xdf, 0xdf, 0x6d, 0x1c, 0xb4, - 0x8c, 0x5a, 0xab, 0x55, 0xab, 0xdf, 0x57, 0xe3, 0xdb, 0x7f, 0xce, 0x41, 0xb2, 0xb6, 0x53, 0xdf, - 0x45, 0x75, 0x48, 0x72, 0xd8, 0x7f, 0xe9, 0xc5, 0x8b, 0xea, 0xe5, 0xbd, 0x45, 0x74, 0x0f, 0x52, - 0xbc, 0x23, 0x80, 0x2e, 0xbf, 0x89, 0x51, 0x5d, 0xd0, 0x6c, 0x64, 0x8b, 0xe1, 0x67, 0xe8, 0xd2, - 0xab, 0x19, 0xd5, 0xcb, 0x7b, 0x8f, 0x68, 0x1f, 0x32, 0x1e, 0x20, 0x5c, 0x74, 0x5f, 0xa2, 0xba, - 0xb0, 0x21, 0xc8, 0x3e, 0x4d, 0x00, 0xeb, 0xcb, 0x6f, 0x6d, 0x54, 0x17, 0x74, 0x25, 0xd1, 0x2e, - 0xa4, 0x25, 0x90, 0x5a, 0x70, 0x11, 0xa3, 0xba, 0xa8, 0xcf, 0x88, 0x74, 0xc8, 0x4d, 0x5a, 0x16, - 0x8b, 0xef, 0xa2, 0x54, 0x97, 0x68, 0xb8, 0xa2, 0xf7, 0xa0, 0x18, 0x06, 0x69, 0xcb, 0x5d, 0xf6, - 0xa8, 0x2e, 0xd9, 0xd1, 0x64, 0xfa, 0xc3, 0x88, 0x6d, 0xb9, 0xcb, 0x1f, 0xd5, 0x25, 0x1b, 0x9c, - 0xe8, 0x03, 0x58, 0x99, 0x45, 0x54, 0xcb, 0xdf, 0x05, 0xa9, 0x5e, 0xa1, 0xe5, 0x89, 0x06, 0x80, - 0xe6, 0x20, 0xb1, 0x2b, 0x5c, 0x0d, 0xa9, 0x5e, 0xa5, 0x03, 0x8a, 0x3a, 0x50, 0x9e, 0x86, 0x37, - 0xcb, 0x5e, 0x15, 0xa9, 0x2e, 0xdd, 0x0d, 0x15, 0xb3, 0x84, 0x61, 0xd1, 0xb2, 0x57, 0x47, 0xaa, - 0x4b, 0x37, 0x47, 0x99, 0x1b, 0x84, 0x81, 0xcd, 0x72, 0x57, 0x49, 0xaa, 0x4b, 0x76, 0x4a, 0x77, - 0x1a, 0x9f, 0x7f, 0xb5, 0xa6, 0x7c, 0xf1, 0xd5, 0x9a, 0xf2, 0xf7, 0xaf, 0xd6, 0x94, 0x4f, 0xbf, - 0x5e, 0x8b, 0x7d, 0xf1, 0xf5, 0x5a, 0xec, 0x2f, 0x5f, 0xaf, 0xc5, 0x7e, 0xf4, 0x6c, 0xd7, 0xa4, - 0xbd, 0xd1, 0xe9, 0x66, 0xdb, 0x1a, 0x6c, 0x05, 0xef, 0xb4, 0xcd, 0xbb, 0x49, 0x77, 0x9a, 0xe6, - 0xc9, 0xe7, 0xc5, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x05, 0x41, 0x30, 0xa8, 0x69, 0x27, 0x00, - 0x00, + // 2946 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x73, 0x23, 0xc5, + 0x15, 0xd7, 0xe8, 0x5b, 0x4f, 0x5f, 0xe3, 0x5e, 0xb3, 0x68, 0xc5, 0xae, 0x6d, 0x86, 0x02, 0x96, + 0x05, 0x6c, 0x62, 0xb2, 0x7c, 0x14, 0x90, 0x2a, 0x59, 0xab, 0x8d, 0xd6, 0x6b, 0x6c, 0x33, 0x96, + 0x97, 0x22, 0x1f, 0x0c, 0x6d, 0xa9, 0x2d, 0x0d, 0x2b, 0x69, 0x86, 0x99, 0x96, 0x91, 0x39, 0xe6, + 0xa3, 0x2a, 0xc5, 0x89, 0x4b, 0xaa, 0xb8, 0x70, 0xc8, 0x21, 0xff, 0x43, 0x4e, 0x39, 0xe5, 0xc0, + 0x21, 0x07, 0x0e, 0x39, 0xe4, 0x90, 0x22, 0x29, 0xb8, 0xa4, 0xf2, 0x0f, 0x70, 0x4b, 0xa5, 0xfa, + 0x63, 0x46, 0x33, 0x92, 0xc6, 0x92, 0x09, 0x45, 0x55, 0xaa, 0x72, 0x9b, 0x7e, 0xf3, 0xde, 0xeb, + 0x9e, 0xd7, 0xaf, 0xdf, 0x7b, 0xbf, 0x37, 0x0d, 0x8f, 0x51, 0x32, 0xec, 0x10, 0x67, 0x60, 0x0e, + 0xe9, 0x16, 0x3e, 0x69, 0x9b, 0x5b, 0xf4, 0xdc, 0x26, 0xee, 0xa6, 0xed, 0x58, 0xd4, 0x42, 0xe5, + 0xc9, 0xcb, 0x4d, 0xf6, 0xb2, 0x7a, 0x23, 0xc0, 0xdd, 0x76, 0xce, 0x6d, 0x6a, 0x6d, 0xd9, 0x8e, + 0x65, 0x9d, 0x0a, 0xfe, 0xea, 0xf5, 0xd9, 0xd7, 0x0f, 0xc9, 0xb9, 0xd4, 0x16, 0x12, 0xe6, 0xb3, + 0x6c, 0xd9, 0xd8, 0xc1, 0x03, 0xef, 0xf5, 0x7a, 0xd7, 0xb2, 0xba, 0x7d, 0xb2, 0xc5, 0x47, 0x27, + 0xa3, 0xd3, 0x2d, 0x6a, 0x0e, 0x88, 0x4b, 0xf1, 0xc0, 0x96, 0x0c, 0xab, 0x5d, 0xab, 0x6b, 0xf1, + 0xc7, 0x2d, 0xf6, 0x24, 0xa8, 0xda, 0x6f, 0xb3, 0x90, 0xd1, 0xc9, 0x07, 0x23, 0xe2, 0x52, 0xb4, + 0x0d, 0x49, 0xd2, 0xee, 0x59, 0x15, 0x65, 0x43, 0xb9, 0x99, 0xdf, 0xbe, 0xbe, 0x39, 0xb5, 0xfc, + 0x4d, 0xc9, 0xd7, 0x68, 0xf7, 0xac, 0x66, 0x4c, 0xe7, 0xbc, 0xe8, 0x36, 0xa4, 0x4e, 0xfb, 0x23, + 0xb7, 0x57, 0x89, 0x73, 0xa1, 0x1b, 0x51, 0x42, 0x77, 0x19, 0x53, 0x33, 0xa6, 0x0b, 0x6e, 0x36, + 0x95, 0x39, 0x3c, 0xb5, 0x2a, 0x89, 0x8b, 0xa7, 0xba, 0x37, 0x3c, 0xe5, 0x53, 0x31, 0x5e, 0xb4, + 0x03, 0x60, 0x0e, 0x4d, 0x6a, 0xb4, 0x7b, 0xd8, 0x1c, 0x56, 0x52, 0x5c, 0xf2, 0xf1, 0x68, 0x49, + 0x93, 0xd6, 0x19, 0x63, 0x33, 0xa6, 0xe7, 0x4c, 0x6f, 0xc0, 0x96, 0xfb, 0xc1, 0x88, 0x38, 0xe7, + 0x95, 0xf4, 0xc5, 0xcb, 0x7d, 0x8b, 0x31, 0xb1, 0xe5, 0x72, 0x6e, 0xf4, 0x3a, 0x64, 0xdb, 0x3d, + 0xd2, 0x7e, 0x68, 0xd0, 0x71, 0x25, 0xcb, 0x25, 0xd7, 0xa3, 0x24, 0xeb, 0x8c, 0xaf, 0x35, 0x6e, + 0xc6, 0xf4, 0x4c, 0x5b, 0x3c, 0xa2, 0x57, 0x20, 0xdd, 0xb6, 0x06, 0x03, 0x93, 0x56, 0xf2, 0x5c, + 0x76, 0x2d, 0x52, 0x96, 0x73, 0x35, 0x63, 0xba, 0xe4, 0x47, 0xfb, 0x50, 0xea, 0x9b, 0x2e, 0x35, + 0xdc, 0x21, 0xb6, 0xdd, 0x9e, 0x45, 0xdd, 0x4a, 0x81, 0x6b, 0x78, 0x32, 0x4a, 0xc3, 0x9e, 0xe9, + 0xd2, 0x23, 0x8f, 0xb9, 0x19, 0xd3, 0x8b, 0xfd, 0x20, 0x81, 0xe9, 0xb3, 0x4e, 0x4f, 0x89, 0xe3, + 0x2b, 0xac, 0x14, 0x2f, 0xd6, 0x77, 0xc0, 0xb8, 0x3d, 0x79, 0xa6, 0xcf, 0x0a, 0x12, 0xd0, 0x4f, + 0xe1, 0x4a, 0xdf, 0xc2, 0x1d, 0x5f, 0x9d, 0xd1, 0xee, 0x8d, 0x86, 0x0f, 0x2b, 0x25, 0xae, 0xf4, + 0x99, 0xc8, 0x45, 0x5a, 0xb8, 0xe3, 0xa9, 0xa8, 0x33, 0x81, 0x66, 0x4c, 0x5f, 0xe9, 0x4f, 0x13, + 0xd1, 0xbb, 0xb0, 0x8a, 0x6d, 0xbb, 0x7f, 0x3e, 0xad, 0xbd, 0xcc, 0xb5, 0xdf, 0x8a, 0xd2, 0x5e, + 0x63, 0x32, 0xd3, 0xea, 0x11, 0x9e, 0xa1, 0xa2, 0x16, 0xa8, 0xb6, 0x43, 0x6c, 0xec, 0x10, 0xc3, + 0x76, 0x2c, 0xdb, 0x72, 0x71, 0xbf, 0xa2, 0x72, 0xdd, 0x4f, 0x47, 0xe9, 0x3e, 0x14, 0xfc, 0x87, + 0x92, 0xbd, 0x19, 0xd3, 0xcb, 0x76, 0x98, 0x24, 0xb4, 0x5a, 0x6d, 0xe2, 0xba, 0x13, 0xad, 0x2b, + 0x8b, 0xb4, 0x72, 0xfe, 0xb0, 0xd6, 0x10, 0x89, 0x6d, 0xdc, 0xa9, 0x39, 0xc4, 0x7d, 0xf3, 0x23, + 0x62, 0x9c, 0xf4, 0xad, 0xf6, 0xc3, 0xca, 0xea, 0xc5, 0x1b, 0x77, 0x57, 0x72, 0xef, 0x30, 0x66, + 0xb6, 0x71, 0xa7, 0x41, 0xc2, 0x4e, 0x06, 0x52, 0x67, 0xb8, 0x3f, 0x22, 0xbb, 0xc9, 0x6c, 0x52, + 0x4d, 0xed, 0x26, 0xb3, 0x19, 0x35, 0xbb, 0x9b, 0xcc, 0xe6, 0x54, 0xd8, 0x4d, 0x66, 0x41, 0xcd, + 0x6b, 0x4f, 0x43, 0x3e, 0x70, 0xdc, 0x51, 0x05, 0x32, 0x03, 0xe2, 0xba, 0xb8, 0x4b, 0x78, 0x74, + 0xc8, 0xe9, 0xde, 0x50, 0x2b, 0x41, 0x21, 0x78, 0xc4, 0xb5, 0x4f, 0x14, 0x5f, 0x92, 0x9d, 0x5e, + 0x26, 0x79, 0x46, 0x1c, 0xd7, 0xb4, 0x86, 0x9e, 0xa4, 0x1c, 0xa2, 0x27, 0xa0, 0xc8, 0x3f, 0xc5, + 0xf0, 0xde, 0xb3, 0x10, 0x92, 0xd4, 0x0b, 0x9c, 0xf8, 0x40, 0x32, 0xad, 0x43, 0xde, 0xde, 0xb6, + 0x7d, 0x96, 0x04, 0x67, 0x01, 0x7b, 0xdb, 0xf6, 0x18, 0x1e, 0x87, 0x02, 0xfb, 0x6e, 0x9f, 0x23, + 0xc9, 0x27, 0xc9, 0x33, 0x9a, 0x64, 0xd1, 0xfe, 0x1c, 0x07, 0x75, 0x3a, 0x2c, 0xa0, 0x57, 0x20, + 0xc9, 0x22, 0xa4, 0x0c, 0x76, 0xd5, 0x4d, 0x11, 0x3e, 0x37, 0xbd, 0xf0, 0xb9, 0xd9, 0xf2, 0xc2, + 0xe7, 0x4e, 0xf6, 0xf3, 0x2f, 0xd7, 0x63, 0x9f, 0xfc, 0x7d, 0x5d, 0xd1, 0xb9, 0x04, 0xba, 0xc6, + 0x82, 0x01, 0x36, 0x87, 0x86, 0xd9, 0xe1, 0x4b, 0xce, 0xb1, 0x93, 0x8e, 0xcd, 0xe1, 0xbd, 0x0e, + 0xda, 0x03, 0xb5, 0x6d, 0x0d, 0x5d, 0x32, 0x74, 0x47, 0xae, 0x21, 0xc2, 0xb3, 0x0c, 0x71, 0xa1, + 0x40, 0x25, 0x92, 0x44, 0xdd, 0xe3, 0x3c, 0xe4, 0x8c, 0x7a, 0xb9, 0x1d, 0x26, 0xa0, 0xbb, 0x00, + 0x67, 0xb8, 0x6f, 0x76, 0x30, 0xb5, 0x1c, 0xb7, 0x92, 0xdc, 0x48, 0xdc, 0xcc, 0x6f, 0x6f, 0xcc, + 0x6c, 0xf8, 0x03, 0x8f, 0xe5, 0xd8, 0xee, 0x60, 0x4a, 0x76, 0x92, 0x6c, 0xb9, 0x7a, 0x40, 0x12, + 0x3d, 0x05, 0x65, 0x6c, 0xdb, 0x86, 0x4b, 0x31, 0x25, 0xc6, 0xc9, 0x39, 0x25, 0x2e, 0x8f, 0x9e, + 0x05, 0xbd, 0x88, 0x6d, 0xfb, 0x88, 0x51, 0x77, 0x18, 0x11, 0x3d, 0x09, 0x25, 0x16, 0x29, 0x4d, + 0xdc, 0x37, 0x7a, 0xc4, 0xec, 0xf6, 0x28, 0x8f, 0x92, 0x09, 0xbd, 0x28, 0xa9, 0x4d, 0x4e, 0xd4, + 0x3a, 0xfe, 0x8e, 0xf3, 0x28, 0x89, 0x10, 0x24, 0x3b, 0x98, 0x62, 0x6e, 0xc9, 0x82, 0xce, 0x9f, + 0x19, 0xcd, 0xc6, 0xb4, 0x27, 0xed, 0xc3, 0x9f, 0xd1, 0x55, 0x48, 0x4b, 0xb5, 0x09, 0xae, 0x56, + 0x8e, 0xd0, 0x2a, 0xa4, 0x6c, 0xc7, 0x3a, 0x23, 0x7c, 0xeb, 0xb2, 0xba, 0x18, 0x68, 0x3a, 0x94, + 0xc2, 0x11, 0x15, 0x95, 0x20, 0x4e, 0xc7, 0x72, 0x96, 0x38, 0x1d, 0xa3, 0x17, 0x20, 0xc9, 0x0c, + 0xc9, 0xe7, 0x28, 0xcd, 0xc9, 0x21, 0x52, 0xae, 0x75, 0x6e, 0x13, 0x9d, 0x73, 0x6a, 0x65, 0x28, + 0x86, 0x22, 0xad, 0x76, 0x15, 0x56, 0xe7, 0x05, 0x4e, 0xad, 0xe7, 0xd3, 0x43, 0x01, 0x10, 0xdd, + 0x86, 0xac, 0x1f, 0x39, 0x85, 0xe3, 0x5c, 0x9b, 0x99, 0xd6, 0x63, 0xd6, 0x7d, 0x56, 0xe6, 0x31, + 0x6c, 0x03, 0x7a, 0x58, 0xe6, 0xc9, 0x82, 0x9e, 0xc1, 0xb6, 0xdd, 0xc4, 0x6e, 0x4f, 0x7b, 0x0f, + 0x2a, 0x51, 0x51, 0x31, 0x60, 0x30, 0x85, 0xbb, 0xbd, 0x67, 0xb0, 0xab, 0x90, 0x3e, 0xb5, 0x9c, + 0x01, 0xa6, 0x5c, 0x59, 0x51, 0x97, 0x23, 0x66, 0x48, 0x11, 0x21, 0x13, 0x9c, 0x2c, 0x06, 0x9a, + 0x01, 0xd7, 0x22, 0x23, 0x23, 0x13, 0x31, 0x87, 0x1d, 0x22, 0xcc, 0x5a, 0xd4, 0xc5, 0x60, 0xa2, + 0x48, 0x2c, 0x56, 0x0c, 0xd8, 0xb4, 0x2e, 0xff, 0x56, 0xae, 0x3f, 0xa7, 0xcb, 0x91, 0xf6, 0x69, + 0x02, 0xae, 0xce, 0x8f, 0x8f, 0x68, 0x03, 0x0a, 0x03, 0x3c, 0x36, 0xe8, 0x58, 0xba, 0x9d, 0xc2, + 0x37, 0x1e, 0x06, 0x78, 0xdc, 0x1a, 0x0b, 0x9f, 0x53, 0x21, 0x41, 0xc7, 0x6e, 0x25, 0xbe, 0x91, + 0xb8, 0x59, 0xd0, 0xd9, 0x23, 0x3a, 0x86, 0x95, 0xbe, 0xd5, 0xc6, 0x7d, 0xa3, 0x8f, 0x5d, 0x6a, + 0xc8, 0xc4, 0x29, 0x0e, 0xd1, 0x13, 0x33, 0xc6, 0x6e, 0x8c, 0x39, 0xa5, 0x23, 0xf6, 0x93, 0x05, + 0x1c, 0xe9, 0xff, 0x65, 0xae, 0x63, 0x0f, 0x7b, 0x5b, 0x8d, 0xee, 0x40, 0x7e, 0x60, 0xba, 0x27, + 0xa4, 0x87, 0xcf, 0x4c, 0xcb, 0x91, 0xa7, 0x69, 0xd6, 0x69, 0xde, 0x9c, 0xf0, 0x48, 0x4d, 0x41, + 0xb1, 0xc0, 0x96, 0xa4, 0x42, 0x3e, 0xec, 0x45, 0x93, 0xf4, 0xa5, 0xa3, 0xc9, 0x0b, 0xb0, 0x3a, + 0x24, 0x63, 0x6a, 0x4c, 0xce, 0xab, 0xf0, 0x93, 0x0c, 0x37, 0x3d, 0x62, 0xef, 0xfc, 0x13, 0xee, + 0x32, 0x97, 0x41, 0xcf, 0xf0, 0x0c, 0x63, 0x5b, 0x2e, 0x71, 0x0c, 0xdc, 0xe9, 0x38, 0xc4, 0x75, + 0x79, 0x51, 0x52, 0xe0, 0x69, 0x83, 0xd3, 0x6b, 0x82, 0xac, 0xfd, 0x26, 0xb8, 0x35, 0xe1, 0x8c, + 0x22, 0x0d, 0xaf, 0x4c, 0x0c, 0x7f, 0x04, 0xab, 0x52, 0xbe, 0x13, 0xb2, 0xbd, 0xa8, 0xec, 0x1e, + 0x9b, 0x3d, 0x5f, 0xd3, 0x36, 0x47, 0x9e, 0x78, 0xb4, 0xd9, 0x13, 0xdf, 0xce, 0xec, 0x08, 0x92, + 0xdc, 0x28, 0x49, 0x11, 0x62, 0xd8, 0xf3, 0xff, 0xda, 0x56, 0xfc, 0x2a, 0xe1, 0xc7, 0x94, 0x50, + 0x6e, 0x9e, 0xb3, 0x11, 0x6f, 0xc1, 0x95, 0x0e, 0x69, 0x9b, 0x9d, 0x6f, 0xbb, 0x0f, 0x2b, 0x52, + 0xfa, 0xff, 0xdb, 0x30, 0xbb, 0x0d, 0xff, 0xcc, 0x42, 0x56, 0x27, 0xae, 0xcd, 0x52, 0x2d, 0xda, + 0x81, 0x1c, 0x19, 0xb7, 0x89, 0x4d, 0xbd, 0xea, 0x24, 0xbf, 0xad, 0xcd, 0x29, 0xa8, 0x04, 0x77, + 0xc3, 0xe3, 0x64, 0x88, 0xc2, 0x17, 0x43, 0x2f, 0x4a, 0xd0, 0x14, 0x8d, 0x7f, 0xa4, 0x78, 0x10, + 0x35, 0xbd, 0xe4, 0xa1, 0xa6, 0x44, 0x24, 0x20, 0x10, 0x52, 0x53, 0xb0, 0xe9, 0x45, 0x09, 0x9b, + 0x92, 0x0b, 0x26, 0x0b, 0xe1, 0xa6, 0x7a, 0x08, 0x37, 0xa5, 0x17, 0x7c, 0x66, 0x04, 0x70, 0x7a, + 0xc9, 0x03, 0x4e, 0x99, 0x05, 0x2b, 0x9e, 0x42, 0x4e, 0x6f, 0x04, 0x90, 0x53, 0x8e, 0x8b, 0x6e, + 0x44, 0x8a, 0xce, 0x81, 0x4e, 0xaf, 0xfa, 0xd0, 0xa9, 0x10, 0x09, 0xbb, 0xa4, 0xf0, 0x34, 0x76, + 0x3a, 0x98, 0xc1, 0x4e, 0x02, 0xeb, 0x3c, 0x15, 0xa9, 0x62, 0x01, 0x78, 0x3a, 0x98, 0x01, 0x4f, + 0xa5, 0x05, 0x0a, 0x17, 0xa0, 0xa7, 0x9f, 0xcd, 0x47, 0x4f, 0xd1, 0xf8, 0x46, 0x2e, 0x73, 0x39, + 0xf8, 0x64, 0x44, 0xc0, 0x27, 0x01, 0x71, 0x9e, 0x8d, 0x54, 0xbf, 0x34, 0x7e, 0x3a, 0x9e, 0x83, + 0x9f, 0x04, 0xd2, 0xb9, 0x19, 0xa9, 0x7c, 0x09, 0x00, 0x75, 0x3c, 0x07, 0x40, 0xa1, 0x85, 0x6a, + 0x17, 0x22, 0xa8, 0x83, 0x19, 0x04, 0xf5, 0xc8, 0x82, 0xdd, 0x5b, 0x1e, 0x42, 0xa5, 0xd4, 0xf4, + 0x6e, 0x32, 0x9b, 0x55, 0x73, 0x02, 0x3c, 0xed, 0x26, 0xb3, 0x79, 0xb5, 0xa0, 0x3d, 0x03, 0x2b, + 0x33, 0xb1, 0x83, 0x95, 0x56, 0xc4, 0x71, 0x2c, 0x47, 0x82, 0x21, 0x31, 0xd0, 0x6e, 0xb2, 0x92, + 0x7a, 0x12, 0x27, 0x2e, 0x80, 0x5b, 0xbc, 0x84, 0x0d, 0xc4, 0x06, 0xed, 0x0f, 0xca, 0x44, 0x96, + 0x03, 0xae, 0x60, 0x39, 0x9e, 0x93, 0xe5, 0x78, 0x00, 0x84, 0xc5, 0xc3, 0x20, 0x6c, 0x1d, 0xf2, + 0xac, 0x34, 0x9d, 0xc2, 0x57, 0xd8, 0xf6, 0xf1, 0xd5, 0x2d, 0x58, 0xe1, 0x49, 0x48, 0x40, 0x35, + 0x19, 0xea, 0x93, 0x3c, 0xd4, 0x97, 0xd9, 0x0b, 0x61, 0x1d, 0x11, 0xf3, 0x9f, 0x87, 0x2b, 0x01, + 0x5e, 0xbf, 0xe4, 0x15, 0x60, 0x43, 0xf5, 0xb9, 0x6b, 0xb2, 0xf6, 0xfd, 0x93, 0x32, 0xb1, 0xd0, + 0x04, 0x98, 0xcd, 0xc3, 0x50, 0xca, 0x77, 0x84, 0xa1, 0xe2, 0xdf, 0x1a, 0x43, 0x05, 0x4b, 0xf8, + 0x44, 0xb8, 0x84, 0xff, 0x46, 0x99, 0xec, 0x89, 0x8f, 0x88, 0xda, 0x56, 0x87, 0xc8, 0xa2, 0x9a, + 0x3f, 0xb3, 0x34, 0xdf, 0xb7, 0xba, 0xb2, 0x74, 0x66, 0x8f, 0x8c, 0xcb, 0x0f, 0xe6, 0x39, 0x19, + 0xab, 0xfd, 0x7a, 0x5c, 0x24, 0x53, 0x59, 0x8f, 0xab, 0x90, 0x78, 0x48, 0x44, 0xcf, 0xaa, 0xa0, + 0xb3, 0x47, 0xc6, 0xc7, 0x9d, 0x4f, 0x26, 0x45, 0x31, 0x40, 0xaf, 0x40, 0x8e, 0xf7, 0x13, 0x0d, + 0xcb, 0x76, 0x65, 0x9f, 0x2a, 0x54, 0x2e, 0x88, 0xa6, 0xe2, 0xe6, 0x21, 0xe3, 0x39, 0xb0, 0x5d, + 0x3d, 0x6b, 0xcb, 0xa7, 0x40, 0x16, 0xcf, 0x85, 0xb2, 0xf8, 0x75, 0xc8, 0xb1, 0xd5, 0xbb, 0x36, + 0x6e, 0x93, 0x0a, 0xf0, 0x85, 0x4e, 0x08, 0xda, 0xdf, 0xe2, 0x50, 0x9e, 0x0a, 0xde, 0x73, 0xbf, + 0xdd, 0x73, 0xc9, 0x78, 0x00, 0x21, 0x2e, 0x67, 0x8f, 0x35, 0x80, 0x2e, 0x76, 0x8d, 0x0f, 0xf1, + 0x90, 0x92, 0x8e, 0x34, 0x4a, 0x80, 0x82, 0xaa, 0x90, 0x65, 0xa3, 0x91, 0x4b, 0x3a, 0x12, 0xac, + 0xfa, 0x63, 0xd4, 0x84, 0x34, 0x39, 0x23, 0x43, 0xea, 0x56, 0x32, 0x7c, 0xdb, 0xaf, 0xce, 0xa2, + 0x07, 0xf6, 0x7a, 0xa7, 0xc2, 0x36, 0xfb, 0x5f, 0x5f, 0xae, 0xab, 0x82, 0xfb, 0x39, 0x6b, 0x60, + 0x52, 0x32, 0xb0, 0xe9, 0xb9, 0x2e, 0xe5, 0xc3, 0x56, 0xc8, 0x4e, 0x59, 0x21, 0x80, 0x8b, 0x72, + 0x41, 0x5c, 0xc4, 0xd6, 0x66, 0x3b, 0xa6, 0xe5, 0x98, 0xf4, 0x9c, 0x9b, 0x2e, 0xa1, 0xfb, 0x63, + 0xf4, 0x04, 0x14, 0x07, 0x64, 0x60, 0x5b, 0x56, 0xdf, 0x10, 0xe1, 0x20, 0xcf, 0x45, 0x0b, 0x92, + 0xd8, 0xe0, 0x51, 0xa1, 0xc6, 0x20, 0x70, 0x30, 0xbb, 0x31, 0x31, 0x87, 0x50, 0x6c, 0x0e, 0x8d, + 0x10, 0x92, 0x2e, 0x08, 0xa2, 0x38, 0x85, 0xbb, 0xc9, 0xac, 0xa2, 0xc6, 0x77, 0x93, 0xd9, 0xb8, + 0x9a, 0xd0, 0x0e, 0xe1, 0x91, 0xb9, 0xd9, 0x0d, 0xbd, 0x0c, 0xb9, 0x49, 0x62, 0x54, 0xb8, 0x7d, + 0x2e, 0x80, 0xb2, 0x13, 0x5e, 0xed, 0x8f, 0xca, 0x44, 0x65, 0x18, 0x1c, 0x37, 0x20, 0xed, 0x10, + 0x77, 0xd4, 0x17, 0x70, 0xb5, 0xb4, 0xfd, 0xfc, 0x72, 0x79, 0x91, 0x51, 0x47, 0x7d, 0xaa, 0x4b, + 0x61, 0xed, 0x5d, 0x48, 0x0b, 0x0a, 0xca, 0x43, 0xe6, 0x78, 0xff, 0xfe, 0xfe, 0xc1, 0xdb, 0xfb, + 0x6a, 0x0c, 0x01, 0xa4, 0x6b, 0xf5, 0x7a, 0xe3, 0xb0, 0xa5, 0x2a, 0x28, 0x07, 0xa9, 0xda, 0xce, + 0x81, 0xde, 0x52, 0xe3, 0x8c, 0xac, 0x37, 0x76, 0x1b, 0xf5, 0x96, 0x9a, 0x40, 0x2b, 0x50, 0x14, + 0xcf, 0xc6, 0xdd, 0x03, 0xfd, 0xcd, 0x5a, 0x4b, 0x4d, 0x06, 0x48, 0x47, 0x8d, 0xfd, 0x3b, 0x0d, + 0x5d, 0x4d, 0x69, 0x3f, 0x60, 0x78, 0x38, 0x22, 0x93, 0x4e, 0x90, 0xaf, 0x12, 0x40, 0xbe, 0xda, + 0xa7, 0x71, 0xa8, 0x46, 0xa7, 0x47, 0xb4, 0x3b, 0xf5, 0xe1, 0xdb, 0x97, 0xc8, 0xad, 0x53, 0x5f, + 0x8f, 0x9e, 0x84, 0x92, 0x43, 0x4e, 0x09, 0x6d, 0xf7, 0x44, 0xba, 0x16, 0x31, 0xab, 0xa8, 0x17, + 0x25, 0x95, 0x0b, 0xb9, 0x82, 0xed, 0x7d, 0xd2, 0xa6, 0x86, 0x70, 0x36, 0x97, 0x97, 0xf4, 0x39, + 0xc6, 0xc6, 0xa8, 0x47, 0x82, 0xa8, 0xbd, 0x77, 0x29, 0x5b, 0xe6, 0x20, 0xa5, 0x37, 0x5a, 0xfa, + 0x3b, 0x6a, 0x02, 0x21, 0x28, 0xf1, 0x47, 0xe3, 0x68, 0xbf, 0x76, 0x78, 0xd4, 0x3c, 0x60, 0xb6, + 0xbc, 0x02, 0x65, 0xcf, 0x96, 0x1e, 0x31, 0xa5, 0x3d, 0x0b, 0x8f, 0x46, 0xe4, 0xf6, 0x59, 0x60, + 0xa3, 0xfd, 0x4e, 0x09, 0x72, 0x4f, 0xe7, 0xe7, 0xb4, 0x4b, 0x31, 0x1d, 0xb9, 0xd2, 0x88, 0x2f, + 0x2f, 0x9b, 0xec, 0x37, 0xbd, 0x87, 0x23, 0x2e, 0xae, 0x4b, 0x35, 0xda, 0x6d, 0x28, 0x85, 0xdf, + 0x44, 0xdb, 0x60, 0xe2, 0x44, 0x71, 0xed, 0x9b, 0xf8, 0xc4, 0xbf, 0xc3, 0x40, 0x6d, 0x12, 0x4f, + 0x94, 0xff, 0x32, 0x9e, 0xbc, 0x0e, 0x40, 0xc7, 0x86, 0xd8, 0x71, 0x2f, 0x29, 0xdd, 0x98, 0xd3, + 0xdb, 0x20, 0xed, 0xd6, 0x58, 0xfa, 0x47, 0x8e, 0xca, 0x27, 0x86, 0xd3, 0x57, 0xfc, 0xc4, 0x64, + 0x8c, 0x78, 0xc2, 0x72, 0x25, 0xa2, 0x5b, 0x36, 0xb3, 0xa9, 0x67, 0x61, 0xb2, 0x8b, 0xde, 0x81, + 0x47, 0xa7, 0xb2, 0xae, 0xaf, 0x3a, 0xb9, 0x6c, 0xf2, 0x7d, 0x24, 0x9c, 0x7c, 0x3d, 0xd5, 0x4f, + 0x41, 0x19, 0x77, 0x1d, 0x42, 0x3a, 0xbc, 0x22, 0xe0, 0x89, 0xc0, 0x6b, 0x3f, 0x72, 0x72, 0xcd, + 0xb6, 0xef, 0x60, 0x8a, 0xb5, 0x77, 0x00, 0x26, 0x50, 0x96, 0x9d, 0x44, 0xc7, 0x1a, 0x0d, 0x3b, + 0xdc, 0x1d, 0x52, 0xba, 0x18, 0xa0, 0xdb, 0x90, 0x3a, 0xb3, 0xd8, 0xa2, 0xe2, 0x11, 0x21, 0xeb, + 0x81, 0x45, 0x49, 0x00, 0x0a, 0x0b, 0x6e, 0xcd, 0x04, 0x34, 0xdb, 0x29, 0x8a, 0x98, 0xe2, 0x8d, + 0xf0, 0x14, 0x8f, 0x47, 0xf6, 0x9c, 0xe6, 0x4f, 0xf5, 0x11, 0xa4, 0xb8, 0x1b, 0xb0, 0x74, 0xc6, + 0xdb, 0x93, 0xb2, 0x0e, 0x63, 0xcf, 0xe8, 0xe7, 0x00, 0x98, 0x52, 0xc7, 0x3c, 0x19, 0x4d, 0x26, + 0x58, 0x9f, 0xef, 0x46, 0x35, 0x8f, 0x6f, 0xe7, 0xba, 0xf4, 0xa7, 0xd5, 0x89, 0x68, 0xc0, 0xa7, + 0x02, 0x0a, 0xb5, 0x7d, 0x28, 0x85, 0x65, 0xbd, 0xca, 0x41, 0xac, 0x21, 0x5c, 0x39, 0x88, 0x42, + 0x50, 0x56, 0x0e, 0x7e, 0xdd, 0x91, 0x10, 0x3d, 0x58, 0x3e, 0xd0, 0xfe, 0xad, 0x40, 0x21, 0xe8, + 0x85, 0xdf, 0x71, 0x72, 0xbf, 0x31, 0x27, 0xb9, 0xe7, 0xba, 0xd8, 0x7d, 0x5b, 0xe4, 0xf6, 0x6b, + 0x33, 0xb9, 0x3d, 0xd3, 0xc5, 0xee, 0xf1, 0xf7, 0x98, 0xda, 0xb5, 0x5f, 0x2b, 0x90, 0xf5, 0x3f, + 0x3e, 0xdc, 0x8e, 0x0d, 0xf5, 0xaf, 0x85, 0xed, 0xe2, 0xc1, 0x1e, 0xaa, 0xe8, 0x56, 0x27, 0xfc, + 0x6e, 0xf5, 0x6b, 0x7e, 0x92, 0x88, 0x02, 0xef, 0x41, 0x4b, 0x4b, 0x9f, 0xf2, 0x72, 0xe2, 0x6b, + 0x90, 0xf3, 0x0f, 0x32, 0x2b, 0xe6, 0xbd, 0x26, 0x87, 0x22, 0x2b, 0x51, 0x31, 0xe4, 0x9d, 0x74, + 0xeb, 0x43, 0xd9, 0xa0, 0x4d, 0xe8, 0x62, 0xa0, 0x75, 0xa0, 0x3c, 0x15, 0x05, 0xd0, 0x6b, 0x90, + 0xb1, 0x47, 0x27, 0x86, 0xe7, 0x1a, 0x53, 0xad, 0x20, 0xaf, 0x4c, 0x1c, 0x9d, 0xf4, 0xcd, 0xf6, + 0x7d, 0x72, 0xee, 0x2d, 0xc6, 0x1e, 0x9d, 0xdc, 0x17, 0x1e, 0x24, 0x66, 0x89, 0x07, 0x67, 0x39, + 0x83, 0xac, 0x77, 0x20, 0xd0, 0x8f, 0x20, 0xe7, 0x07, 0x18, 0xff, 0x07, 0x4b, 0x64, 0x64, 0x92, + 0xea, 0x27, 0x22, 0x0c, 0x73, 0xb8, 0x66, 0x77, 0xe8, 0xf5, 0xbf, 0x04, 0x5c, 0x8b, 0x73, 0xcf, + 0x2c, 0x8b, 0x17, 0x7b, 0x1e, 0x96, 0xd0, 0x7e, 0xaf, 0x80, 0x3a, 0x7d, 0x22, 0xbf, 0xcf, 0x05, + 0xb0, 0x54, 0xcc, 0x4e, 0xbe, 0x41, 0xd8, 0x22, 0x7c, 0x10, 0x55, 0xd0, 0x8b, 0x8c, 0xda, 0xf0, + 0x88, 0xda, 0x2f, 0xe3, 0x90, 0x0f, 0xb4, 0xd7, 0xd0, 0x0f, 0x03, 0xe1, 0xa1, 0x34, 0x27, 0x70, + 0x07, 0x78, 0x27, 0x7f, 0x30, 0xc2, 0x1f, 0x16, 0xbf, 0xfc, 0x87, 0x45, 0xfd, 0x83, 0xf1, 0xba, + 0x75, 0xc9, 0x4b, 0x77, 0xeb, 0x9e, 0x03, 0x44, 0x2d, 0x8a, 0xfb, 0xc6, 0x99, 0x45, 0xcd, 0x61, + 0xd7, 0x10, 0xae, 0x21, 0x0e, 0xb3, 0xca, 0xdf, 0x3c, 0xe0, 0x2f, 0x0e, 0xb9, 0x97, 0xfc, 0x42, + 0x81, 0xac, 0x5f, 0x30, 0x5e, 0xf6, 0xff, 0xc6, 0x55, 0x48, 0xcb, 0x9a, 0x48, 0xfc, 0xe0, 0x90, + 0xa3, 0xb9, 0x6d, 0xc9, 0x2a, 0x64, 0x07, 0x84, 0xe2, 0x40, 0xb6, 0xf1, 0xc7, 0xb7, 0x5e, 0x85, + 0x7c, 0xe0, 0xdf, 0x10, 0x0b, 0x56, 0xfb, 0x8d, 0xb7, 0xd5, 0x58, 0x35, 0xf3, 0xf1, 0x67, 0x1b, + 0x89, 0x7d, 0xf2, 0x21, 0x3b, 0x61, 0x7a, 0xa3, 0xde, 0x6c, 0xd4, 0xef, 0xab, 0x4a, 0x35, 0xff, + 0xf1, 0x67, 0x1b, 0x19, 0x9d, 0xf0, 0x8e, 0xd4, 0xad, 0xfb, 0x50, 0x9e, 0xda, 0x98, 0x70, 0x55, + 0x81, 0xa0, 0x74, 0xe7, 0xf8, 0x70, 0xef, 0x5e, 0xbd, 0xd6, 0x6a, 0x18, 0x0f, 0x0e, 0x5a, 0x0d, + 0x55, 0x41, 0x8f, 0xc2, 0x95, 0xbd, 0x7b, 0x3f, 0x6e, 0xb6, 0x8c, 0xfa, 0xde, 0xbd, 0xc6, 0x7e, + 0xcb, 0xa8, 0xb5, 0x5a, 0xb5, 0xfa, 0x7d, 0x35, 0xbe, 0xfd, 0x97, 0x1c, 0x24, 0x6b, 0x3b, 0xf5, + 0x7b, 0xa8, 0x0e, 0x49, 0x0e, 0xfb, 0x2f, 0xbc, 0x72, 0x51, 0xbd, 0xb8, 0xb7, 0x88, 0xee, 0x42, + 0x8a, 0x77, 0x04, 0xd0, 0xc5, 0x77, 0x30, 0xaa, 0x0b, 0x9a, 0x8d, 0x6c, 0x31, 0xfc, 0x0c, 0x5d, + 0x78, 0x29, 0xa3, 0x7a, 0x71, 0xef, 0x11, 0xed, 0x41, 0xc6, 0x03, 0x84, 0x8b, 0x6e, 0x4a, 0x54, + 0x17, 0x36, 0x04, 0xd9, 0xa7, 0x09, 0x60, 0x7d, 0xf1, 0x7d, 0x8d, 0xea, 0x82, 0xae, 0x24, 0xba, + 0x07, 0x69, 0x09, 0xa4, 0x16, 0x5c, 0xc1, 0xa8, 0x2e, 0xea, 0x33, 0x22, 0x1d, 0x72, 0x93, 0x96, + 0xc5, 0xe2, 0x5b, 0x28, 0xd5, 0x25, 0x1a, 0xae, 0xe8, 0x5d, 0x28, 0x86, 0x41, 0xda, 0x72, 0xd7, + 0x3c, 0xaa, 0x4b, 0x76, 0x34, 0x99, 0xfe, 0x30, 0x62, 0x5b, 0xee, 0xda, 0x47, 0x75, 0xc9, 0x06, + 0x27, 0x7a, 0x1f, 0x56, 0x66, 0x11, 0xd5, 0xf2, 0xb7, 0x40, 0xaa, 0x97, 0x68, 0x79, 0xa2, 0x01, + 0xa0, 0x39, 0x48, 0xec, 0x12, 0x97, 0x42, 0xaa, 0x97, 0xe9, 0x80, 0xa2, 0x0e, 0x94, 0xa7, 0xe1, + 0xcd, 0xb2, 0x97, 0x44, 0xaa, 0x4b, 0x77, 0x43, 0xc5, 0x2c, 0x61, 0x58, 0xb4, 0xec, 0xa5, 0x91, + 0xea, 0xd2, 0xcd, 0x51, 0xe6, 0x06, 0x61, 0x60, 0xb3, 0xdc, 0x25, 0x92, 0xea, 0x92, 0x9d, 0xd2, + 0x9d, 0xc6, 0xe7, 0x5f, 0xad, 0x29, 0x5f, 0x7c, 0xb5, 0xa6, 0xfc, 0xe3, 0xab, 0x35, 0xe5, 0x93, + 0xaf, 0xd7, 0x62, 0x5f, 0x7c, 0xbd, 0x16, 0xfb, 0xeb, 0xd7, 0x6b, 0xb1, 0x9f, 0x3c, 0xdb, 0x35, + 0x69, 0x6f, 0x74, 0xb2, 0xd9, 0xb6, 0x06, 0x5b, 0xc1, 0xdb, 0x6c, 0xf3, 0xee, 0xd0, 0x9d, 0xa4, + 0x79, 0xf2, 0x79, 0xf1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x45, 0x53, 0xe3, 0x57, 0x63, 0x27, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4871,10 +4871,10 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x28 } - if len(m.Misbehaviors) > 0 { - for iNdEx := len(m.Misbehaviors) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Misbehavior) > 0 { + for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Misbehaviors[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4966,10 +4966,10 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x22 } - if len(m.Misbehaviors) > 0 { - for iNdEx := len(m.Misbehaviors) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Misbehavior) > 0 { + for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Misbehaviors[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5056,10 +5056,10 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - if len(m.Misbehaviors) > 0 { - for iNdEx := len(m.Misbehaviors) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Misbehavior) > 0 { + for iNdEx := len(m.Misbehavior) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.Misbehaviors[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Misbehavior[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -7122,8 +7122,8 @@ func (m *RequestPrepareProposal) Size() (n int) { } l = m.LocalLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) - if len(m.Misbehaviors) > 0 { - for _, e := range m.Misbehaviors { + if len(m.Misbehavior) > 0 { + for _, e := range m.Misbehavior { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -7158,8 +7158,8 @@ func (m *RequestProcessProposal) Size() (n int) { } l = m.ProposedLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) - if len(m.Misbehaviors) > 0 { - for _, e := range m.Misbehaviors { + if len(m.Misbehavior) > 0 { + for _, e := range m.Misbehavior { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -7198,8 +7198,8 @@ func (m *RequestFinalizeBlock) Size() (n int) { } l = m.DecidedLastCommit.Size() n += 1 + l + sovTypes(uint64(l)) - if len(m.Misbehaviors) > 0 { - for _, e := range m.Misbehaviors { + if len(m.Misbehavior) > 0 { + for _, e := range m.Misbehavior { l = e.Size() n += 1 + l + sovTypes(uint64(l)) } @@ -9882,7 +9882,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehaviors", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9909,8 +9909,8 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehaviors = append(m.Misbehaviors, Misbehavior{}) - if err := m.Misbehaviors[len(m.Misbehaviors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10151,7 +10151,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehaviors", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10178,8 +10178,8 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehaviors = append(m.Misbehaviors, Misbehavior{}) - if err := m.Misbehaviors[len(m.Misbehaviors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10454,7 +10454,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Misbehaviors", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Misbehavior", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10481,8 +10481,8 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Misbehaviors = append(m.Misbehaviors, Misbehavior{}) - if err := m.Misbehaviors[len(m.Misbehaviors)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Misbehavior = append(m.Misbehavior, Misbehavior{}) + if err := m.Misbehavior[len(m.Misbehavior)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 6a750857f..6f11c63d6 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -128,7 +128,7 @@ message RequestPrepareProposal { // sent to the app for possible modifications. repeated bytes txs = 2; ExtendedCommitInfo local_last_commit = 3 [(gogoproto.nullable) = false]; - repeated Misbehavior misbehaviors = 4 [(gogoproto.nullable) = false]; + repeated Misbehavior misbehavior = 4 [(gogoproto.nullable) = false]; int64 height = 5; google.protobuf.Timestamp time = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes next_validators_hash = 7; @@ -139,7 +139,7 @@ message RequestPrepareProposal { message RequestProcessProposal { repeated bytes txs = 1; CommitInfo proposed_last_commit = 2 [(gogoproto.nullable) = false]; - repeated Misbehavior misbehaviors = 3 [(gogoproto.nullable) = false]; + repeated Misbehavior misbehavior = 3 [(gogoproto.nullable) = false]; // hash is the merkle root hash of the fields of the proposed block. bytes hash = 4; int64 height = 5; @@ -152,7 +152,7 @@ message RequestProcessProposal { message RequestFinalizeBlock { repeated bytes txs = 1; CommitInfo decided_last_commit = 2 [(gogoproto.nullable) = false]; - repeated Misbehavior misbehaviors = 3 [(gogoproto.nullable) = false]; + repeated Misbehavior misbehavior = 3 [(gogoproto.nullable) = false]; // hash is the merkle root hash of the fields of the decided block. bytes hash = 4; int64 height = 5; diff --git a/state/execution.go b/state/execution.go index 7671fb52c..aef814894 100644 --- a/state/execution.go +++ b/state/execution.go @@ -121,7 +121,7 @@ func (blockExec *BlockExecutor) CreateProposalBlock( MaxTxBytes: maxDataBytes, Txs: block.Txs.ToSliceOfBytes(), LocalLastCommit: extendedCommitInfo(localLastCommit, votes), - Misbehaviors: block.Evidence.Evidence.ToABCI(), + Misbehavior: block.Evidence.Evidence.ToABCI(), Height: block.Height, Time: block.Time, NextValidatorsHash: block.NextValidatorsHash, @@ -158,7 +158,7 @@ func (blockExec *BlockExecutor) ProcessProposal( Time: block.Header.Time, Txs: block.Data.Txs.ToSliceOfBytes(), ProposedLastCommit: buildLastCommitInfo(block, blockExec.store, state.InitialHeight), - Misbehaviors: block.Evidence.Evidence.ToABCI(), + Misbehavior: block.Evidence.Evidence.ToABCI(), ProposerAddress: block.ProposerAddress, NextValidatorsHash: block.NextValidatorsHash, }) @@ -344,7 +344,7 @@ func execBlockOnProxyApp( ProposerAddress: block.ProposerAddress, Height: block.Height, DecidedLastCommit: commitInfo, - Misbehaviors: block.Evidence.Evidence.ToABCI(), + Misbehavior: block.Evidence.Evidence.ToABCI(), Txs: block.Txs.ToSliceOfBytes(), }) if err != nil { diff --git a/state/execution_test.go b/state/execution_test.go index 5a5f96384..953d0a5de 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -83,7 +83,7 @@ func TestFinalizeBlockValidators(t *testing.T) { cc := proxy.NewLocalClientCreator(app) proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics()) err := proxyApp.Start() - require.Nil(t, err) + require.NoError(t, err) defer proxyApp.Stop() //nolint:errcheck // no need to check error again state, stateDB, _ := makeState(2, 2) @@ -142,13 +142,13 @@ func TestFinalizeBlockValidators(t *testing.T) { } } -// TestFinalizeBlockByzantineValidators ensures we send byzantine validators list. -func TestFinalizeBlockByzantineValidators(t *testing.T) { +// TestFinalizeBlockMisbehavior ensures we send misbehavior list. +func TestFinalizeBlockMisbehavior(t *testing.T) { app := &testApp{} cc := proxy.NewLocalClientCreator(app) proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics()) err := proxyApp.Start() - require.Nil(t, err) + require.NoError(t, err) defer proxyApp.Stop() //nolint:errcheck // ignore for tests state, stateDB, privVals := makeState(1, 1) @@ -247,8 +247,8 @@ func TestFinalizeBlockByzantineValidators(t *testing.T) { blockID = types.BlockID{Hash: block.Hash(), PartSetHeader: bps.Header()} - state, err = blockExec.ApplyBlock(state, blockID, block) - require.Nil(t, err) + _, err = blockExec.ApplyBlock(state, blockID, block) + require.NoError(t, err) // TODO check state and mempool assert.Equal(t, abciMb, app.Misbehavior) @@ -317,11 +317,11 @@ func TestProcessProposal(t *testing.T) { block1.Txs = txs expectedRpp := &abci.RequestProcessProposal{ - Txs: block1.Txs.ToSliceOfBytes(), - Hash: block1.Hash(), - Height: block1.Header.Height, - Time: block1.Header.Time, - Misbehaviors: block1.Evidence.Evidence.ToABCI(), + Txs: block1.Txs.ToSliceOfBytes(), + Hash: block1.Hash(), + Height: block1.Header.Height, + Time: block1.Header.Time, + Misbehavior: block1.Evidence.Evidence.ToABCI(), ProposedLastCommit: abci.CommitInfo{ Round: 0, Votes: voteInfos, @@ -467,13 +467,13 @@ func TestUpdateValidators(t *testing.T) { } } -// TestEndBlockValidatorUpdates ensures we update validator set and send an event. -func TestEndBlockValidatorUpdates(t *testing.T) { +// TestFinalizeBlockValidatorUpdates ensures we update validator set and send an event. +func TestFinalizeBlockValidatorUpdates(t *testing.T) { app := &testApp{} cc := proxy.NewLocalClientCreator(app) proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics()) err := proxyApp.Start() - require.Nil(t, err) + require.NoError(t, err) defer proxyApp.Stop() //nolint:errcheck // ignore for tests state, stateDB, _ := makeState(1, 1) @@ -530,7 +530,7 @@ func TestEndBlockValidatorUpdates(t *testing.T) { } state, err = blockExec.ApplyBlock(state, blockID, block) - require.Nil(t, err) + require.NoError(t, err) // test new validator was added to NextValidators if assert.Equal(t, state.Validators.Size()+1, state.NextValidators.Size()) { idx, _ := state.NextValidators.GetByAddress(pubkey.Address()) @@ -555,14 +555,14 @@ func TestEndBlockValidatorUpdates(t *testing.T) { } } -// TestEndBlockValidatorUpdatesResultingInEmptySet checks that processing validator updates that +// TestFinalizeBlockValidatorUpdatesResultingInEmptySet checks that processing validator updates that // would result in empty set causes no panic, an error is raised and NextValidators is not updated -func TestEndBlockValidatorUpdatesResultingInEmptySet(t *testing.T) { +func TestFinalizeBlockValidatorUpdatesResultingInEmptySet(t *testing.T) { app := &testApp{} cc := proxy.NewLocalClientCreator(app) proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics()) err := proxyApp.Start() - require.Nil(t, err) + require.NoError(t, err) defer proxyApp.Stop() //nolint:errcheck // ignore for tests state, stateDB, _ := makeState(1, 1) @@ -592,7 +592,7 @@ func TestEndBlockValidatorUpdatesResultingInEmptySet(t *testing.T) { } assert.NotPanics(t, func() { state, err = blockExec.ApplyBlock(state, blockID, block) }) - assert.NotNil(t, err) + assert.Error(t, err) assert.NotEmpty(t, state.NextValidators.Validators) } diff --git a/state/helpers_test.go b/state/helpers_test.go index d6cc34462..0e9652d2c 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -234,7 +234,7 @@ var _ abci.Application = (*testApp)(nil) func (app *testApp) FinalizeBlock(_ context.Context, req *abci.RequestFinalizeBlock) (*abci.ResponseFinalizeBlock, error) { app.CommitVotes = req.DecidedLastCommit.Votes - app.Misbehavior = req.Misbehaviors + app.Misbehavior = req.Misbehavior txResults := make([]*abci.ExecTxResult, len(req.Txs)) for idx := range req.Txs { txResults[idx] = &abci.ExecTxResult{