From 59a17b28a7bb3ee5daae4a22007903c68984b28d Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Wed, 8 Jul 2020 15:49:50 +0200 Subject: [PATCH] proto: improve enums (#5099) Fixes some minor issues with Protobuf enums, not likely to break anything. Branched off of #5096, rebase to `master` before merging. --- abci/types/types.pb.go | 409 ++++++++++++------------ proto/tendermint/abci/types/types.proto | 22 +- proto/tendermint/consensus/msgs.pb.go | 6 +- proto/tendermint/types/canonical.pb.go | 4 +- proto/tendermint/types/types.pb.go | 208 ++++++------ proto/tendermint/types/types.proto | 16 +- statesync/syncer.go | 2 +- statesync/syncer_test.go | 34 +- types/vote_test.go | 4 +- 9 files changed, 358 insertions(+), 347 deletions(-) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 9ea7ba125..3a01d35b2 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -62,27 +62,30 @@ func (CheckTxType) EnumDescriptor() ([]byte, []int) { type ResponseOfferSnapshot_Result int32 const ( - ResponseOfferSnapshot_ACCEPT ResponseOfferSnapshot_Result = 0 - ResponseOfferSnapshot_ABORT ResponseOfferSnapshot_Result = 1 - ResponseOfferSnapshot_REJECT ResponseOfferSnapshot_Result = 2 - ResponseOfferSnapshot_REJECT_FORMAT ResponseOfferSnapshot_Result = 3 - ResponseOfferSnapshot_REJECT_SENDER ResponseOfferSnapshot_Result = 4 + ResponseOfferSnapshot_UNKNOWN ResponseOfferSnapshot_Result = 0 + ResponseOfferSnapshot_ACCEPT ResponseOfferSnapshot_Result = 1 + ResponseOfferSnapshot_ABORT ResponseOfferSnapshot_Result = 2 + ResponseOfferSnapshot_REJECT ResponseOfferSnapshot_Result = 3 + ResponseOfferSnapshot_REJECT_FORMAT ResponseOfferSnapshot_Result = 4 + ResponseOfferSnapshot_REJECT_SENDER ResponseOfferSnapshot_Result = 5 ) var ResponseOfferSnapshot_Result_name = map[int32]string{ - 0: "ACCEPT", - 1: "ABORT", - 2: "REJECT", - 3: "REJECT_FORMAT", - 4: "REJECT_SENDER", + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "ABORT", + 3: "REJECT", + 4: "REJECT_FORMAT", + 5: "REJECT_SENDER", } var ResponseOfferSnapshot_Result_value = map[string]int32{ - "ACCEPT": 0, - "ABORT": 1, - "REJECT": 2, - "REJECT_FORMAT": 3, - "REJECT_SENDER": 4, + "UNKNOWN": 0, + "ACCEPT": 1, + "ABORT": 2, + "REJECT": 3, + "REJECT_FORMAT": 4, + "REJECT_SENDER": 5, } func (x ResponseOfferSnapshot_Result) String() string { @@ -96,27 +99,30 @@ func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { type ResponseApplySnapshotChunk_Result int32 const ( - ResponseApplySnapshotChunk_ACCEPT ResponseApplySnapshotChunk_Result = 0 - ResponseApplySnapshotChunk_ABORT ResponseApplySnapshotChunk_Result = 1 - ResponseApplySnapshotChunk_RETRY ResponseApplySnapshotChunk_Result = 2 - ResponseApplySnapshotChunk_RETRY_SNAPSHOT ResponseApplySnapshotChunk_Result = 3 - ResponseApplySnapshotChunk_REJECT_SNAPSHOT ResponseApplySnapshotChunk_Result = 4 + ResponseApplySnapshotChunk_UNKNOWN ResponseApplySnapshotChunk_Result = 0 + ResponseApplySnapshotChunk_ACCEPT ResponseApplySnapshotChunk_Result = 1 + ResponseApplySnapshotChunk_ABORT ResponseApplySnapshotChunk_Result = 2 + ResponseApplySnapshotChunk_RETRY ResponseApplySnapshotChunk_Result = 3 + ResponseApplySnapshotChunk_RETRY_SNAPSHOT ResponseApplySnapshotChunk_Result = 4 + ResponseApplySnapshotChunk_REJECT_SNAPSHOT ResponseApplySnapshotChunk_Result = 5 ) var ResponseApplySnapshotChunk_Result_name = map[int32]string{ - 0: "ACCEPT", - 1: "ABORT", - 2: "RETRY", - 3: "RETRY_SNAPSHOT", - 4: "REJECT_SNAPSHOT", + 0: "UNKNOWN", + 1: "ACCEPT", + 2: "ABORT", + 3: "RETRY", + 4: "RETRY_SNAPSHOT", + 5: "REJECT_SNAPSHOT", } var ResponseApplySnapshotChunk_Result_value = map[string]int32{ - "ACCEPT": 0, - "ABORT": 1, - "RETRY": 2, - "RETRY_SNAPSHOT": 3, - "REJECT_SNAPSHOT": 4, + "UNKNOWN": 0, + "ACCEPT": 1, + "ABORT": 2, + "RETRY": 3, + "RETRY_SNAPSHOT": 4, + "REJECT_SNAPSHOT": 5, } func (x ResponseApplySnapshotChunk_Result) String() string { @@ -2307,7 +2313,7 @@ func (m *ResponseOfferSnapshot) GetResult() ResponseOfferSnapshot_Result { if m != nil { return m.Result } - return ResponseOfferSnapshot_ACCEPT + return ResponseOfferSnapshot_UNKNOWN } type ResponseLoadSnapshotChunk struct { @@ -2397,7 +2403,7 @@ func (m *ResponseApplySnapshotChunk) GetResult() ResponseApplySnapshotChunk_Resu if m != nil { return m.Result } - return ResponseApplySnapshotChunk_ACCEPT + return ResponseApplySnapshotChunk_UNKNOWN } func (m *ResponseApplySnapshotChunk) GetRefetchChunks() []uint32 { @@ -3143,175 +3149,176 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types/types.proto", fileDescriptor_59fda1d591595b39) } var fileDescriptor_59fda1d591595b39 = []byte{ - // 2680 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5b, 0x6f, 0x1b, 0xc7, - 0xf5, 0xe7, 0x92, 0x14, 0x2f, 0x47, 0x22, 0x45, 0x8d, 0x1d, 0x87, 0xe1, 0xdf, 0xb1, 0x9c, 0x75, - 0x9c, 0x38, 0x97, 0x3f, 0x95, 0x28, 0x40, 0x10, 0xd7, 0x69, 0x53, 0x91, 0xa1, 0x4b, 0xd5, 0x8e, - 0xa4, 0xac, 0x24, 0x27, 0x69, 0x81, 0x6c, 0x87, 0xbb, 0x23, 0x72, 0x23, 0x72, 0x77, 0xc3, 0x1d, - 0x2a, 0x62, 0xd1, 0x87, 0xa2, 0x40, 0x51, 0x34, 0x4f, 0xee, 0x07, 0xc8, 0x77, 0xe8, 0x43, 0x81, - 0xf4, 0x0b, 0x14, 0xc8, 0x63, 0x1e, 0xfb, 0x94, 0x16, 0x49, 0x9f, 0xda, 0xef, 0x50, 0x14, 0x73, - 0xd9, 0x1b, 0xaf, 0xcb, 0xd4, 0x6f, 0x7d, 0x11, 0x66, 0x86, 0xe7, 0x9c, 0xd9, 0x39, 0x33, 0xf3, - 0x3b, 0xbf, 0x73, 0x46, 0xf0, 0x1c, 0x25, 0xb6, 0x49, 0x86, 0x03, 0xcb, 0xa6, 0x3b, 0xb8, 0x63, - 0x58, 0x3b, 0x74, 0xec, 0x12, 0x4f, 0xfc, 0xad, 0xbb, 0x43, 0x87, 0x3a, 0xe8, 0xa9, 0x50, 0xa4, - 0xce, 0x44, 0xea, 0xfc, 0xc7, 0xda, 0xf3, 0x11, 0x4d, 0x63, 0x38, 0x76, 0xa9, 0xb3, 0x33, 0x20, - 0xc3, 0xf3, 0x3e, 0x89, 0x2a, 0xd7, 0xae, 0x47, 0xa4, 0xa6, 0x4c, 0xd7, 0xd4, 0x69, 0x1b, 0xe7, - 0x64, 0x1c, 0x97, 0x79, 0x76, 0xca, 0x82, 0x8b, 0x87, 0x78, 0xe0, 0xff, 0xbc, 0xdd, 0x75, 0x9c, - 0x6e, 0x9f, 0xec, 0xf0, 0x5e, 0x67, 0x74, 0xb6, 0x43, 0xad, 0x01, 0xf1, 0x28, 0x1e, 0xb8, 0x52, - 0xe0, 0x6a, 0xd7, 0xe9, 0x3a, 0xbc, 0xb9, 0xc3, 0x5a, 0x62, 0x54, 0xfd, 0x57, 0x01, 0xf2, 0x1a, - 0xf9, 0x74, 0x44, 0x3c, 0x8a, 0xde, 0x82, 0x2c, 0x31, 0x7a, 0x4e, 0x35, 0x7d, 0x53, 0xb9, 0xb3, - 0xbe, 0xab, 0xd6, 0x67, 0xae, 0xb7, 0x2e, 0xa5, 0x5b, 0x46, 0xcf, 0x69, 0xa7, 0x34, 0xae, 0x81, - 0xee, 0xc1, 0xda, 0x59, 0x7f, 0xe4, 0xf5, 0xaa, 0x19, 0xae, 0x7a, 0x6b, 0xb1, 0xea, 0x7d, 0x26, - 0xda, 0x4e, 0x69, 0x42, 0x87, 0x4d, 0x6b, 0xd9, 0x67, 0x4e, 0x35, 0x9b, 0x64, 0xda, 0x7d, 0xfb, - 0x8c, 0x4f, 0xcb, 0x34, 0x50, 0x1b, 0xc0, 0x23, 0x54, 0x77, 0x5c, 0x6a, 0x39, 0x76, 0x75, 0x8d, - 0xeb, 0xbf, 0xb8, 0x58, 0xff, 0x98, 0xd0, 0x43, 0x2e, 0xde, 0x4e, 0x69, 0x45, 0xcf, 0xef, 0x30, - 0x4b, 0x96, 0x6d, 0x51, 0xdd, 0xe8, 0x61, 0xcb, 0xae, 0xe6, 0x92, 0x58, 0xda, 0xb7, 0x2d, 0xda, - 0x64, 0xe2, 0xcc, 0x92, 0xe5, 0x77, 0x98, 0x2b, 0x3e, 0x1d, 0x91, 0xe1, 0xb8, 0x9a, 0x4f, 0xe2, - 0x8a, 0xf7, 0x99, 0x28, 0x73, 0x05, 0xd7, 0x41, 0x0f, 0x60, 0xbd, 0x43, 0xba, 0x96, 0xad, 0x77, - 0xfa, 0x8e, 0x71, 0x5e, 0x2d, 0x70, 0x13, 0x77, 0x16, 0x9b, 0x68, 0x30, 0x85, 0x06, 0x93, 0x6f, - 0xa7, 0x34, 0xe8, 0x04, 0x3d, 0xd4, 0x80, 0x82, 0xd1, 0x23, 0xc6, 0xb9, 0x4e, 0x2f, 0xab, 0x45, - 0x6e, 0xe9, 0xf6, 0x62, 0x4b, 0x4d, 0x26, 0x7d, 0x72, 0xd9, 0x4e, 0x69, 0x79, 0x43, 0x34, 0x99, - 0x5f, 0x4c, 0xd2, 0xb7, 0x2e, 0xc8, 0x90, 0x59, 0xb9, 0x92, 0xc4, 0x2f, 0xef, 0x0a, 0x79, 0x6e, - 0xa7, 0x68, 0xfa, 0x1d, 0xd4, 0x82, 0x22, 0xb1, 0x4d, 0xb9, 0xb0, 0x75, 0x6e, 0xe8, 0x85, 0x25, - 0x27, 0xcc, 0x36, 0xfd, 0x65, 0x15, 0x88, 0x6c, 0xa3, 0x1f, 0x41, 0xce, 0x70, 0x06, 0x03, 0x8b, - 0x56, 0x37, 0xb8, 0x8d, 0xe7, 0x97, 0x2c, 0x89, 0xcb, 0xb6, 0x53, 0x9a, 0xd4, 0x42, 0x27, 0x50, - 0xee, 0x5b, 0x1e, 0xd5, 0x3d, 0x1b, 0xbb, 0x5e, 0xcf, 0xa1, 0x5e, 0xb5, 0xc4, 0xed, 0xbc, 0xb2, - 0xd8, 0xce, 0x43, 0xcb, 0xa3, 0xc7, 0xbe, 0x4a, 0x3b, 0xa5, 0x95, 0xfa, 0xd1, 0x01, 0x66, 0xd5, - 0x39, 0x3b, 0x23, 0xc3, 0xc0, 0x6c, 0xb5, 0x9c, 0xc4, 0xea, 0x21, 0xd3, 0xf1, 0xad, 0x30, 0xab, - 0x4e, 0x74, 0x00, 0x61, 0xb8, 0xd2, 0x77, 0xb0, 0x19, 0x18, 0xd5, 0x8d, 0xde, 0xc8, 0x3e, 0xaf, - 0x6e, 0x72, 0xd3, 0x3b, 0x4b, 0x3e, 0xd8, 0xc1, 0xa6, 0x6f, 0xa8, 0xc9, 0xd4, 0xda, 0x29, 0x6d, - 0xab, 0x3f, 0x39, 0x88, 0x4c, 0xb8, 0x8a, 0x5d, 0xb7, 0x3f, 0x9e, 0x9c, 0xa3, 0xc2, 0xe7, 0x78, - 0x6d, 0xf1, 0x1c, 0x7b, 0x4c, 0x73, 0x72, 0x12, 0x84, 0xa7, 0x46, 0x1b, 0x79, 0x58, 0xbb, 0xc0, - 0xfd, 0x11, 0x51, 0x5f, 0x84, 0xf5, 0x08, 0x7c, 0xa0, 0x2a, 0xe4, 0x07, 0xc4, 0xf3, 0x70, 0x97, - 0x54, 0x95, 0x9b, 0xca, 0x9d, 0xa2, 0xe6, 0x77, 0xd5, 0x32, 0x6c, 0x44, 0xc1, 0x42, 0x1d, 0x04, - 0x8a, 0x0c, 0x00, 0x98, 0xe2, 0x05, 0x19, 0x7a, 0xec, 0xd6, 0x4b, 0x45, 0xd9, 0x45, 0xb7, 0xa0, - 0xc4, 0x8f, 0x98, 0xee, 0xff, 0xce, 0xc0, 0x2c, 0xab, 0x6d, 0xf0, 0xc1, 0x47, 0x52, 0x68, 0x1b, - 0xd6, 0xdd, 0x5d, 0x37, 0x10, 0xc9, 0x70, 0x11, 0x70, 0x77, 0x5d, 0x29, 0xa0, 0xfe, 0x00, 0x2a, - 0x93, 0x78, 0x81, 0x2a, 0x90, 0x39, 0x27, 0x63, 0x39, 0x1f, 0x6b, 0xa2, 0xab, 0x72, 0x59, 0x7c, - 0x8e, 0xa2, 0x26, 0xd7, 0xf8, 0xc7, 0x74, 0xa0, 0x1c, 0x40, 0x04, 0xc3, 0x38, 0x86, 0xc7, 0x5c, - 0x7b, 0x7d, 0xb7, 0x56, 0x17, 0x60, 0x5d, 0xf7, 0xc1, 0xba, 0x7e, 0xe2, 0x83, 0x75, 0xa3, 0xf0, - 0xd5, 0x37, 0xdb, 0xa9, 0xc7, 0x7f, 0xdb, 0x56, 0x34, 0xae, 0x81, 0x9e, 0x61, 0xb7, 0x18, 0x5b, - 0xb6, 0x6e, 0x99, 0x72, 0x9e, 0x3c, 0xef, 0xef, 0x9b, 0xe8, 0x7d, 0xa8, 0x18, 0x8e, 0xed, 0x11, - 0xdb, 0x1b, 0x79, 0xba, 0x08, 0x06, 0x12, 0x80, 0xe7, 0xdd, 0xac, 0xa6, 0x2f, 0x7e, 0xc4, 0xa5, - 0xb5, 0x4d, 0x23, 0x3e, 0x80, 0x1e, 0x02, 0x5c, 0xe0, 0xbe, 0x65, 0x62, 0xea, 0x0c, 0xbd, 0x6a, - 0xf6, 0x66, 0x66, 0x81, 0xb1, 0x47, 0xbe, 0xe0, 0xa9, 0x6b, 0x62, 0x4a, 0x1a, 0x59, 0xf6, 0xe5, - 0x5a, 0x44, 0x1f, 0xbd, 0x00, 0x9b, 0xd8, 0x75, 0x75, 0x8f, 0x62, 0x4a, 0xf4, 0xce, 0x98, 0x12, - 0x8f, 0x83, 0xf4, 0x86, 0x56, 0xc2, 0xae, 0x7b, 0xcc, 0x46, 0x1b, 0x6c, 0x50, 0x35, 0x83, 0xdd, - 0xe6, 0x78, 0x88, 0x10, 0x64, 0x4d, 0x4c, 0x31, 0xf7, 0xd6, 0x86, 0xc6, 0xdb, 0x6c, 0xcc, 0xc5, - 0xb4, 0x27, 0x7d, 0xc0, 0xdb, 0xe8, 0x1a, 0xe4, 0x7a, 0xc4, 0xea, 0xf6, 0x28, 0x5f, 0x76, 0x46, - 0x93, 0x3d, 0xb6, 0x31, 0xee, 0xd0, 0xb9, 0x20, 0x3c, 0xa4, 0x14, 0x34, 0xd1, 0x51, 0x1f, 0xa7, - 0x61, 0x6b, 0x0a, 0x33, 0x99, 0xdd, 0x1e, 0xf6, 0x7a, 0xfe, 0x5c, 0xac, 0x8d, 0xde, 0x64, 0x76, - 0xb1, 0x49, 0x86, 0x32, 0x14, 0x56, 0xa3, 0x1e, 0x10, 0x8b, 0x6f, 0xf3, 0xdf, 0xe5, 0x9a, 0xa5, - 0x34, 0x3a, 0x85, 0x4a, 0x1f, 0x7b, 0x54, 0x17, 0x58, 0xa3, 0xf3, 0xa8, 0x96, 0x59, 0x88, 0xbc, - 0x0f, 0xb1, 0x8f, 0x51, 0xec, 0x5c, 0x4b, 0x73, 0xe5, 0x7e, 0x6c, 0x14, 0x7d, 0x08, 0x57, 0x3b, - 0xe3, 0x5f, 0x62, 0x9b, 0x5a, 0x36, 0xd1, 0xa7, 0xb6, 0x67, 0x7b, 0x8e, 0xe9, 0xd6, 0x85, 0x65, - 0x12, 0xdb, 0xf0, 0xf7, 0xe5, 0x4a, 0x60, 0x22, 0xd8, 0x37, 0x4f, 0xfd, 0x10, 0xca, 0x71, 0xec, - 0x47, 0x65, 0x48, 0xd3, 0x4b, 0xe9, 0x8c, 0x34, 0xbd, 0x44, 0x6f, 0x42, 0x96, 0x99, 0xe3, 0x8e, - 0x28, 0xcf, 0x0d, 0xce, 0x52, 0xfb, 0x64, 0xec, 0x12, 0x8d, 0xcb, 0xab, 0x6a, 0x70, 0x09, 0x82, - 0x78, 0x30, 0x69, 0x5b, 0x7d, 0x09, 0x36, 0x27, 0xa0, 0x3e, 0xb2, 0xa3, 0x4a, 0x74, 0x47, 0xd5, - 0x4d, 0x28, 0xc5, 0x10, 0x5d, 0xbd, 0x06, 0x57, 0x67, 0x41, 0xb3, 0x6a, 0x07, 0xe3, 0x31, 0x70, - 0x45, 0xf7, 0xa0, 0x10, 0x60, 0xb3, 0xb8, 0x84, 0xf3, 0xfc, 0xe6, 0xab, 0x68, 0x81, 0x02, 0xbb, - 0x83, 0xec, 0x1c, 0xf3, 0x73, 0x92, 0xe6, 0x9f, 0x9f, 0xc7, 0xae, 0xdb, 0xc6, 0x5e, 0x4f, 0xfd, - 0x05, 0x54, 0xe7, 0x21, 0xee, 0xc4, 0x62, 0xb2, 0xc1, 0xf1, 0xbc, 0x06, 0xb9, 0x33, 0x67, 0x38, - 0xc0, 0x94, 0x1b, 0x2b, 0x69, 0xb2, 0xc7, 0x8e, 0xad, 0x40, 0xdf, 0x0c, 0x1f, 0x16, 0x1d, 0x55, - 0x87, 0x67, 0xe6, 0xe2, 0x2d, 0x53, 0xb1, 0x6c, 0x93, 0x08, 0xaf, 0x96, 0x34, 0xd1, 0x09, 0x0d, - 0x89, 0x8f, 0x15, 0x1d, 0x36, 0xad, 0xc7, 0x57, 0xcc, 0xed, 0x17, 0x35, 0xd9, 0x53, 0xff, 0x52, - 0x84, 0x82, 0x46, 0x3c, 0x97, 0x41, 0x01, 0x6a, 0x43, 0x91, 0x5c, 0x1a, 0x44, 0x30, 0x2a, 0x65, - 0x09, 0xff, 0x10, 0x3a, 0x2d, 0x5f, 0x9e, 0x05, 0xfc, 0x40, 0x19, 0xdd, 0x8d, 0xb1, 0xc9, 0x5b, - 0xcb, 0x8c, 0x44, 0xe9, 0xe4, 0xdb, 0x71, 0x3a, 0xf9, 0xfc, 0x12, 0xdd, 0x09, 0x3e, 0x79, 0x37, - 0xc6, 0x27, 0x97, 0x4d, 0x1c, 0x23, 0x94, 0xfb, 0x33, 0x08, 0xe5, 0xb2, 0xe5, 0xcf, 0x61, 0x94, - 0xfb, 0x33, 0x18, 0xe5, 0x9d, 0xa5, 0xdf, 0x32, 0x93, 0x52, 0xbe, 0x1d, 0xa7, 0x94, 0xcb, 0xdc, - 0x31, 0xc1, 0x29, 0x1f, 0xce, 0xe2, 0x94, 0x2f, 0x2d, 0xb1, 0x31, 0x97, 0x54, 0x36, 0xa7, 0x48, - 0xe5, 0x0b, 0x4b, 0x4c, 0xcd, 0x60, 0x95, 0xfb, 0x31, 0x56, 0x09, 0x89, 0x7c, 0x33, 0x87, 0x56, - 0xde, 0x9f, 0xa6, 0x95, 0x2f, 0x2e, 0x3b, 0x6a, 0xb3, 0x78, 0xe5, 0x3b, 0x13, 0xbc, 0xf2, 0xf6, - 0xb2, 0x55, 0x4d, 0x12, 0xcb, 0xd3, 0x39, 0xc4, 0xf2, 0xd5, 0x25, 0x86, 0x96, 0x30, 0xcb, 0xd3, - 0x39, 0xcc, 0x72, 0x99, 0xd9, 0x25, 0xd4, 0xb2, 0xb3, 0x88, 0x5a, 0xbe, 0xb6, 0xec, 0x93, 0x93, - 0x71, 0x4b, 0xb2, 0x90, 0x5b, 0xbe, 0xbe, 0x64, 0x92, 0xd5, 0xc9, 0xe5, 0x4b, 0x2c, 0xbc, 0x4f, - 0x40, 0x12, 0x83, 0x42, 0x32, 0x1c, 0x3a, 0x43, 0xc9, 0xdb, 0x44, 0x47, 0xbd, 0xc3, 0x08, 0x47, - 0x08, 0x3c, 0x0b, 0x88, 0x28, 0x0f, 0x3c, 0x11, 0x98, 0x51, 0xff, 0xac, 0x84, 0xba, 0x3c, 0x3a, - 0x47, 0xc9, 0x4a, 0x51, 0x92, 0x95, 0x08, 0x3f, 0x4d, 0xc7, 0xf9, 0xe9, 0x36, 0xac, 0xb3, 0x50, - 0x32, 0x41, 0x3d, 0xb1, 0xeb, 0x53, 0x4f, 0xf4, 0x32, 0x6c, 0x71, 0x0e, 0x21, 0x58, 0xac, 0x8c, - 0x1f, 0x59, 0x1e, 0x0c, 0x37, 0xd9, 0x0f, 0xe2, 0xe8, 0x8a, 0x40, 0xf2, 0xff, 0x70, 0x25, 0x22, - 0x1b, 0x84, 0x28, 0xc1, 0xb1, 0x2a, 0x81, 0xf4, 0x9e, 0x8c, 0x55, 0xef, 0x85, 0x0e, 0x0a, 0x69, - 0x2d, 0x82, 0xac, 0xe1, 0x98, 0x44, 0x06, 0x10, 0xde, 0x66, 0x54, 0xb7, 0xef, 0x74, 0x65, 0x98, - 0x60, 0x4d, 0x26, 0x15, 0x60, 0x6a, 0x51, 0x80, 0xa5, 0xfa, 0x27, 0x25, 0xb4, 0x17, 0x32, 0xdd, - 0x59, 0xa4, 0x54, 0x79, 0x92, 0xa4, 0x34, 0xfd, 0xdf, 0x91, 0x52, 0xf5, 0xdf, 0x4a, 0xb8, 0xa5, - 0x01, 0xdd, 0xfc, 0x7e, 0x2e, 0x08, 0xc3, 0xef, 0x1a, 0xdf, 0x20, 0x19, 0x7e, 0x65, 0xa6, 0x90, - 0xe3, 0xdb, 0x10, 0xcf, 0x14, 0xf2, 0x22, 0x20, 0xf3, 0x0e, 0x7a, 0x07, 0x8a, 0xee, 0xd0, 0x71, - 0xce, 0x74, 0xc7, 0xf5, 0x24, 0x2e, 0xc7, 0x08, 0x96, 0xa8, 0x04, 0xd5, 0x45, 0x35, 0xa9, 0x7e, - 0xc4, 0x44, 0x0f, 0x5d, 0x4f, 0x2b, 0xb8, 0xb2, 0x15, 0x21, 0x18, 0xc5, 0x18, 0xff, 0xbd, 0x0e, - 0x45, 0xb6, 0x08, 0xcf, 0xc5, 0x06, 0xe1, 0xf0, 0x5a, 0xd4, 0xc2, 0x01, 0xd5, 0x04, 0x34, 0x0d, - 0xf3, 0xe8, 0x00, 0x72, 0xe4, 0x82, 0xd8, 0x94, 0xed, 0x16, 0x73, 0xf0, 0xf5, 0xb9, 0xb4, 0x92, - 0xd8, 0xb4, 0x51, 0x65, 0x6e, 0xfd, 0xe7, 0x37, 0xdb, 0x15, 0xa1, 0xf3, 0xaa, 0x33, 0xb0, 0x28, - 0x19, 0xb8, 0x74, 0xac, 0x49, 0x2b, 0xea, 0xef, 0xd2, 0x8c, 0xdd, 0xc5, 0x42, 0xc0, 0x4c, 0x47, - 0xfb, 0xd7, 0x27, 0x1d, 0xe1, 0xfa, 0xc9, 0x9c, 0xff, 0x2c, 0x40, 0x17, 0x7b, 0xfa, 0x67, 0xd8, - 0xa6, 0xc4, 0x94, 0x3b, 0x50, 0xec, 0x62, 0xef, 0x03, 0x3e, 0xc0, 0x48, 0x1b, 0xfb, 0x79, 0xe4, - 0x11, 0x93, 0x6f, 0x45, 0x46, 0xcb, 0x77, 0xb1, 0x77, 0xea, 0x11, 0x33, 0xb2, 0xd6, 0xfc, 0x93, - 0x58, 0x6b, 0xdc, 0xdf, 0x85, 0x49, 0x7f, 0xff, 0x3e, 0x1d, 0xde, 0x93, 0x90, 0x0c, 0xff, 0x6f, - 0xfa, 0xe2, 0x0b, 0x9e, 0x1c, 0xc7, 0xe3, 0x30, 0xfa, 0x08, 0xb6, 0x82, 0xfb, 0xa9, 0x8f, 0xf8, - 0xbd, 0xf5, 0x4f, 0xe1, 0x6a, 0xd7, 0xbc, 0x72, 0x11, 0x1f, 0xf6, 0xd0, 0xc7, 0xf0, 0xf4, 0x04, - 0x1a, 0x05, 0x13, 0xa4, 0x57, 0x02, 0xa5, 0xa7, 0xe2, 0xa0, 0xe4, 0xdb, 0x0f, 0xbd, 0x97, 0x79, - 0x22, 0xb7, 0x66, 0x9f, 0x25, 0x64, 0x51, 0x86, 0x31, 0xf3, 0x4c, 0xdc, 0x82, 0xd2, 0x90, 0x50, - 0x6c, 0xd9, 0x7a, 0x2c, 0xfd, 0xdd, 0x10, 0x83, 0x22, 0x38, 0xa8, 0x8f, 0xe0, 0xa9, 0x99, 0x1c, - 0x03, 0xfd, 0x10, 0x8a, 0x21, 0x49, 0x51, 0x16, 0xe6, 0x90, 0x41, 0x2e, 0x14, 0x6a, 0xa8, 0x5f, - 0x2a, 0xa1, 0xe1, 0x78, 0x8e, 0xf5, 0x00, 0x72, 0x43, 0xe2, 0x8d, 0xfa, 0x22, 0xdf, 0x29, 0xef, - 0xbe, 0xb1, 0x0a, 0x47, 0x61, 0xa3, 0xa3, 0x3e, 0xd5, 0xa4, 0x09, 0xf5, 0x7d, 0xc8, 0x89, 0x11, - 0x04, 0x90, 0xdb, 0x6b, 0x36, 0x5b, 0x47, 0x27, 0x95, 0x14, 0x2a, 0xc2, 0xda, 0x5e, 0xe3, 0x50, - 0x3b, 0xa9, 0x28, 0x6c, 0x58, 0x6b, 0xfd, 0xb4, 0xd5, 0x3c, 0xa9, 0xa4, 0xd1, 0x16, 0x94, 0x44, - 0x5b, 0xbf, 0x7f, 0xa8, 0xbd, 0xb7, 0x77, 0x52, 0xc9, 0x44, 0x86, 0x8e, 0x5b, 0x07, 0xef, 0xb6, - 0xb4, 0x4a, 0x56, 0x7d, 0x9d, 0x65, 0x52, 0x73, 0x28, 0x4c, 0x98, 0x33, 0x29, 0x91, 0x9c, 0x49, - 0xfd, 0x43, 0x1a, 0x6a, 0xf3, 0x19, 0x09, 0x3a, 0x9a, 0x58, 0xf1, 0x5b, 0x2b, 0x93, 0x9a, 0x89, - 0x65, 0xa3, 0xdb, 0x50, 0x1e, 0x92, 0x33, 0x42, 0x8d, 0x9e, 0x60, 0x4b, 0x22, 0xde, 0x95, 0xb4, - 0x92, 0x1c, 0xe5, 0x4a, 0x9e, 0x10, 0xfb, 0x84, 0x18, 0x54, 0x17, 0x49, 0x9c, 0x38, 0x7f, 0x45, - 0x26, 0xc6, 0x46, 0x8f, 0xc5, 0xa0, 0x7a, 0xbc, 0xcc, 0x89, 0x45, 0x58, 0xd3, 0x5a, 0x27, 0xda, - 0x47, 0x95, 0x34, 0x42, 0x50, 0xe6, 0x4d, 0xfd, 0xf8, 0x60, 0xef, 0xe8, 0xb8, 0x7d, 0xc8, 0x9c, - 0x78, 0x05, 0x36, 0x7d, 0x27, 0xfa, 0x83, 0x59, 0xf5, 0xb7, 0x69, 0xd8, 0x9c, 0xb8, 0x1e, 0xe8, - 0x2d, 0x58, 0x13, 0x14, 0x5c, 0x59, 0x58, 0xc4, 0xe7, 0xf7, 0x5d, 0xde, 0x28, 0xa1, 0x80, 0xde, - 0x86, 0x02, 0x91, 0x95, 0x0a, 0x79, 0x25, 0x6f, 0x4e, 0x57, 0x5b, 0xfc, 0x5a, 0x86, 0x54, 0x0d, - 0x34, 0x58, 0x08, 0x0d, 0xee, 0xbc, 0xcc, 0x16, 0x9f, 0x9b, 0x56, 0x0f, 0xd0, 0x42, 0xea, 0x87, - 0x3a, 0xe8, 0x6e, 0xc8, 0xd4, 0xb2, 0xd3, 0x65, 0x01, 0xa9, 0x2e, 0x04, 0xa4, 0xb2, 0x2f, 0xaf, - 0x36, 0x61, 0x3d, 0xb2, 0x1e, 0xf4, 0x7f, 0x50, 0x1c, 0xe0, 0x4b, 0x59, 0xe6, 0x12, 0xd5, 0x8b, - 0xc2, 0x00, 0x5f, 0xf2, 0x0a, 0x17, 0x7a, 0x1a, 0xf2, 0xec, 0xc7, 0x2e, 0x16, 0xb8, 0x93, 0xd1, - 0x72, 0x03, 0x7c, 0xf9, 0x13, 0xec, 0xa9, 0x06, 0x94, 0xe3, 0x35, 0x20, 0x76, 0x10, 0x87, 0xce, - 0xc8, 0x36, 0xb9, 0x8d, 0x35, 0x4d, 0x74, 0xd0, 0x3d, 0x58, 0xbb, 0x70, 0x04, 0x6c, 0x2d, 0xba, - 0xb0, 0x8f, 0x1c, 0x4a, 0x22, 0x95, 0x24, 0xa1, 0xa3, 0x1e, 0x40, 0x99, 0x03, 0xd0, 0x1e, 0xa5, - 0x43, 0xab, 0x33, 0xa2, 0x24, 0x5a, 0xcc, 0xdc, 0x98, 0x51, 0xcc, 0x0c, 0x28, 0x4a, 0x40, 0x70, - 0x32, 0xa2, 0x92, 0xc6, 0x3b, 0xea, 0xaf, 0x15, 0x58, 0xe3, 0x06, 0x19, 0x3a, 0xf1, 0xf2, 0x90, - 0x24, 0xbf, 0xac, 0x8d, 0x0c, 0x00, 0xec, 0x4f, 0xe4, 0x7f, 0xef, 0xed, 0x45, 0xb8, 0x18, 0x7c, - 0x56, 0xe3, 0xba, 0x04, 0xc8, 0xab, 0xa1, 0x81, 0x08, 0x48, 0x46, 0xcc, 0xaa, 0x8f, 0x15, 0x28, - 0x9c, 0x5c, 0xca, 0xc3, 0x3d, 0xa7, 0x6a, 0x14, 0x7e, 0x7d, 0x3a, 0x5a, 0x1d, 0x11, 0x65, 0xa8, - 0x4c, 0x50, 0xe2, 0xba, 0x1f, 0x5c, 0xe2, 0xec, 0x6a, 0x99, 0xa8, 0x5f, 0xfd, 0x93, 0x88, 0x75, - 0x0f, 0x8a, 0xc1, 0x41, 0x63, 0x19, 0x00, 0x36, 0xcd, 0x21, 0xf1, 0x3c, 0xe9, 0x64, 0xbf, 0xcb, - 0x8b, 0x93, 0xce, 0x67, 0xb2, 0x0a, 0x93, 0xd1, 0x44, 0x47, 0xb5, 0x60, 0x73, 0x22, 0xa6, 0xa1, - 0x1f, 0x43, 0xde, 0x1d, 0x75, 0x74, 0x7f, 0x9f, 0x26, 0x4e, 0xb6, 0x24, 0x87, 0xe7, 0x64, 0xec, - 0xd5, 0x8f, 0x46, 0x9d, 0xbe, 0x65, 0x3c, 0x20, 0x63, 0xff, 0x8b, 0xdc, 0x51, 0xe7, 0x81, 0xd8, - 0x53, 0x31, 0x55, 0x3a, 0x3a, 0xd5, 0xaf, 0xa0, 0xe0, 0x1f, 0x13, 0xf4, 0x6e, 0xf4, 0xfe, 0x28, - 0xd3, 0xd7, 0x6f, 0x56, 0xc8, 0x95, 0x93, 0x44, 0x2e, 0xd1, 0xcb, 0xb0, 0xe5, 0x59, 0x5d, 0x9b, - 0x98, 0x7a, 0x98, 0x8e, 0xf0, 0x39, 0x0b, 0xda, 0xa6, 0xf8, 0xe1, 0xa1, 0x9f, 0x8b, 0xa8, 0xff, - 0x50, 0xa0, 0xe0, 0x5f, 0xe7, 0x99, 0xc7, 0x27, 0xf6, 0x49, 0xe9, 0xef, 0xfb, 0x49, 0xf3, 0x4a, - 0xc3, 0x7e, 0x21, 0x3e, 0xbb, 0x72, 0x21, 0xfe, 0x55, 0x40, 0xd4, 0xa1, 0xb8, 0xaf, 0x5f, 0x38, - 0xd4, 0xb2, 0xbb, 0xba, 0xf0, 0xac, 0xa0, 0x5a, 0x15, 0xfe, 0xcb, 0x23, 0xfe, 0xc3, 0x11, 0x77, - 0xf2, 0x6f, 0x14, 0x28, 0x04, 0x81, 0x71, 0xd5, 0x42, 0xe0, 0x35, 0xc8, 0x49, 0xf0, 0x17, 0x95, - 0x40, 0xd9, 0x0b, 0x6a, 0xd5, 0xd9, 0x48, 0xad, 0xba, 0x06, 0x85, 0x01, 0xa1, 0x98, 0x73, 0x04, - 0x91, 0xf8, 0x05, 0xfd, 0x97, 0xef, 0xc2, 0x7a, 0xa4, 0x32, 0xcb, 0x2e, 0xfd, 0x41, 0xeb, 0x83, - 0x4a, 0xaa, 0x96, 0xff, 0xfc, 0x8b, 0x9b, 0x99, 0x03, 0xf2, 0x19, 0x3b, 0xa5, 0x5a, 0xab, 0xd9, - 0x6e, 0x35, 0x1f, 0x54, 0x94, 0xda, 0xfa, 0xe7, 0x5f, 0xdc, 0xcc, 0x6b, 0x84, 0x17, 0x69, 0x76, - 0xbf, 0x5c, 0x87, 0xcd, 0xbd, 0x46, 0x73, 0x9f, 0x45, 0x2c, 0xcb, 0xc0, 0x3c, 0x55, 0x3c, 0x84, - 0x2c, 0xcf, 0x96, 0x13, 0xbc, 0x0c, 0xd7, 0x92, 0xd4, 0xfb, 0x90, 0x06, 0x6b, 0x3c, 0xa9, 0x46, - 0x49, 0x1e, 0x8c, 0x6b, 0x89, 0xca, 0x80, 0xec, 0x23, 0xf9, 0xc9, 0x4e, 0xf0, 0x8e, 0x5c, 0x4b, - 0x52, 0x1b, 0x44, 0x1f, 0x43, 0x31, 0xcc, 0x96, 0x93, 0xbe, 0x2e, 0xd7, 0x12, 0x57, 0x0d, 0x99, - 0xfd, 0x30, 0x2b, 0x48, 0xfa, 0xb6, 0x5a, 0x4b, 0x0c, 0x52, 0xe8, 0x43, 0xc8, 0xfb, 0xf9, 0x57, - 0xb2, 0xf7, 0xdf, 0x5a, 0xc2, 0x8a, 0x1e, 0xdb, 0x3e, 0x91, 0x40, 0x27, 0x79, 0xe4, 0xae, 0x25, - 0x2a, 0x5b, 0xa2, 0x53, 0xc8, 0x49, 0xe2, 0x9b, 0xe8, 0x65, 0xb7, 0x96, 0xac, 0x4e, 0xc7, 0x9c, - 0x1c, 0x96, 0x28, 0x92, 0x3e, 0xec, 0xd7, 0x12, 0xd7, 0x6b, 0x11, 0x06, 0x88, 0xe4, 0xd2, 0x89, - 0x5f, 0xec, 0x6b, 0xc9, 0xeb, 0xb0, 0xe8, 0xe7, 0x50, 0x08, 0x32, 0xa6, 0x84, 0x2f, 0xe7, 0xb5, - 0xa4, 0xa5, 0x50, 0xf4, 0x09, 0x94, 0xe2, 0x49, 0xc2, 0x2a, 0xef, 0xe1, 0xb5, 0x95, 0x6a, 0x9c, - 0x6c, 0xae, 0x78, 0xde, 0xb0, 0xca, 0x2b, 0x79, 0x6d, 0xa5, 0xc2, 0x27, 0xba, 0x80, 0xad, 0x69, - 0xaa, 0xbf, 0xea, 0xd3, 0x79, 0x6d, 0xe5, 0x82, 0x28, 0x1a, 0x03, 0x9a, 0x91, 0x2e, 0xac, 0xfc, - 0x9e, 0x5e, 0x5b, 0xbd, 0x4a, 0xda, 0x68, 0x7d, 0xf5, 0xed, 0x0d, 0xe5, 0xeb, 0x6f, 0x6f, 0x28, - 0x7f, 0xff, 0xf6, 0x86, 0xf2, 0xf8, 0xbb, 0x1b, 0xa9, 0xaf, 0xbf, 0xbb, 0x91, 0xfa, 0xeb, 0x77, - 0x37, 0x52, 0x3f, 0x7b, 0xa5, 0x6b, 0xd1, 0xde, 0xa8, 0x53, 0x37, 0x9c, 0xc1, 0x4e, 0xf4, 0x9f, - 0x89, 0x66, 0xfd, 0xe7, 0x53, 0x27, 0xc7, 0x43, 0xe2, 0x1b, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x15, 0xe2, 0x06, 0xdc, 0x19, 0x25, 0x00, 0x00, + // 2691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5b, 0x73, 0x23, 0xc5, + 0x15, 0xd6, 0xe8, 0xae, 0x63, 0x5b, 0x96, 0x7b, 0x97, 0x45, 0x28, 0xcb, 0x7a, 0x99, 0x65, 0x61, + 0xb9, 0x44, 0x86, 0xa5, 0x8a, 0x62, 0xb3, 0x24, 0xc4, 0x12, 0xda, 0xc8, 0xf1, 0x62, 0x9b, 0xb1, + 0xbd, 0x40, 0x52, 0xc5, 0xd0, 0x9a, 0x69, 0x4b, 0x83, 0xa5, 0x99, 0x41, 0xd3, 0x32, 0x56, 0x2a, + 0x0f, 0xa9, 0x54, 0xa5, 0x52, 0xe1, 0x69, 0xff, 0x00, 0xf9, 0x0d, 0x79, 0x48, 0x55, 0xf2, 0x03, + 0x92, 0x2a, 0x1e, 0x79, 0xcc, 0x13, 0x49, 0x41, 0x9e, 0x92, 0xff, 0x90, 0x4a, 0xf5, 0x65, 0x6e, + 0xba, 0x8e, 0x08, 0x6f, 0x79, 0x71, 0x75, 0xb7, 0xce, 0x39, 0x3d, 0x7d, 0xba, 0xfb, 0x3b, 0xdf, + 0x39, 0x6d, 0x78, 0x86, 0x12, 0xdb, 0x24, 0xc3, 0x81, 0x65, 0xd3, 0x1d, 0xdc, 0x31, 0xac, 0x1d, + 0x3a, 0x76, 0x89, 0x27, 0xfe, 0xd6, 0xdd, 0xa1, 0x43, 0x1d, 0xf4, 0x44, 0x28, 0x52, 0x67, 0x22, + 0x75, 0xfe, 0x63, 0xed, 0xd9, 0x88, 0xa6, 0x31, 0x1c, 0xbb, 0xd4, 0xd9, 0x19, 0x90, 0xe1, 0x79, + 0x9f, 0x44, 0x95, 0x6b, 0xd7, 0x23, 0x52, 0x53, 0xa6, 0x6b, 0xea, 0xb4, 0x8d, 0x73, 0x32, 0x8e, + 0xcb, 0x3c, 0x3d, 0x65, 0xc1, 0xc5, 0x43, 0x3c, 0xf0, 0x7f, 0xde, 0xee, 0x3a, 0x4e, 0xb7, 0x4f, + 0x76, 0x78, 0xaf, 0x33, 0x3a, 0xdb, 0xa1, 0xd6, 0x80, 0x78, 0x14, 0x0f, 0x5c, 0x29, 0x70, 0xb5, + 0xeb, 0x74, 0x1d, 0xde, 0xdc, 0x61, 0x2d, 0x31, 0xaa, 0xfe, 0xbb, 0x08, 0x05, 0x8d, 0x7c, 0x32, + 0x22, 0x1e, 0x45, 0x6f, 0x40, 0x96, 0x18, 0x3d, 0xa7, 0x9a, 0xbe, 0xa9, 0xdc, 0x59, 0xbb, 0xab, + 0xd6, 0x67, 0xae, 0xb7, 0x2e, 0xa5, 0x5b, 0x46, 0xcf, 0x69, 0xa7, 0x34, 0xae, 0x81, 0xee, 0x43, + 0xee, 0xac, 0x3f, 0xf2, 0x7a, 0xd5, 0x0c, 0x57, 0xbd, 0xb5, 0x58, 0xf5, 0x01, 0x13, 0x6d, 0xa7, + 0x34, 0xa1, 0xc3, 0xa6, 0xb5, 0xec, 0x33, 0xa7, 0x9a, 0x4d, 0x32, 0xed, 0x9e, 0x7d, 0xc6, 0xa7, + 0x65, 0x1a, 0xa8, 0x0d, 0xe0, 0x11, 0xaa, 0x3b, 0x2e, 0xb5, 0x1c, 0xbb, 0x9a, 0xe3, 0xfa, 0xcf, + 0x2f, 0xd6, 0x3f, 0x26, 0xf4, 0x90, 0x8b, 0xb7, 0x53, 0x5a, 0xc9, 0xf3, 0x3b, 0xcc, 0x92, 0x65, + 0x5b, 0x54, 0x37, 0x7a, 0xd8, 0xb2, 0xab, 0xf9, 0x24, 0x96, 0xf6, 0x6c, 0x8b, 0x36, 0x99, 0x38, + 0xb3, 0x64, 0xf9, 0x1d, 0xe6, 0x8a, 0x4f, 0x46, 0x64, 0x38, 0xae, 0x16, 0x92, 0xb8, 0xe2, 0x5d, + 0x26, 0xca, 0x5c, 0xc1, 0x75, 0xd0, 0x3e, 0xac, 0x75, 0x48, 0xd7, 0xb2, 0xf5, 0x4e, 0xdf, 0x31, + 0xce, 0xab, 0x45, 0x6e, 0xe2, 0xce, 0x62, 0x13, 0x0d, 0xa6, 0xd0, 0x60, 0xf2, 0xed, 0x94, 0x06, + 0x9d, 0xa0, 0x87, 0x1a, 0x50, 0x34, 0x7a, 0xc4, 0x38, 0xd7, 0xe9, 0x65, 0xb5, 0xc4, 0x2d, 0xdd, + 0x5e, 0x6c, 0xa9, 0xc9, 0xa4, 0x4f, 0x2e, 0xdb, 0x29, 0xad, 0x60, 0x88, 0x26, 0xf3, 0x8b, 0x49, + 0xfa, 0xd6, 0x05, 0x19, 0x32, 0x2b, 0x57, 0x92, 0xf8, 0xe5, 0x6d, 0x21, 0xcf, 0xed, 0x94, 0x4c, + 0xbf, 0x83, 0x5a, 0x50, 0x22, 0xb6, 0x29, 0x17, 0xb6, 0xc6, 0x0d, 0x3d, 0xb7, 0xe4, 0x84, 0xd9, + 0xa6, 0xbf, 0xac, 0x22, 0x91, 0x6d, 0xf4, 0x23, 0xc8, 0x1b, 0xce, 0x60, 0x60, 0xd1, 0xea, 0x3a, + 0xb7, 0xf1, 0xec, 0x92, 0x25, 0x71, 0xd9, 0x76, 0x4a, 0x93, 0x5a, 0xe8, 0x04, 0xca, 0x7d, 0xcb, + 0xa3, 0xba, 0x67, 0x63, 0xd7, 0xeb, 0x39, 0xd4, 0xab, 0x6e, 0x70, 0x3b, 0x2f, 0x2d, 0xb6, 0xf3, + 0xd0, 0xf2, 0xe8, 0xb1, 0xaf, 0xd2, 0x4e, 0x69, 0x1b, 0xfd, 0xe8, 0x00, 0xb3, 0xea, 0x9c, 0x9d, + 0x91, 0x61, 0x60, 0xb6, 0x5a, 0x4e, 0x62, 0xf5, 0x90, 0xe9, 0xf8, 0x56, 0x98, 0x55, 0x27, 0x3a, + 0x80, 0x30, 0x5c, 0xe9, 0x3b, 0xd8, 0x0c, 0x8c, 0xea, 0x46, 0x6f, 0x64, 0x9f, 0x57, 0x37, 0xb9, + 0xe9, 0x9d, 0x25, 0x1f, 0xec, 0x60, 0xd3, 0x37, 0xd4, 0x64, 0x6a, 0xed, 0x94, 0xb6, 0xd5, 0x9f, + 0x1c, 0x44, 0x26, 0x5c, 0xc5, 0xae, 0xdb, 0x1f, 0x4f, 0xce, 0x51, 0xe1, 0x73, 0xbc, 0xb2, 0x78, + 0x8e, 0x5d, 0xa6, 0x39, 0x39, 0x09, 0xc2, 0x53, 0xa3, 0x8d, 0x02, 0xe4, 0x2e, 0x70, 0x7f, 0x44, + 0xd4, 0xe7, 0x61, 0x2d, 0x02, 0x1f, 0xa8, 0x0a, 0x85, 0x01, 0xf1, 0x3c, 0xdc, 0x25, 0x55, 0xe5, + 0xa6, 0x72, 0xa7, 0xa4, 0xf9, 0x5d, 0xb5, 0x0c, 0xeb, 0x51, 0xb0, 0x50, 0x07, 0x81, 0x22, 0x03, + 0x00, 0xa6, 0x78, 0x41, 0x86, 0x1e, 0xbb, 0xf5, 0x52, 0x51, 0x76, 0xd1, 0x2d, 0xd8, 0xe0, 0x47, + 0x4c, 0xf7, 0x7f, 0x67, 0x60, 0x96, 0xd5, 0xd6, 0xf9, 0xe0, 0x23, 0x29, 0xb4, 0x0d, 0x6b, 0xee, + 0x5d, 0x37, 0x10, 0xc9, 0x70, 0x11, 0x70, 0xef, 0xba, 0x52, 0x40, 0xfd, 0x01, 0x54, 0x26, 0xf1, + 0x02, 0x55, 0x20, 0x73, 0x4e, 0xc6, 0x72, 0x3e, 0xd6, 0x44, 0x57, 0xe5, 0xb2, 0xf8, 0x1c, 0x25, + 0x4d, 0xae, 0xf1, 0x0f, 0xe9, 0x40, 0x39, 0x80, 0x08, 0x86, 0x71, 0x0c, 0x8f, 0xb9, 0xf6, 0xda, + 0xdd, 0x5a, 0x5d, 0x80, 0x75, 0xdd, 0x07, 0xeb, 0xfa, 0x89, 0x0f, 0xd6, 0x8d, 0xe2, 0x17, 0x5f, + 0x6d, 0xa7, 0x1e, 0xff, 0x7d, 0x5b, 0xd1, 0xb8, 0x06, 0x7a, 0x8a, 0xdd, 0x62, 0x6c, 0xd9, 0xba, + 0x65, 0xca, 0x79, 0x0a, 0xbc, 0xbf, 0x67, 0xa2, 0x77, 0xa1, 0x62, 0x38, 0xb6, 0x47, 0x6c, 0x6f, + 0xe4, 0xe9, 0x22, 0x18, 0x48, 0x00, 0x9e, 0x77, 0xb3, 0x9a, 0xbe, 0xf8, 0x11, 0x97, 0xd6, 0x36, + 0x8d, 0xf8, 0x00, 0x7a, 0x08, 0x70, 0x81, 0xfb, 0x96, 0x89, 0xa9, 0x33, 0xf4, 0xaa, 0xd9, 0x9b, + 0x99, 0x05, 0xc6, 0x1e, 0xf9, 0x82, 0xa7, 0xae, 0x89, 0x29, 0x69, 0x64, 0xd9, 0x97, 0x6b, 0x11, + 0x7d, 0xf4, 0x1c, 0x6c, 0x62, 0xd7, 0xd5, 0x3d, 0x8a, 0x29, 0xd1, 0x3b, 0x63, 0x4a, 0x3c, 0x0e, + 0xd2, 0xeb, 0xda, 0x06, 0x76, 0xdd, 0x63, 0x36, 0xda, 0x60, 0x83, 0xaa, 0x19, 0xec, 0x36, 0xc7, + 0x43, 0x84, 0x20, 0x6b, 0x62, 0x8a, 0xb9, 0xb7, 0xd6, 0x35, 0xde, 0x66, 0x63, 0x2e, 0xa6, 0x3d, + 0xe9, 0x03, 0xde, 0x46, 0xd7, 0x20, 0xdf, 0x23, 0x56, 0xb7, 0x47, 0xf9, 0xb2, 0x33, 0x9a, 0xec, + 0xb1, 0x8d, 0x71, 0x87, 0xce, 0x05, 0xe1, 0x21, 0xa5, 0xa8, 0x89, 0x8e, 0xfa, 0x38, 0x0d, 0x5b, + 0x53, 0x98, 0xc9, 0xec, 0xf6, 0xb0, 0xd7, 0xf3, 0xe7, 0x62, 0x6d, 0xf4, 0x3a, 0xb3, 0x8b, 0x4d, + 0x32, 0x94, 0xa1, 0xb0, 0x1a, 0xf5, 0x80, 0x58, 0x7c, 0x9b, 0xff, 0x2e, 0xd7, 0x2c, 0xa5, 0xd1, + 0x29, 0x54, 0xfa, 0xd8, 0xa3, 0xba, 0xc0, 0x1a, 0x9d, 0x47, 0xb5, 0xcc, 0x42, 0xe4, 0x7d, 0x88, + 0x7d, 0x8c, 0x62, 0xe7, 0x5a, 0x9a, 0x2b, 0xf7, 0x63, 0xa3, 0xe8, 0x7d, 0xb8, 0xda, 0x19, 0xff, + 0x02, 0xdb, 0xd4, 0xb2, 0x89, 0x3e, 0xb5, 0x3d, 0xdb, 0x73, 0x4c, 0xb7, 0x2e, 0x2c, 0x93, 0xd8, + 0x86, 0xbf, 0x2f, 0x57, 0x02, 0x13, 0xc1, 0xbe, 0x79, 0xea, 0xfb, 0x50, 0x8e, 0x63, 0x3f, 0x2a, + 0x43, 0x9a, 0x5e, 0x4a, 0x67, 0xa4, 0xe9, 0x25, 0x7a, 0x1d, 0xb2, 0xcc, 0x1c, 0x77, 0x44, 0x79, + 0x6e, 0x70, 0x96, 0xda, 0x27, 0x63, 0x97, 0x68, 0x5c, 0x5e, 0x55, 0x83, 0x4b, 0x10, 0xc4, 0x83, + 0x49, 0xdb, 0xea, 0x0b, 0xb0, 0x39, 0x01, 0xf5, 0x91, 0x1d, 0x55, 0xa2, 0x3b, 0xaa, 0x6e, 0xc2, + 0x46, 0x0c, 0xd1, 0xd5, 0x6b, 0x70, 0x75, 0x16, 0x34, 0xab, 0x76, 0x30, 0x1e, 0x03, 0x57, 0x74, + 0x1f, 0x8a, 0x01, 0x36, 0x8b, 0x4b, 0x38, 0xcf, 0x6f, 0xbe, 0x8a, 0x16, 0x28, 0xb0, 0x3b, 0xc8, + 0xce, 0x31, 0x3f, 0x27, 0x69, 0xfe, 0xf9, 0x05, 0xec, 0xba, 0x6d, 0xec, 0xf5, 0xd4, 0x8f, 0xa0, + 0x3a, 0x0f, 0x71, 0x27, 0x16, 0x93, 0x0d, 0x8e, 0xe7, 0x35, 0xc8, 0x9f, 0x39, 0xc3, 0x01, 0xa6, + 0xdc, 0xd8, 0x86, 0x26, 0x7b, 0xec, 0xd8, 0x0a, 0xf4, 0xcd, 0xf0, 0x61, 0xd1, 0x51, 0x75, 0x78, + 0x6a, 0x2e, 0xde, 0x32, 0x15, 0xcb, 0x36, 0x89, 0xf0, 0xea, 0x86, 0x26, 0x3a, 0xa1, 0x21, 0xf1, + 0xb1, 0xa2, 0xc3, 0xa6, 0xf5, 0xf8, 0x8a, 0xb9, 0xfd, 0x92, 0x26, 0x7b, 0xea, 0x5f, 0x4b, 0x50, + 0xd4, 0x88, 0xe7, 0x32, 0x28, 0x40, 0x6d, 0x28, 0x91, 0x4b, 0x83, 0x08, 0x46, 0xa5, 0x2c, 0xe1, + 0x1f, 0x42, 0xa7, 0xe5, 0xcb, 0xb3, 0x80, 0x1f, 0x28, 0xa3, 0x7b, 0x31, 0x36, 0x79, 0x6b, 0x99, + 0x91, 0x28, 0x9d, 0x7c, 0x33, 0x4e, 0x27, 0x9f, 0x5d, 0xa2, 0x3b, 0xc1, 0x27, 0xef, 0xc5, 0xf8, + 0xe4, 0xb2, 0x89, 0x63, 0x84, 0x72, 0x6f, 0x06, 0xa1, 0x5c, 0xb6, 0xfc, 0x39, 0x8c, 0x72, 0x6f, + 0x06, 0xa3, 0xbc, 0xb3, 0xf4, 0x5b, 0x66, 0x52, 0xca, 0x37, 0xe3, 0x94, 0x72, 0x99, 0x3b, 0x26, + 0x38, 0xe5, 0xc3, 0x59, 0x9c, 0xf2, 0x85, 0x25, 0x36, 0xe6, 0x92, 0xca, 0xe6, 0x14, 0xa9, 0x7c, + 0x6e, 0x89, 0xa9, 0x19, 0xac, 0x72, 0x2f, 0xc6, 0x2a, 0x21, 0x91, 0x6f, 0xe6, 0xd0, 0xca, 0x07, + 0xd3, 0xb4, 0xf2, 0xf9, 0x65, 0x47, 0x6d, 0x16, 0xaf, 0x7c, 0x6b, 0x82, 0x57, 0xde, 0x5e, 0xb6, + 0xaa, 0x49, 0x62, 0x79, 0x3a, 0x87, 0x58, 0xbe, 0xbc, 0xc4, 0xd0, 0x12, 0x66, 0x79, 0x3a, 0x87, + 0x59, 0x2e, 0x33, 0xbb, 0x84, 0x5a, 0x76, 0x16, 0x51, 0xcb, 0x57, 0x96, 0x7d, 0x72, 0x32, 0x6e, + 0x49, 0x16, 0x72, 0xcb, 0x57, 0x97, 0x4c, 0xb2, 0x3a, 0xb9, 0x7c, 0x81, 0x85, 0xf7, 0x09, 0x48, + 0x62, 0x50, 0x48, 0x86, 0x43, 0x67, 0x28, 0x79, 0x9b, 0xe8, 0xa8, 0x77, 0x18, 0xe1, 0x08, 0x81, + 0x67, 0x01, 0x11, 0xe5, 0x81, 0x27, 0x02, 0x33, 0xea, 0x9f, 0x95, 0x50, 0x97, 0x47, 0xe7, 0x28, + 0x59, 0x29, 0x49, 0xb2, 0x12, 0xe1, 0xa7, 0xe9, 0x38, 0x3f, 0xdd, 0x86, 0x35, 0x16, 0x4a, 0x26, + 0xa8, 0x27, 0x76, 0x7d, 0xea, 0x89, 0x5e, 0x84, 0x2d, 0xce, 0x21, 0x04, 0x8b, 0x95, 0xf1, 0x23, + 0xcb, 0x83, 0xe1, 0x26, 0xfb, 0x41, 0x1c, 0x5d, 0x11, 0x48, 0xbe, 0x0f, 0x57, 0x22, 0xb2, 0x41, + 0x88, 0x12, 0x1c, 0xab, 0x12, 0x48, 0xef, 0xca, 0x58, 0xf5, 0x4e, 0xe8, 0xa0, 0x90, 0xd6, 0x22, + 0xc8, 0x1a, 0x8e, 0x49, 0x64, 0x00, 0xe1, 0x6d, 0x46, 0x75, 0xfb, 0x4e, 0x57, 0x86, 0x09, 0xd6, + 0x64, 0x52, 0x01, 0xa6, 0x96, 0x04, 0x58, 0xaa, 0x7f, 0x54, 0x42, 0x7b, 0x21, 0xd3, 0x9d, 0x45, + 0x4a, 0x95, 0xef, 0x92, 0x94, 0xa6, 0xff, 0x37, 0x52, 0xaa, 0xfe, 0x47, 0x09, 0xb7, 0x34, 0xa0, + 0x9b, 0xdf, 0xce, 0x05, 0x61, 0xf8, 0xcd, 0xf1, 0x0d, 0x92, 0xe1, 0x57, 0x66, 0x0a, 0x79, 0xbe, + 0x0d, 0xf1, 0x4c, 0xa1, 0x20, 0x02, 0x32, 0xef, 0xa0, 0xb7, 0xa0, 0xe4, 0x0e, 0x1d, 0xe7, 0x4c, + 0x77, 0x5c, 0x4f, 0xe2, 0x72, 0x8c, 0x60, 0x89, 0x4a, 0x50, 0x5d, 0x54, 0x93, 0xea, 0x47, 0x4c, + 0xf4, 0xd0, 0xf5, 0xb4, 0xa2, 0x2b, 0x5b, 0x11, 0x82, 0x51, 0x8a, 0xf1, 0xdf, 0xeb, 0x50, 0x62, + 0x8b, 0xf0, 0x5c, 0x6c, 0x10, 0x0e, 0xaf, 0x25, 0x2d, 0x1c, 0x50, 0x4d, 0x40, 0xd3, 0x30, 0x8f, + 0x0e, 0x20, 0x4f, 0x2e, 0x88, 0x4d, 0xd9, 0x6e, 0x31, 0x07, 0x5f, 0x9f, 0x4b, 0x2b, 0x89, 0x4d, + 0x1b, 0x55, 0xe6, 0xd6, 0x7f, 0x7d, 0xb5, 0x5d, 0x11, 0x3a, 0x2f, 0x3b, 0x03, 0x8b, 0x92, 0x81, + 0x4b, 0xc7, 0x9a, 0xb4, 0xa2, 0xfe, 0x36, 0xcd, 0xd8, 0x5d, 0x2c, 0x04, 0xcc, 0x74, 0xb4, 0x7f, + 0x7d, 0xd2, 0x11, 0xae, 0x9f, 0xcc, 0xf9, 0x4f, 0x03, 0x74, 0xb1, 0xa7, 0x7f, 0x8a, 0x6d, 0x4a, + 0x4c, 0xb9, 0x03, 0xa5, 0x2e, 0xf6, 0xde, 0xe3, 0x03, 0x8c, 0xb4, 0xb1, 0x9f, 0x47, 0x1e, 0x31, + 0xf9, 0x56, 0x64, 0xb4, 0x42, 0x17, 0x7b, 0xa7, 0x1e, 0x31, 0x23, 0x6b, 0x2d, 0x7c, 0x17, 0x6b, + 0x8d, 0xfb, 0xbb, 0x38, 0xe9, 0xef, 0xdf, 0xa5, 0xc3, 0x7b, 0x12, 0x92, 0xe1, 0xff, 0x4f, 0x5f, + 0x7c, 0xce, 0x93, 0xe3, 0x78, 0x1c, 0x46, 0x1f, 0xc0, 0x56, 0x70, 0x3f, 0xf5, 0x11, 0xbf, 0xb7, + 0xfe, 0x29, 0x5c, 0xed, 0x9a, 0x57, 0x2e, 0xe2, 0xc3, 0x1e, 0xfa, 0x10, 0x9e, 0x9c, 0x40, 0xa3, + 0x60, 0x82, 0xf4, 0x4a, 0xa0, 0xf4, 0x44, 0x1c, 0x94, 0x7c, 0xfb, 0xa1, 0xf7, 0x32, 0xdf, 0xc9, + 0xad, 0xd9, 0x63, 0x09, 0x59, 0x94, 0x61, 0xcc, 0x3c, 0x13, 0xb7, 0x60, 0x63, 0x48, 0x28, 0xb6, + 0x6c, 0x3d, 0x96, 0xfe, 0xae, 0x8b, 0x41, 0x11, 0x1c, 0xd4, 0x47, 0xf0, 0xc4, 0x4c, 0x8e, 0x81, + 0x7e, 0x08, 0xa5, 0x90, 0xa4, 0x28, 0x0b, 0x73, 0xc8, 0x20, 0x17, 0x0a, 0x35, 0xd4, 0xbf, 0x28, + 0xa1, 0xe1, 0x78, 0x8e, 0xb5, 0x0f, 0xf9, 0x21, 0xf1, 0x46, 0x7d, 0x91, 0xef, 0x94, 0xef, 0xbe, + 0xb6, 0x0a, 0x47, 0x61, 0xa3, 0xa3, 0x3e, 0xd5, 0xa4, 0x09, 0xf5, 0x43, 0xc8, 0x8b, 0x11, 0xb4, + 0x06, 0x85, 0xd3, 0x83, 0xfd, 0x83, 0xc3, 0xf7, 0x0e, 0x2a, 0x29, 0x04, 0x90, 0xdf, 0x6d, 0x36, + 0x5b, 0x47, 0x27, 0x15, 0x05, 0x95, 0x20, 0xb7, 0xdb, 0x38, 0xd4, 0x4e, 0x2a, 0x69, 0x36, 0xac, + 0xb5, 0x7e, 0xda, 0x6a, 0x9e, 0x54, 0x32, 0x68, 0x0b, 0x36, 0x44, 0x5b, 0x7f, 0x70, 0xa8, 0xbd, + 0xb3, 0x7b, 0x52, 0xc9, 0x46, 0x86, 0x8e, 0x5b, 0x07, 0x6f, 0xb7, 0xb4, 0x4a, 0x4e, 0x7d, 0x95, + 0xa5, 0x55, 0x73, 0xf8, 0x4c, 0x98, 0x40, 0x29, 0x91, 0x04, 0x4a, 0xfd, 0x7d, 0x1a, 0x6a, 0xf3, + 0xe9, 0x09, 0x3a, 0x9a, 0x58, 0xfe, 0x1b, 0x2b, 0x33, 0x9c, 0x09, 0x1f, 0xa0, 0xdb, 0x50, 0x1e, + 0x92, 0x33, 0x42, 0x8d, 0x9e, 0xa0, 0x4e, 0x22, 0xf8, 0x6d, 0x68, 0x1b, 0x72, 0x94, 0x2b, 0x79, + 0x42, 0xec, 0x63, 0x62, 0x50, 0x5d, 0x64, 0x74, 0xe2, 0x30, 0x96, 0x98, 0x18, 0x1b, 0x3d, 0x16, + 0x83, 0xea, 0x47, 0x2b, 0x79, 0xb4, 0x04, 0x39, 0xad, 0x75, 0xa2, 0x7d, 0x50, 0xc9, 0x20, 0x04, + 0x65, 0xde, 0xd4, 0x8f, 0x0f, 0x76, 0x8f, 0x8e, 0xdb, 0x87, 0xcc, 0xa3, 0x57, 0x60, 0xd3, 0xf7, + 0xa8, 0x3f, 0x98, 0x53, 0x7f, 0x93, 0x86, 0xcd, 0x89, 0x8b, 0x83, 0xde, 0x80, 0x9c, 0x20, 0xe7, + 0xca, 0xc2, 0xf2, 0x3e, 0x47, 0x02, 0x79, 0xd7, 0x84, 0x02, 0x7a, 0x13, 0x8a, 0x44, 0xd6, 0x30, + 0xe4, 0x65, 0xbd, 0x39, 0x5d, 0x87, 0xf1, 0xab, 0x1c, 0x52, 0x35, 0xd0, 0x60, 0xc1, 0x35, 0x40, + 0x03, 0x99, 0x47, 0x3e, 0x33, 0xad, 0x1e, 0xe0, 0x88, 0xd4, 0x0f, 0x75, 0xd0, 0xbd, 0x90, 0xc3, + 0x65, 0xa7, 0x0b, 0x06, 0x52, 0x5d, 0x08, 0x48, 0x65, 0x5f, 0x5e, 0x6d, 0xc2, 0x5a, 0x64, 0x3d, + 0xe8, 0x7b, 0x50, 0x1a, 0xe0, 0x4b, 0x59, 0x00, 0x13, 0x75, 0x8d, 0xe2, 0x00, 0x5f, 0xf2, 0xda, + 0x17, 0x7a, 0x12, 0x0a, 0xec, 0xc7, 0x2e, 0x16, 0x88, 0x94, 0xd1, 0xf2, 0x03, 0x7c, 0xf9, 0x13, + 0xec, 0xa9, 0x06, 0x94, 0xe3, 0xd5, 0x21, 0x76, 0x2a, 0x87, 0xce, 0xc8, 0x36, 0xb9, 0x8d, 0x9c, + 0x26, 0x3a, 0xe8, 0x3e, 0xe4, 0x2e, 0x1c, 0x01, 0x68, 0x8b, 0xae, 0xf2, 0x23, 0x87, 0x92, 0x48, + 0x8d, 0x49, 0xe8, 0xa8, 0x07, 0x50, 0xe6, 0xd0, 0xb4, 0x4b, 0xe9, 0xd0, 0xea, 0x8c, 0x28, 0x89, + 0x96, 0x39, 0xd7, 0x67, 0x94, 0x39, 0x03, 0xf2, 0x12, 0x50, 0x9f, 0x8c, 0xa8, 0xb1, 0xf1, 0x8e, + 0xfa, 0x2b, 0x05, 0x72, 0xdc, 0x20, 0xc3, 0x2d, 0x5e, 0x38, 0x92, 0xb4, 0x98, 0xb5, 0x91, 0x01, + 0x80, 0xfd, 0x89, 0xfc, 0xef, 0xbd, 0xbd, 0x08, 0x31, 0x83, 0xcf, 0x6a, 0x5c, 0x97, 0xd0, 0x79, + 0x35, 0x34, 0x10, 0x81, 0xcf, 0x88, 0x59, 0xf5, 0xb1, 0x02, 0xc5, 0x93, 0x4b, 0x79, 0xd2, 0xe7, + 0xd4, 0x93, 0xc2, 0xaf, 0x4f, 0x47, 0xeb, 0x26, 0xa2, 0x40, 0x95, 0x09, 0x8a, 0x5f, 0x0f, 0x82, + 0x1b, 0x9d, 0x5d, 0x2d, 0x47, 0xf5, 0xeb, 0x82, 0x12, 0xcb, 0xee, 0x43, 0x29, 0x38, 0x68, 0x2c, + 0x37, 0xc0, 0xa6, 0x39, 0x24, 0x9e, 0x27, 0x9d, 0xec, 0x77, 0x79, 0xd9, 0xd2, 0xf9, 0x54, 0xd6, + 0x67, 0x32, 0x9a, 0xe8, 0xa8, 0x16, 0x6c, 0x4e, 0x44, 0x3b, 0xf4, 0x63, 0x28, 0xb8, 0xa3, 0x8e, + 0xee, 0xef, 0xd3, 0xc4, 0xc9, 0x96, 0xb4, 0xf1, 0x9c, 0x8c, 0xbd, 0xfa, 0xd1, 0xa8, 0xd3, 0xb7, + 0x8c, 0x7d, 0x32, 0xf6, 0xbf, 0xc8, 0x1d, 0x75, 0xf6, 0xc5, 0x9e, 0x8a, 0xa9, 0xd2, 0xd1, 0xa9, + 0x7e, 0x09, 0x45, 0xff, 0x98, 0xa0, 0xb7, 0xa3, 0xf7, 0x47, 0x99, 0xbe, 0x7e, 0xb3, 0x82, 0xb1, + 0x9c, 0x24, 0x72, 0x89, 0x5e, 0x84, 0x2d, 0xcf, 0xea, 0xda, 0xc4, 0xd4, 0xc3, 0x44, 0x85, 0xcf, + 0x59, 0xd4, 0x36, 0xc5, 0x0f, 0x0f, 0xfd, 0x2c, 0x45, 0xfd, 0xa7, 0x02, 0x45, 0xff, 0x3a, 0xcf, + 0x3c, 0x3e, 0xb1, 0x4f, 0x4a, 0x7f, 0xdb, 0x4f, 0x9a, 0x57, 0x34, 0xf6, 0x4b, 0xf4, 0xd9, 0x95, + 0x4b, 0xf4, 0x2f, 0x03, 0xa2, 0x0e, 0xc5, 0x7d, 0xfd, 0xc2, 0xa1, 0x96, 0xdd, 0xd5, 0x85, 0x67, + 0x05, 0x09, 0xab, 0xf0, 0x5f, 0x1e, 0xf1, 0x1f, 0x8e, 0xb8, 0x93, 0x7f, 0xad, 0x40, 0x31, 0x08, + 0x99, 0xab, 0x96, 0x08, 0xaf, 0x41, 0x5e, 0x46, 0x02, 0x51, 0x23, 0x94, 0xbd, 0xa0, 0x8a, 0x9d, + 0x8d, 0x54, 0xb1, 0x6b, 0x50, 0x1c, 0x10, 0x8a, 0x39, 0x7b, 0x10, 0x29, 0x61, 0xd0, 0x7f, 0xf1, + 0x1e, 0xac, 0x45, 0x6a, 0xb6, 0xec, 0xd2, 0x1f, 0xb4, 0xde, 0xab, 0xa4, 0x6a, 0x85, 0xcf, 0x3e, + 0xbf, 0x99, 0x39, 0x20, 0x9f, 0xb2, 0x53, 0xaa, 0xb5, 0x9a, 0xed, 0x56, 0x73, 0xbf, 0xa2, 0xd4, + 0xd6, 0x3e, 0xfb, 0xfc, 0x66, 0x41, 0x23, 0xbc, 0x7c, 0x73, 0xf7, 0x4f, 0x6b, 0xb0, 0xb9, 0xdb, + 0x68, 0xee, 0xb1, 0xf0, 0x65, 0x19, 0x98, 0x27, 0x91, 0x87, 0x90, 0xe5, 0x79, 0x74, 0x82, 0x37, + 0xe3, 0x5a, 0x92, 0x4a, 0x20, 0xd2, 0x20, 0xc7, 0xd3, 0x6d, 0x94, 0xe4, 0x29, 0xb9, 0x96, 0xa8, + 0x40, 0xc8, 0x3e, 0x92, 0x9f, 0xec, 0x04, 0x2f, 0xcc, 0xb5, 0x24, 0x55, 0x43, 0xf4, 0x21, 0x94, + 0xc2, 0x3c, 0x3a, 0xe9, 0xbb, 0x73, 0x2d, 0x71, 0x3d, 0x91, 0xd9, 0x0f, 0xf3, 0x85, 0xa4, 0xaf, + 0xae, 0xb5, 0xc4, 0x20, 0x85, 0xde, 0x87, 0x82, 0x9f, 0x99, 0x25, 0x7b, 0x19, 0xae, 0x25, 0xac, + 0xf5, 0xb1, 0xed, 0x13, 0xa9, 0x75, 0x92, 0xe7, 0xef, 0x5a, 0xa2, 0x82, 0x26, 0x3a, 0x85, 0xbc, + 0xa4, 0xc4, 0x89, 0xde, 0x7c, 0x6b, 0xc9, 0x2a, 0x78, 0xcc, 0xc9, 0x61, 0xf1, 0x22, 0xe9, 0x93, + 0x7f, 0x2d, 0x71, 0x25, 0x17, 0x61, 0x80, 0x48, 0x96, 0x9d, 0xf8, 0x2d, 0xbf, 0x96, 0xbc, 0x42, + 0x8b, 0x7e, 0x0e, 0xc5, 0x20, 0x97, 0x4a, 0xf8, 0xa6, 0x5e, 0x4b, 0x5a, 0x24, 0x45, 0x1f, 0xc3, + 0x46, 0x3c, 0x7d, 0x58, 0xe5, 0xa5, 0xbc, 0xb6, 0x52, 0xf5, 0x93, 0xcd, 0x15, 0xcf, 0x28, 0x56, + 0x79, 0x3f, 0xaf, 0xad, 0x54, 0x12, 0x45, 0x17, 0xb0, 0x35, 0xcd, 0xfb, 0x57, 0x7d, 0x54, 0xaf, + 0xad, 0x5c, 0x2a, 0x45, 0x63, 0x40, 0x33, 0x72, 0x87, 0x95, 0x5f, 0xda, 0x6b, 0xab, 0xd7, 0x4f, + 0x1b, 0xad, 0x2f, 0xbe, 0xbe, 0xa1, 0x7c, 0xf9, 0xf5, 0x0d, 0xe5, 0x1f, 0x5f, 0xdf, 0x50, 0x1e, + 0x7f, 0x73, 0x23, 0xf5, 0xe5, 0x37, 0x37, 0x52, 0x7f, 0xfb, 0xe6, 0x46, 0xea, 0x67, 0x2f, 0x75, + 0x2d, 0xda, 0x1b, 0x75, 0xea, 0x86, 0x33, 0xd8, 0x89, 0xfe, 0x9b, 0xd1, 0xac, 0xff, 0x89, 0xea, + 0xe4, 0x79, 0x48, 0x7c, 0xed, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xaa, 0x45, 0xa6, 0x33, + 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/tendermint/abci/types/types.proto b/proto/tendermint/abci/types/types.proto index 63a1a654b..df794cee6 100644 --- a/proto/tendermint/abci/types/types.proto +++ b/proto/tendermint/abci/types/types.proto @@ -246,11 +246,12 @@ message ResponseOfferSnapshot { Result result = 1; enum Result { - ACCEPT = 0; // Snapshot accepted, apply chunks - ABORT = 1; // Abort all snapshot restoration - REJECT = 2; // Reject this specific snapshot, try others - REJECT_FORMAT = 3; // Reject all snapshots of this format, try others - REJECT_SENDER = 4; // Reject all snapshots from the sender(s), try others + UNKNOWN = 0; // Unknown result, abort all snapshot restoration + ACCEPT = 1; // Snapshot accepted, apply chunks + ABORT = 2; // Abort all snapshot restoration + REJECT = 3; // Reject this specific snapshot, try others + REJECT_FORMAT = 4; // Reject all snapshots of this format, try others + REJECT_SENDER = 5; // Reject all snapshots from the sender(s), try others } } @@ -264,11 +265,12 @@ message ResponseApplySnapshotChunk { repeated string reject_senders = 3; // Chunk senders to reject and ban enum Result { - ACCEPT = 0; // Chunk successfully accepted - ABORT = 1; // Abort all snapshot restoration - RETRY = 2; // Retry chunk (combine with refetch and reject) - RETRY_SNAPSHOT = 3; // Retry snapshot (combine with refetch and reject) - REJECT_SNAPSHOT = 4; // Reject this snapshot, try others + UNKNOWN = 0; // Unknown result, abort all snapshot restoration + ACCEPT = 1; // Chunk successfully accepted + ABORT = 2; // Abort all snapshot restoration + RETRY = 3; // Retry chunk (combine with refetch and reject) + RETRY_SNAPSHOT = 4; // Retry snapshot (combine with refetch and reject) + REJECT_SNAPSHOT = 5; // Reject this snapshot, try others } } diff --git a/proto/tendermint/consensus/msgs.pb.go b/proto/tendermint/consensus/msgs.pb.go index 68a6973f2..1a235922c 100644 --- a/proto/tendermint/consensus/msgs.pb.go +++ b/proto/tendermint/consensus/msgs.pb.go @@ -453,7 +453,7 @@ func (m *HasVote) GetType() types.SignedMsgType { if m != nil { return m.Type } - return types.SIGNED_MSG_TYPE_UNKNOWN + return types.UnknownType } func (m *HasVote) GetIndex() int32 { @@ -522,7 +522,7 @@ func (m *VoteSetMaj23) GetType() types.SignedMsgType { if m != nil { return m.Type } - return types.SIGNED_MSG_TYPE_UNKNOWN + return types.UnknownType } func (m *VoteSetMaj23) GetBlockID() types.BlockID { @@ -592,7 +592,7 @@ func (m *VoteSetBits) GetType() types.SignedMsgType { if m != nil { return m.Type } - return types.SIGNED_MSG_TYPE_UNKNOWN + return types.UnknownType } func (m *VoteSetBits) GetBlockID() types.BlockID { diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index 6a9b0a18b..38b17ddb1 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -179,7 +179,7 @@ func (m *CanonicalProposal) GetType() SignedMsgType { if m != nil { return m.Type } - return SIGNED_MSG_TYPE_UNKNOWN + return UnknownType } func (m *CanonicalProposal) GetHeight() int64 { @@ -270,7 +270,7 @@ func (m *CanonicalVote) GetType() SignedMsgType { if m != nil { return m.Type } - return SIGNED_MSG_TYPE_UNKNOWN + return UnknownType } func (m *CanonicalVote) GetHeight() int64 { diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 69147e2c8..94eb8480b 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -34,24 +34,24 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type BlockIDFlag int32 const ( - BLOCKD_ID_FLAG_UNKNOWN BlockIDFlag = 0 - BlockIDFlagAbsent BlockIDFlag = 1 - BlockIDFlagCommit BlockIDFlag = 2 - BlockIDFlagNil BlockIDFlag = 3 + BlockIDFlagUnknown BlockIDFlag = 0 + BlockIDFlagAbsent BlockIDFlag = 1 + BlockIDFlagCommit BlockIDFlag = 2 + BlockIDFlagNil BlockIDFlag = 3 ) var BlockIDFlag_name = map[int32]string{ - 0: "BLOCKD_ID_FLAG_UNKNOWN", + 0: "BLOCK_ID_FLAG_UNKNOWN", 1: "BLOCK_ID_FLAG_ABSENT", 2: "BLOCK_ID_FLAG_COMMIT", 3: "BLOCK_ID_FLAG_NIL", } var BlockIDFlag_value = map[string]int32{ - "BLOCKD_ID_FLAG_UNKNOWN": 0, - "BLOCK_ID_FLAG_ABSENT": 1, - "BLOCK_ID_FLAG_COMMIT": 2, - "BLOCK_ID_FLAG_NIL": 3, + "BLOCK_ID_FLAG_UNKNOWN": 0, + "BLOCK_ID_FLAG_ABSENT": 1, + "BLOCK_ID_FLAG_COMMIT": 2, + "BLOCK_ID_FLAG_NIL": 3, } func (x BlockIDFlag) String() string { @@ -66,7 +66,7 @@ func (BlockIDFlag) EnumDescriptor() ([]byte, []int) { type SignedMsgType int32 const ( - SIGNED_MSG_TYPE_UNKNOWN SignedMsgType = 0 + UnknownType SignedMsgType = 0 // Votes PrevoteType SignedMsgType = 1 PrecommitType SignedMsgType = 2 @@ -76,16 +76,16 @@ const ( var SignedMsgType_name = map[int32]string{ 0: "SIGNED_MSG_TYPE_UNKNOWN", - 1: "PREVOTE_TYPE", - 2: "PRECOMMIT_TYPE", - 32: "PROPOSAL_TYPE", + 1: "SIGNED_MSG_TYPE_PREVOTE", + 2: "SIGNED_MSG_TYPE_PRECOMMIT", + 32: "SIGNED_MSG_TYPE_PROPOSAL", } var SignedMsgType_value = map[string]int32{ - "SIGNED_MSG_TYPE_UNKNOWN": 0, - "PREVOTE_TYPE": 1, - "PRECOMMIT_TYPE": 2, - "PROPOSAL_TYPE": 32, + "SIGNED_MSG_TYPE_UNKNOWN": 0, + "SIGNED_MSG_TYPE_PREVOTE": 1, + "SIGNED_MSG_TYPE_PRECOMMIT": 2, + "SIGNED_MSG_TYPE_PROPOSAL": 32, } func (x SignedMsgType) String() string { @@ -523,7 +523,7 @@ func (m *Vote) GetType() SignedMsgType { if m != nil { return m.Type } - return SIGNED_MSG_TYPE_UNKNOWN + return UnknownType } func (m *Vote) GetHeight() int64 { @@ -705,7 +705,7 @@ func (m *CommitSig) GetBlockIdFlag() BlockIDFlag { if m != nil { return m.BlockIdFlag } - return BLOCKD_ID_FLAG_UNKNOWN + return BlockIDFlagUnknown } func (m *CommitSig) GetValidatorAddress() []byte { @@ -776,7 +776,7 @@ func (m *Proposal) GetType() SignedMsgType { if m != nil { return m.Type } - return SIGNED_MSG_TYPE_UNKNOWN + return UnknownType } func (m *Proposal) GetHeight() int64 { @@ -1022,90 +1022,90 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1313 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0x1a, 0x47, - 0x17, 0xf6, 0xc2, 0x62, 0xe0, 0x00, 0x36, 0x5e, 0xf9, 0x4d, 0x08, 0x4e, 0x30, 0x2f, 0x79, 0xf3, - 0xd6, 0x49, 0x2b, 0x88, 0x1c, 0xf5, 0x4b, 0x51, 0x2f, 0xc0, 0x26, 0x09, 0x8a, 0x8d, 0xe9, 0x42, - 0x53, 0xb5, 0x37, 0xab, 0x85, 0x9d, 0xc0, 0x2a, 0xcb, 0xce, 0x76, 0x77, 0xb0, 0xec, 0xfc, 0x82, - 0xca, 0x57, 0xe9, 0x0f, 0xf0, 0x55, 0x5b, 0xa9, 0xf7, 0xfd, 0x03, 0x55, 0xaf, 0x72, 0x99, 0xcb, - 0xde, 0x34, 0xad, 0x1c, 0xa9, 0xea, 0xcf, 0xa8, 0xe6, 0xcc, 0x2c, 0x2c, 0xfe, 0xe8, 0x47, 0x14, - 0xf5, 0xc6, 0x9e, 0x39, 0xe7, 0x39, 0x67, 0xe6, 0x3c, 0xf3, 0xcc, 0x9c, 0x05, 0xae, 0x32, 0xe2, - 0x5a, 0xc4, 0x1f, 0xdb, 0x2e, 0xab, 0xb1, 0x43, 0x8f, 0x04, 0xe2, 0x6f, 0xd5, 0xf3, 0x29, 0xa3, - 0x5a, 0x7e, 0xe6, 0xad, 0xa2, 0xbd, 0xb8, 0x3a, 0xa4, 0x43, 0x8a, 0xce, 0x1a, 0x1f, 0x09, 0x5c, - 0x71, 0x7d, 0x48, 0xe9, 0xd0, 0x21, 0x35, 0x9c, 0xf5, 0x27, 0x8f, 0x6b, 0xcc, 0x1e, 0x93, 0x80, - 0x99, 0x63, 0x4f, 0x02, 0xca, 0x91, 0x65, 0x1c, 0xbb, 0x1f, 0xd4, 0xfa, 0x36, 0x9b, 0x5b, 0xaa, - 0xf8, 0xbf, 0x08, 0x62, 0xe0, 0x1f, 0x7a, 0x8c, 0xd6, 0xc6, 0xc4, 0x7f, 0xe2, 0x90, 0x39, 0x54, - 0x34, 0xcf, 0x3e, 0xf1, 0x03, 0x9b, 0xba, 0xe1, 0x7f, 0x81, 0xa8, 0x7c, 0x08, 0xb9, 0x8e, 0xe9, - 0xb3, 0x2e, 0x61, 0x0f, 0x88, 0x69, 0x11, 0x5f, 0x5b, 0x85, 0x04, 0xa3, 0xcc, 0x74, 0x0a, 0x4a, - 0x59, 0xd9, 0xc8, 0xe9, 0x62, 0xa2, 0x69, 0xa0, 0x8e, 0xcc, 0x60, 0x54, 0x88, 0x95, 0x95, 0x8d, - 0xac, 0x8e, 0xe3, 0x0a, 0x05, 0x95, 0x87, 0xf2, 0x08, 0xdb, 0xb5, 0xc8, 0x41, 0x18, 0x81, 0x13, - 0x6e, 0xed, 0x1f, 0x32, 0x12, 0xc8, 0x10, 0x31, 0xd1, 0xee, 0x42, 0xc2, 0xf3, 0x29, 0x7d, 0x5c, - 0x88, 0x97, 0x95, 0x8d, 0xcc, 0xe6, 0x7a, 0x35, 0xc2, 0x98, 0x28, 0xa3, 0x2a, 0xca, 0xa8, 0x76, - 0x38, 0xac, 0xa1, 0x3e, 0x7f, 0xb9, 0xbe, 0xa0, 0x8b, 0x98, 0x8a, 0x03, 0xc9, 0x86, 0x43, 0x07, - 0x4f, 0x5a, 0xdb, 0xd3, 0xfd, 0x28, 0xb3, 0xfd, 0x68, 0xbb, 0xb0, 0xec, 0x99, 0x3e, 0x33, 0x02, - 0xc2, 0x8c, 0x11, 0x16, 0x83, 0x6b, 0x9f, 0x5a, 0x45, 0xd0, 0x33, 0x57, 0xb3, 0x5c, 0x25, 0xe7, - 0x45, 0x8d, 0x95, 0xdf, 0x54, 0x58, 0x94, 0x9c, 0x7c, 0x04, 0x49, 0xc9, 0x1a, 0x2e, 0x98, 0xd9, - 0xbc, 0x16, 0xcd, 0x18, 0x12, 0xba, 0x45, 0xdd, 0x80, 0xb8, 0xc1, 0x24, 0x90, 0xf9, 0xc2, 0x18, - 0xed, 0xff, 0x90, 0x1a, 0x8c, 0x4c, 0xdb, 0x35, 0x6c, 0x0b, 0x77, 0x94, 0x6e, 0x64, 0x4e, 0x5e, - 0xae, 0x27, 0xb7, 0xb8, 0xad, 0xb5, 0xad, 0x27, 0xd1, 0xd9, 0xb2, 0xb4, 0x4b, 0xb0, 0x38, 0x22, - 0xf6, 0x70, 0xc4, 0x90, 0x9d, 0xb8, 0x2e, 0x67, 0xda, 0x07, 0xa0, 0x72, 0x81, 0x14, 0x54, 0x5c, - 0xbb, 0x58, 0x15, 0xea, 0xa9, 0x86, 0xea, 0xa9, 0xf6, 0x42, 0xf5, 0x34, 0x52, 0x7c, 0xe1, 0x67, - 0xbf, 0xac, 0x2b, 0x3a, 0x46, 0x68, 0x5b, 0x90, 0x73, 0xcc, 0x80, 0x19, 0x7d, 0x4e, 0x1b, 0x5f, - 0x3e, 0x81, 0x29, 0xae, 0x9c, 0x25, 0x44, 0x12, 0x2b, 0xb7, 0x9e, 0xe1, 0x51, 0xc2, 0x64, 0x69, - 0x1b, 0x90, 0xc7, 0x24, 0x03, 0x3a, 0x1e, 0xdb, 0xcc, 0x40, 0xde, 0x17, 0x91, 0xf7, 0x25, 0x6e, - 0xdf, 0x42, 0xf3, 0x03, 0x7e, 0x02, 0x6b, 0x90, 0xb6, 0x4c, 0x66, 0x0a, 0x48, 0x12, 0x21, 0x29, - 0x6e, 0x40, 0xe7, 0x5b, 0xb0, 0xbc, 0x6f, 0x3a, 0xb6, 0x65, 0x32, 0xea, 0x07, 0x02, 0x92, 0x12, - 0x59, 0x66, 0x66, 0x04, 0xde, 0x86, 0x55, 0x97, 0x1c, 0x30, 0xe3, 0x34, 0x3a, 0x8d, 0x68, 0x8d, - 0xfb, 0x1e, 0xcd, 0x47, 0xdc, 0x80, 0xa5, 0x41, 0x48, 0xbe, 0xc0, 0x02, 0x62, 0x73, 0x53, 0x2b, - 0xc2, 0xae, 0x40, 0xca, 0xf4, 0x3c, 0x01, 0xc8, 0x20, 0x20, 0x69, 0x7a, 0x1e, 0xba, 0x6e, 0xc1, - 0x0a, 0xd6, 0xe8, 0x93, 0x60, 0xe2, 0x30, 0x99, 0x24, 0x8b, 0x98, 0x65, 0xee, 0xd0, 0x85, 0x1d, - 0xb1, 0xd7, 0x21, 0x47, 0xf6, 0x6d, 0x8b, 0xb8, 0x03, 0x22, 0x70, 0x39, 0xc4, 0x65, 0x43, 0x23, - 0x82, 0x6e, 0x42, 0xde, 0xf3, 0xa9, 0x47, 0x03, 0xe2, 0x1b, 0xa6, 0x65, 0xf9, 0x24, 0x08, 0x0a, - 0x4b, 0x22, 0x5f, 0x68, 0xaf, 0x0b, 0x73, 0xe5, 0x1d, 0x50, 0xb7, 0x4d, 0x66, 0x6a, 0x79, 0x88, - 0xb3, 0x83, 0xa0, 0xa0, 0x94, 0xe3, 0x1b, 0x59, 0x9d, 0x0f, 0xcf, 0xbd, 0x75, 0xbf, 0xc7, 0x40, - 0x7d, 0x44, 0x19, 0xd1, 0xee, 0x80, 0xca, 0x8f, 0x0e, 0x15, 0xb9, 0x74, 0x9e, 0xc6, 0xbb, 0xf6, - 0xd0, 0x25, 0xd6, 0x6e, 0x30, 0xec, 0x1d, 0x7a, 0x44, 0x47, 0x70, 0x44, 0x62, 0xb1, 0x39, 0x89, - 0xad, 0x42, 0xc2, 0xa7, 0x13, 0xd7, 0x42, 0xe5, 0x25, 0x74, 0x31, 0xd1, 0x9a, 0x90, 0x9a, 0x2a, - 0x47, 0xfd, 0x2b, 0xe5, 0x2c, 0x73, 0xe5, 0x70, 0x5d, 0x4b, 0x83, 0x9e, 0xec, 0x4b, 0x01, 0x35, - 0x20, 0x3d, 0x7d, 0xe0, 0xa4, 0x02, 0xff, 0x9e, 0x88, 0x67, 0x61, 0xda, 0xdb, 0xb0, 0x32, 0xd5, - 0xc3, 0x94, 0x50, 0xa1, 0xc2, 0xfc, 0xd4, 0x21, 0x19, 0x9d, 0x93, 0x9a, 0x21, 0xde, 0xa6, 0x24, - 0xd6, 0x35, 0x93, 0x5a, 0x0b, 0x1f, 0xa9, 0xab, 0x90, 0x0e, 0xec, 0xa1, 0x6b, 0xb2, 0x89, 0x4f, - 0xa4, 0x1a, 0x67, 0x86, 0xca, 0x57, 0x31, 0x58, 0x14, 0xea, 0x8e, 0xf0, 0xa6, 0x9c, 0xcf, 0x5b, - 0xec, 0x22, 0xde, 0xe2, 0xaf, 0xcf, 0x5b, 0x1d, 0x60, 0xba, 0x99, 0xa0, 0xa0, 0x96, 0xe3, 0x1b, - 0x99, 0xcd, 0xb5, 0xb3, 0x89, 0xc4, 0x16, 0xbb, 0xf6, 0x50, 0x5e, 0xde, 0x48, 0xd0, 0x54, 0x41, - 0x89, 0xc8, 0x3b, 0x79, 0x17, 0xd2, 0x7d, 0x9b, 0x19, 0xa6, 0xef, 0x9b, 0x87, 0x48, 0x61, 0x66, - 0xb3, 0x14, 0xcd, 0xca, 0x1b, 0x4e, 0x95, 0x37, 0x9c, 0x6a, 0xc3, 0x66, 0x75, 0x8e, 0xd2, 0x53, - 0x7d, 0x39, 0xaa, 0xfc, 0xac, 0x40, 0x7a, 0xba, 0xa0, 0x56, 0x87, 0x5c, 0x58, 0xa8, 0xf1, 0xd8, - 0x31, 0x87, 0x52, 0x8c, 0xd7, 0x2e, 0xac, 0xf6, 0x9e, 0x63, 0x0e, 0xf5, 0x8c, 0x2c, 0x90, 0x4f, - 0xce, 0x3f, 0xd8, 0xd8, 0x05, 0x07, 0x3b, 0xa7, 0xa4, 0xf8, 0xeb, 0x29, 0x69, 0xee, 0xcc, 0xd5, - 0xd3, 0x67, 0xfe, 0x7d, 0x0c, 0x52, 0x1d, 0xbc, 0xa0, 0xa6, 0xf3, 0x6f, 0x5c, 0xb1, 0x35, 0x48, - 0x7b, 0xd4, 0x31, 0x84, 0x47, 0x45, 0x4f, 0xca, 0xa3, 0x8e, 0x7e, 0x46, 0x47, 0x89, 0x37, 0x74, - 0xff, 0x16, 0xdf, 0x00, 0x6b, 0xc9, 0xd3, 0xac, 0xf9, 0x90, 0x15, 0x54, 0xc8, 0x86, 0x79, 0x9b, - 0x73, 0x80, 0x1d, 0x58, 0xf4, 0xcb, 0xc2, 0xd9, 0x6d, 0x0b, 0xa4, 0x2e, 0x71, 0x3c, 0x42, 0xf4, - 0x17, 0xd9, 0xb3, 0x0b, 0x17, 0xe9, 0x5c, 0x97, 0xb8, 0xca, 0x8f, 0x0a, 0xa4, 0xb1, 0xd4, 0x5d, - 0xc2, 0xcc, 0x39, 0xaa, 0x94, 0xd7, 0xa7, 0xea, 0x1a, 0x80, 0x48, 0x13, 0xd8, 0x4f, 0x89, 0x3c, - 0xc0, 0x34, 0x5a, 0xba, 0xf6, 0x53, 0xa2, 0xbd, 0x37, 0xad, 0x2b, 0xfe, 0xe7, 0x75, 0xc9, 0xab, - 0x18, 0x56, 0x77, 0x19, 0x92, 0xee, 0x64, 0x6c, 0xf0, 0xe7, 0x5d, 0x15, 0xa2, 0x70, 0x27, 0xe3, - 0xde, 0x41, 0x50, 0xf9, 0x02, 0x92, 0xbd, 0x03, 0xfc, 0xd4, 0xe1, 0x4a, 0xf0, 0x29, 0x95, 0xfd, - 0x55, 0x7c, 0xd7, 0xa4, 0xb8, 0x01, 0xdb, 0x89, 0x06, 0x2a, 0x6f, 0xa4, 0x61, 0x27, 0xe0, 0x63, - 0xed, 0xdd, 0x7f, 0xf6, 0x2d, 0x25, 0xbf, 0xa2, 0x6e, 0xfd, 0xa0, 0x40, 0x26, 0x72, 0x1b, 0xb5, - 0x22, 0x5c, 0x6a, 0xec, 0xec, 0x6d, 0x3d, 0xdc, 0x36, 0x5a, 0xdb, 0xc6, 0xbd, 0x9d, 0xfa, 0x7d, - 0xe3, 0x93, 0xf6, 0xc3, 0xf6, 0xde, 0xa7, 0xed, 0xfc, 0x82, 0x56, 0x83, 0x55, 0xf4, 0x4d, 0x5d, - 0xf5, 0x46, 0xb7, 0xd9, 0xee, 0xe5, 0x95, 0xe2, 0x7f, 0x8e, 0x8e, 0xcb, 0x2b, 0x91, 0x34, 0xf5, - 0x7e, 0x40, 0x5c, 0x76, 0x36, 0x60, 0x6b, 0x6f, 0x77, 0xb7, 0xd5, 0xcb, 0xc7, 0xce, 0x04, 0xc8, - 0x87, 0xf5, 0x26, 0xac, 0xcc, 0x07, 0xb4, 0x5b, 0x3b, 0xf9, 0x78, 0x51, 0x3b, 0x3a, 0x2e, 0x2f, - 0x45, 0xd0, 0x6d, 0xdb, 0x29, 0xa6, 0xbe, 0xfc, 0xba, 0xb4, 0xf0, 0xdd, 0x37, 0x25, 0xe5, 0xd6, - 0xb7, 0x0a, 0xe4, 0xe6, 0xae, 0x9e, 0xb6, 0x06, 0x97, 0xbb, 0xad, 0xfb, 0xed, 0xe6, 0xb6, 0xb1, - 0xdb, 0xbd, 0x6f, 0xf4, 0x3e, 0xeb, 0x34, 0x23, 0x55, 0xfc, 0x17, 0xb2, 0x1d, 0xbd, 0xf9, 0x68, - 0xaf, 0xd7, 0x44, 0x4f, 0x5e, 0x29, 0x2e, 0x1f, 0x1d, 0x97, 0x33, 0x1d, 0x9f, 0xec, 0x53, 0x46, - 0x30, 0xfe, 0x06, 0x2c, 0x75, 0xf4, 0xa6, 0xd8, 0xac, 0x00, 0xc5, 0x8a, 0x2b, 0x47, 0xc7, 0xe5, - 0x5c, 0xc7, 0x27, 0x42, 0x6f, 0x08, 0xbb, 0x0e, 0xb9, 0x8e, 0xbe, 0xd7, 0xd9, 0xeb, 0xd6, 0x77, - 0x04, 0xaa, 0x5c, 0xcc, 0x1f, 0x1d, 0x97, 0xb3, 0xe1, 0x8b, 0xc1, 0x41, 0xb3, 0x7d, 0x36, 0x3e, - 0x7e, 0x7e, 0x52, 0x52, 0x5e, 0x9c, 0x94, 0x94, 0x5f, 0x4f, 0x4a, 0xca, 0xb3, 0x57, 0xa5, 0x85, - 0x17, 0xaf, 0x4a, 0x0b, 0x3f, 0xbd, 0x2a, 0x2d, 0x7c, 0xfe, 0xfe, 0xd0, 0x66, 0xa3, 0x49, 0xbf, - 0x3a, 0xa0, 0xe3, 0x5a, 0xf4, 0x27, 0xc5, 0x6c, 0x28, 0x7e, 0x34, 0x9c, 0xfe, 0xb9, 0xd1, 0x5f, - 0x44, 0xfb, 0x9d, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x23, 0x4d, 0x38, 0xbf, 0x89, 0x0c, 0x00, - 0x00, + // 1318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4d, 0x6f, 0xdb, 0x46, + 0x13, 0x36, 0x25, 0xca, 0x92, 0x46, 0x96, 0x2d, 0x2f, 0x9c, 0x44, 0x51, 0x12, 0x99, 0xd0, 0xfb, + 0xb6, 0x75, 0xd2, 0x40, 0x4a, 0x1d, 0xf4, 0x0b, 0x41, 0x0f, 0x92, 0xed, 0x24, 0x42, 0x6c, 0x59, + 0xa5, 0x94, 0x14, 0xed, 0x85, 0xa0, 0xc4, 0x8d, 0x44, 0x84, 0xe2, 0xb2, 0xe4, 0xca, 0xb5, 0xf3, + 0x0b, 0x0a, 0x9f, 0xd2, 0x1f, 0xa0, 0x53, 0x7b, 0xe8, 0xbd, 0xff, 0xa0, 0xa7, 0x1c, 0x73, 0x6b, + 0x2f, 0x4d, 0x0b, 0x07, 0x28, 0xfa, 0x33, 0x8a, 0xfd, 0xa0, 0x44, 0x5a, 0x76, 0x3f, 0x82, 0xa0, + 0x17, 0x7b, 0x77, 0xf6, 0x99, 0x99, 0x9d, 0x67, 0x9f, 0xdd, 0xa1, 0xe0, 0x2a, 0xc5, 0xae, 0x85, + 0xfd, 0x91, 0xed, 0xd2, 0x1a, 0x3d, 0xf2, 0x70, 0x20, 0xfe, 0x56, 0x3d, 0x9f, 0x50, 0x82, 0x0a, + 0xb3, 0xd5, 0x2a, 0xb7, 0x97, 0xd6, 0x06, 0x64, 0x40, 0xf8, 0x62, 0x8d, 0x8d, 0x04, 0xae, 0xb4, + 0x3e, 0x20, 0x64, 0xe0, 0xe0, 0x1a, 0x9f, 0xf5, 0xc6, 0x8f, 0x6b, 0xd4, 0x1e, 0xe1, 0x80, 0x9a, + 0x23, 0x4f, 0x02, 0xb4, 0x48, 0x1a, 0xc7, 0xee, 0x05, 0xb5, 0x9e, 0x4d, 0x63, 0xa9, 0x4a, 0xff, + 0x8f, 0x20, 0xfa, 0xfe, 0x91, 0x47, 0x49, 0x6d, 0x84, 0xfd, 0x27, 0x0e, 0x8e, 0xa1, 0xa2, 0x71, + 0x0e, 0xb0, 0x1f, 0xd8, 0xc4, 0x0d, 0xff, 0x0b, 0x44, 0xe5, 0x63, 0xc8, 0xb7, 0x4d, 0x9f, 0x76, + 0x30, 0xbd, 0x8f, 0x4d, 0x0b, 0xfb, 0x68, 0x0d, 0x52, 0x94, 0x50, 0xd3, 0x29, 0x2a, 0x9a, 0xb2, + 0x91, 0xd7, 0xc5, 0x04, 0x21, 0x50, 0x87, 0x66, 0x30, 0x2c, 0x26, 0x34, 0x65, 0x63, 0x49, 0xe7, + 0xe3, 0x0a, 0x01, 0x95, 0xb9, 0x32, 0x0f, 0xdb, 0xb5, 0xf0, 0x61, 0xe8, 0xc1, 0x27, 0xcc, 0xda, + 0x3b, 0xa2, 0x38, 0x90, 0x2e, 0x62, 0x82, 0xee, 0x40, 0xca, 0xf3, 0x09, 0x79, 0x5c, 0x4c, 0x6a, + 0xca, 0x46, 0x6e, 0x73, 0xbd, 0x1a, 0x61, 0x4c, 0x94, 0x51, 0x15, 0x65, 0x54, 0xdb, 0x0c, 0xd6, + 0x50, 0x9f, 0xbf, 0x5c, 0x5f, 0xd0, 0x85, 0x4f, 0xc5, 0x81, 0x74, 0xc3, 0x21, 0xfd, 0x27, 0xcd, + 0xed, 0xe9, 0x7e, 0x94, 0xd9, 0x7e, 0xd0, 0x1e, 0xac, 0x78, 0xa6, 0x4f, 0x8d, 0x00, 0x53, 0x63, + 0xc8, 0x8b, 0xe1, 0xb9, 0x4f, 0x65, 0x11, 0xf4, 0xc4, 0x6a, 0x96, 0x59, 0xf2, 0x5e, 0xd4, 0x58, + 0xf9, 0x5d, 0x85, 0x45, 0xc9, 0xc9, 0x27, 0x90, 0x96, 0xac, 0xf1, 0x84, 0xb9, 0xcd, 0x6b, 0xd1, + 0x88, 0x21, 0xa1, 0x5b, 0xc4, 0x0d, 0xb0, 0x1b, 0x8c, 0x03, 0x19, 0x2f, 0xf4, 0x41, 0x6f, 0x43, + 0xa6, 0x3f, 0x34, 0x6d, 0xd7, 0xb0, 0x2d, 0xbe, 0xa3, 0x6c, 0x23, 0x77, 0xf2, 0x72, 0x3d, 0xbd, + 0xc5, 0x6c, 0xcd, 0x6d, 0x3d, 0xcd, 0x17, 0x9b, 0x16, 0xba, 0x08, 0x8b, 0x43, 0x6c, 0x0f, 0x86, + 0x94, 0xb3, 0x93, 0xd4, 0xe5, 0x0c, 0x7d, 0x04, 0x2a, 0x13, 0x48, 0x51, 0xe5, 0xb9, 0x4b, 0x55, + 0xa1, 0x9e, 0x6a, 0xa8, 0x9e, 0x6a, 0x37, 0x54, 0x4f, 0x23, 0xc3, 0x12, 0x3f, 0xfb, 0x75, 0x5d, + 0xd1, 0xb9, 0x07, 0xda, 0x82, 0xbc, 0x63, 0x06, 0xd4, 0xe8, 0x31, 0xda, 0x58, 0xfa, 0x14, 0x0f, + 0x71, 0x79, 0x9e, 0x10, 0x49, 0xac, 0xdc, 0x7a, 0x8e, 0x79, 0x09, 0x93, 0x85, 0x36, 0xa0, 0xc0, + 0x83, 0xf4, 0xc9, 0x68, 0x64, 0x53, 0x83, 0xf3, 0xbe, 0xc8, 0x79, 0x5f, 0x66, 0xf6, 0x2d, 0x6e, + 0xbe, 0xcf, 0x4e, 0xe0, 0x0a, 0x64, 0x2d, 0x93, 0x9a, 0x02, 0x92, 0xe6, 0x90, 0x0c, 0x33, 0xf0, + 0xc5, 0x77, 0x60, 0xe5, 0xc0, 0x74, 0x6c, 0xcb, 0xa4, 0xc4, 0x0f, 0x04, 0x24, 0x23, 0xa2, 0xcc, + 0xcc, 0x1c, 0x78, 0x0b, 0xd6, 0x5c, 0x7c, 0x48, 0x8d, 0xd3, 0xe8, 0x2c, 0x47, 0x23, 0xb6, 0xf6, + 0x28, 0xee, 0xf1, 0x16, 0x2c, 0xf7, 0x43, 0xf2, 0x05, 0x16, 0x38, 0x36, 0x3f, 0xb5, 0x72, 0xd8, + 0x65, 0xc8, 0x98, 0x9e, 0x27, 0x00, 0x39, 0x0e, 0x48, 0x9b, 0x9e, 0xc7, 0x97, 0x6e, 0xc0, 0x2a, + 0xaf, 0xd1, 0xc7, 0xc1, 0xd8, 0xa1, 0x32, 0xc8, 0x12, 0xc7, 0xac, 0xb0, 0x05, 0x5d, 0xd8, 0x39, + 0xf6, 0x7f, 0x90, 0xc7, 0x07, 0xb6, 0x85, 0xdd, 0x3e, 0x16, 0xb8, 0x3c, 0xc7, 0x2d, 0x85, 0x46, + 0x0e, 0xba, 0x0e, 0x05, 0xcf, 0x27, 0x1e, 0x09, 0xb0, 0x6f, 0x98, 0x96, 0xe5, 0xe3, 0x20, 0x28, + 0x2e, 0x8b, 0x78, 0xa1, 0xbd, 0x2e, 0xcc, 0x95, 0x9b, 0xa0, 0x6e, 0x9b, 0xd4, 0x44, 0x05, 0x48, + 0xd2, 0xc3, 0xa0, 0xa8, 0x68, 0xc9, 0x8d, 0x25, 0x9d, 0x0d, 0xcf, 0xbc, 0x75, 0x7f, 0x24, 0x40, + 0x7d, 0x44, 0x28, 0x46, 0xb7, 0x41, 0x65, 0x47, 0xc7, 0x15, 0xb9, 0x7c, 0x96, 0xc6, 0x3b, 0xf6, + 0xc0, 0xc5, 0xd6, 0x5e, 0x30, 0xe8, 0x1e, 0x79, 0x58, 0xe7, 0xe0, 0x88, 0xc4, 0x12, 0x31, 0x89, + 0xad, 0x41, 0xca, 0x27, 0x63, 0xd7, 0xe2, 0xca, 0x4b, 0xe9, 0x62, 0x82, 0x76, 0x20, 0x33, 0x55, + 0x8e, 0xfa, 0x77, 0xca, 0x59, 0x61, 0xca, 0x61, 0xba, 0x96, 0x06, 0x3d, 0xdd, 0x93, 0x02, 0x6a, + 0x40, 0x76, 0xfa, 0xc0, 0x49, 0x05, 0xfe, 0x33, 0x11, 0xcf, 0xdc, 0xd0, 0xbb, 0xb0, 0x3a, 0xd5, + 0xc3, 0x94, 0x50, 0xa1, 0xc2, 0xc2, 0x74, 0x41, 0x32, 0x1a, 0x93, 0x9a, 0x21, 0xde, 0xa6, 0x34, + 0xaf, 0x6b, 0x26, 0xb5, 0x26, 0x7f, 0xa4, 0xae, 0x42, 0x36, 0xb0, 0x07, 0xae, 0x49, 0xc7, 0x3e, + 0x96, 0x6a, 0x9c, 0x19, 0x2a, 0xdf, 0x24, 0x60, 0x51, 0xa8, 0x3b, 0xc2, 0x9b, 0x72, 0x36, 0x6f, + 0x89, 0xf3, 0x78, 0x4b, 0xbe, 0x3e, 0x6f, 0x75, 0x80, 0xe9, 0x66, 0x82, 0xa2, 0xaa, 0x25, 0x37, + 0x72, 0x9b, 0x57, 0xe6, 0x03, 0x89, 0x2d, 0x76, 0xec, 0x81, 0xbc, 0xbc, 0x11, 0xa7, 0xa9, 0x82, + 0x52, 0x91, 0x77, 0xf2, 0x0e, 0x64, 0x7b, 0x36, 0x35, 0x4c, 0xdf, 0x37, 0x8f, 0x38, 0x85, 0xb9, + 0xcd, 0x72, 0x34, 0x2a, 0x6b, 0x38, 0x55, 0xd6, 0x70, 0xaa, 0x0d, 0x9b, 0xd6, 0x19, 0x4a, 0xcf, + 0xf4, 0xe4, 0xa8, 0xf2, 0x8b, 0x02, 0xd9, 0x69, 0x42, 0x54, 0x87, 0x7c, 0x58, 0xa8, 0xf1, 0xd8, + 0x31, 0x07, 0x52, 0x8c, 0xd7, 0xce, 0xad, 0xf6, 0xae, 0x63, 0x0e, 0xf4, 0x9c, 0x2c, 0x90, 0x4d, + 0xce, 0x3e, 0xd8, 0xc4, 0x39, 0x07, 0x1b, 0x53, 0x52, 0xf2, 0xf5, 0x94, 0x14, 0x3b, 0x73, 0xf5, + 0xf4, 0x99, 0xff, 0x90, 0x80, 0x4c, 0x9b, 0x5f, 0x50, 0xd3, 0xf9, 0x2f, 0xae, 0xd8, 0x15, 0xc8, + 0x7a, 0xc4, 0x31, 0xc4, 0x8a, 0xca, 0x57, 0x32, 0x1e, 0x71, 0xf4, 0x39, 0x1d, 0xa5, 0xde, 0xd0, + 0xfd, 0x5b, 0x7c, 0x03, 0xac, 0xa5, 0x4f, 0xb3, 0xe6, 0xc3, 0x92, 0xa0, 0x42, 0x36, 0xcc, 0x5b, + 0x8c, 0x03, 0xde, 0x81, 0x45, 0xbf, 0x2c, 0xce, 0x6f, 0x5b, 0x20, 0x75, 0x89, 0x63, 0x1e, 0xa2, + 0xbf, 0xc8, 0x9e, 0x5d, 0x3c, 0x4f, 0xe7, 0xba, 0xc4, 0x55, 0x7e, 0x54, 0x20, 0xcb, 0x4b, 0xdd, + 0xc3, 0xd4, 0x8c, 0x51, 0xa5, 0xbc, 0x3e, 0x55, 0xd7, 0x00, 0x44, 0x98, 0xc0, 0x7e, 0x8a, 0xe5, + 0x01, 0x66, 0xb9, 0xa5, 0x63, 0x3f, 0xc5, 0xe8, 0x83, 0x69, 0x5d, 0xc9, 0xbf, 0xae, 0x4b, 0x5e, + 0xc5, 0xb0, 0xba, 0x4b, 0x90, 0x76, 0xc7, 0x23, 0x83, 0x3d, 0xef, 0xaa, 0x10, 0x85, 0x3b, 0x1e, + 0x75, 0x0f, 0x83, 0xca, 0x97, 0x90, 0xee, 0x1e, 0xf2, 0x4f, 0x1d, 0xa6, 0x04, 0x9f, 0x10, 0xd9, + 0x5f, 0xc5, 0x77, 0x4d, 0x86, 0x19, 0x78, 0x3b, 0x41, 0xa0, 0xb2, 0x46, 0x1a, 0x76, 0x02, 0x36, + 0x46, 0xef, 0xff, 0xbb, 0x6f, 0x29, 0xf9, 0x15, 0x75, 0xe3, 0x27, 0x05, 0x72, 0x91, 0xdb, 0x88, + 0xde, 0x83, 0x0b, 0x8d, 0xdd, 0xfd, 0xad, 0x07, 0x46, 0x73, 0xdb, 0xb8, 0xbb, 0x5b, 0xbf, 0x67, + 0x3c, 0x6c, 0x3d, 0x68, 0xed, 0x7f, 0xd6, 0x2a, 0x2c, 0x94, 0x2e, 0x1e, 0x4f, 0x34, 0x14, 0xc1, + 0x3e, 0x74, 0x9f, 0xb8, 0xe4, 0x2b, 0x17, 0xd5, 0x60, 0x2d, 0xee, 0x52, 0x6f, 0x74, 0x76, 0x5a, + 0xdd, 0x82, 0x52, 0xba, 0x70, 0x3c, 0xd1, 0x56, 0x23, 0x1e, 0xf5, 0x5e, 0x80, 0x5d, 0x3a, 0xef, + 0xb0, 0xb5, 0xbf, 0xb7, 0xd7, 0xec, 0x16, 0x12, 0x73, 0x0e, 0xf2, 0xbd, 0xbd, 0x0e, 0xab, 0x71, + 0x87, 0x56, 0x73, 0xb7, 0x90, 0x2c, 0xa1, 0xe3, 0x89, 0xb6, 0x1c, 0x41, 0xb7, 0x6c, 0xa7, 0x94, + 0xf9, 0xfa, 0xdb, 0xf2, 0xc2, 0xf7, 0xdf, 0x95, 0x15, 0x56, 0x59, 0x3e, 0x76, 0x23, 0xd1, 0x4d, + 0xb8, 0xd4, 0x69, 0xde, 0x6b, 0xed, 0x6c, 0x1b, 0x7b, 0x9d, 0x7b, 0x46, 0xf7, 0xf3, 0xf6, 0x4e, + 0xa4, 0xba, 0x95, 0xe3, 0x89, 0x96, 0x93, 0x25, 0x9d, 0x87, 0x6e, 0xeb, 0x3b, 0x8f, 0xf6, 0xbb, + 0x3b, 0x05, 0x45, 0xa0, 0xdb, 0x3e, 0x3e, 0x20, 0x14, 0x73, 0xf4, 0x2d, 0xb8, 0x7c, 0x06, 0x7a, + 0x5a, 0xd8, 0xea, 0xf1, 0x44, 0xcb, 0xb7, 0x7d, 0x2c, 0xd4, 0xca, 0x3d, 0xaa, 0x50, 0x9c, 0xf7, + 0xd8, 0x6f, 0xef, 0x77, 0xea, 0xbb, 0x05, 0xad, 0x54, 0x38, 0x9e, 0x68, 0x4b, 0xe1, 0xd3, 0xc3, + 0xf0, 0xb3, 0xca, 0x1a, 0x9f, 0x3e, 0x3f, 0x29, 0x2b, 0x2f, 0x4e, 0xca, 0xca, 0x6f, 0x27, 0x65, + 0xe5, 0xd9, 0xab, 0xf2, 0xc2, 0x8b, 0x57, 0xe5, 0x85, 0x9f, 0x5f, 0x95, 0x17, 0xbe, 0xf8, 0x70, + 0x60, 0xd3, 0xe1, 0xb8, 0x57, 0xed, 0x93, 0x51, 0x2d, 0xfa, 0xdb, 0x64, 0x36, 0x14, 0xbf, 0x3e, + 0x4e, 0xff, 0x6e, 0xe9, 0x2d, 0x72, 0xfb, 0xed, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x43, 0x91, + 0x60, 0x8d, 0xd2, 0x0c, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 8d6daa155..f83ab39f8 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -14,10 +14,10 @@ enum BlockIDFlag { option (gogoproto.goproto_enum_stringer) = true; option (gogoproto.goproto_enum_prefix) = false; - BLOCKD_ID_FLAG_UNKNOWN = 0; - BLOCK_ID_FLAG_ABSENT = 1 [(gogoproto.enumvalue_customname) = "BlockIDFlagAbsent"]; - BLOCK_ID_FLAG_COMMIT = 2 [(gogoproto.enumvalue_customname) = "BlockIDFlagCommit"]; - BLOCK_ID_FLAG_NIL = 3 [(gogoproto.enumvalue_customname) = "BlockIDFlagNil"]; + BLOCK_ID_FLAG_UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "BlockIDFlagUnknown"]; + BLOCK_ID_FLAG_ABSENT = 1 [(gogoproto.enumvalue_customname) = "BlockIDFlagAbsent"]; + BLOCK_ID_FLAG_COMMIT = 2 [(gogoproto.enumvalue_customname) = "BlockIDFlagCommit"]; + BLOCK_ID_FLAG_NIL = 3 [(gogoproto.enumvalue_customname) = "BlockIDFlagNil"]; } // SignedMsgType is a type of signed message in the consensus. @@ -25,13 +25,13 @@ enum SignedMsgType { option (gogoproto.goproto_enum_stringer) = true; option (gogoproto.goproto_enum_prefix) = false; - SIGNED_MSG_TYPE_UNKNOWN = 0; + SIGNED_MSG_TYPE_UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "UnknownType"]; // Votes - PREVOTE_TYPE = 1 [(gogoproto.enumvalue_customname) = "PrevoteType"]; - PRECOMMIT_TYPE = 2 [(gogoproto.enumvalue_customname) = "PrecommitType"]; + SIGNED_MSG_TYPE_PREVOTE = 1 [(gogoproto.enumvalue_customname) = "PrevoteType"]; + SIGNED_MSG_TYPE_PRECOMMIT = 2 [(gogoproto.enumvalue_customname) = "PrecommitType"]; // Proposals - PROPOSAL_TYPE = 32 [(gogoproto.enumvalue_customname) = "ProposalType"]; + SIGNED_MSG_TYPE_PROPOSAL = 32 [(gogoproto.enumvalue_customname) = "ProposalType"]; } // PartsetHeader diff --git a/statesync/syncer.go b/statesync/syncer.go index b2e8dc8c7..a805851c9 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -303,7 +303,7 @@ func (s *syncer) offerSnapshot(snapshot *snapshot) error { case abci.ResponseOfferSnapshot_REJECT_SENDER: return errRejectSender default: - return fmt.Errorf("invalid ResponseOfferSnapshot result %v", resp.Result) + return fmt.Errorf("unknown ResponseOfferSnapshot result %v", resp.Result) } } diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index e9043141c..3ff4b9673 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -214,7 +214,7 @@ func TestSyncer_SyncAny_noSnapshots(t *testing.T) { assert.Equal(t, errNoSnapshots, err) } -func TestSyncer_SyncAny_ABORT(t *testing.T) { +func TestSyncer_SyncAny_abort(t *testing.T) { syncer, connSnapshot := setupOfferSyncer(t) s := &snapshot{Height: 1, Format: 1, Chunks: 3, Hash: []byte{1, 2, 3}} @@ -256,7 +256,7 @@ func TestSyncer_SyncAny_reject(t *testing.T) { connSnapshot.AssertExpectations(t) } -func TestSyncer_SyncAny_REJECT_FORMAT(t *testing.T) { +func TestSyncer_SyncAny_reject_format(t *testing.T) { syncer, connSnapshot := setupOfferSyncer(t) // s22 is tried first, which reject s22 and s12, then s11 will abort. @@ -342,13 +342,14 @@ func TestSyncer_offerSnapshot(t *testing.T) { err error expectErr error }{ - "accept": {abci.ResponseOfferSnapshot_ACCEPT, nil, nil}, - "abort": {abci.ResponseOfferSnapshot_ABORT, nil, errAbort}, - "reject": {abci.ResponseOfferSnapshot_REJECT, nil, errRejectSnapshot}, - "reject_format": {abci.ResponseOfferSnapshot_REJECT_FORMAT, nil, errRejectFormat}, - "reject_sender": {abci.ResponseOfferSnapshot_REJECT_SENDER, nil, errRejectSender}, - "error": {0, boom, boom}, - "unknown result": {9, nil, unknownErr}, + "accept": {abci.ResponseOfferSnapshot_ACCEPT, nil, nil}, + "abort": {abci.ResponseOfferSnapshot_ABORT, nil, errAbort}, + "reject": {abci.ResponseOfferSnapshot_REJECT, nil, errRejectSnapshot}, + "reject_format": {abci.ResponseOfferSnapshot_REJECT_FORMAT, nil, errRejectFormat}, + "reject_sender": {abci.ResponseOfferSnapshot_REJECT_SENDER, nil, errRejectSender}, + "unknown": {abci.ResponseOfferSnapshot_UNKNOWN, nil, unknownErr}, + "error": {0, boom, boom}, + "unknown non-zero": {9, nil, unknownErr}, } for name, tc := range testcases { tc := tc @@ -382,13 +383,14 @@ func TestSyncer_applyChunks_Results(t *testing.T) { err error expectErr error }{ - "accept": {abci.ResponseApplySnapshotChunk_ACCEPT, nil, nil}, - "abort": {abci.ResponseApplySnapshotChunk_ABORT, nil, errAbort}, - "retry": {abci.ResponseApplySnapshotChunk_RETRY, nil, nil}, - "retry_snapshot": {abci.ResponseApplySnapshotChunk_RETRY_SNAPSHOT, nil, errRetrySnapshot}, - "reject_snapshot": {abci.ResponseApplySnapshotChunk_REJECT_SNAPSHOT, nil, errRejectSnapshot}, - "error": {0, boom, boom}, - "unknown result": {9, nil, unknownErr}, + "accept": {abci.ResponseApplySnapshotChunk_ACCEPT, nil, nil}, + "abort": {abci.ResponseApplySnapshotChunk_ABORT, nil, errAbort}, + "retry": {abci.ResponseApplySnapshotChunk_RETRY, nil, nil}, + "retry_snapshot": {abci.ResponseApplySnapshotChunk_RETRY_SNAPSHOT, nil, errRetrySnapshot}, + "reject_snapshot": {abci.ResponseApplySnapshotChunk_REJECT_SNAPSHOT, nil, errRejectSnapshot}, + "unknown": {abci.ResponseApplySnapshotChunk_UNKNOWN, nil, unknownErr}, + "error": {0, boom, boom}, + "unknown non-zero": {9, nil, unknownErr}, } for name, tc := range testcases { tc := tc diff --git a/types/vote_test.go b/types/vote_test.go index 1ea3fa46a..f0fdd2edd 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -252,13 +252,13 @@ func TestMaxVoteBytes(t *testing.T) { func TestVoteString(t *testing.T) { str := examplePrecommit().String() - expected := `Vote{56789:6AF1F4111082 12345/02/PRECOMMIT_TYPE(Precommit) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected := `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PRECOMMIT(Precommit) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str) } str2 := examplePrevote().String() - expected = `Vote{56789:6AF1F4111082 12345/02/PREVOTE_TYPE(Prevote) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests + expected = `Vote{56789:6AF1F4111082 12345/02/SIGNED_MSG_TYPE_PREVOTE(Prevote) 8B01023386C3 000000000000 @ 2017-12-25T03:00:01.234Z}` //nolint:lll //ignore line length for tests if str2 != expected { t.Errorf("got unexpected string for Vote. Expected:\n%v\nGot:\n%v", expected, str2) }