From 82e4693cc5847ea994724b263c8be2ac64c9dcb1 Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 8 Oct 2020 19:12:12 +0200 Subject: [PATCH] abci: remove setOption (#5447) Remove Response/Request SetOption from ABCI. Co-authored-by: Anton Kaliaev --- CHANGELOG_PENDING.md | 2 +- UPGRADING.md | 2 + abci/client/client.go | 4 +- abci/client/grpc_client.go | 14 - abci/client/local_client.go | 19 - abci/client/mocks/client.go | 41 +- abci/client/socket_client.go | 15 - abci/cmd/abci-cli/abci-cli.go | 34 +- abci/example/counter/counter.go | 19 +- abci/example/kvstore/persistent_kvstore.go | 4 - abci/server/socket_server.go | 3 - abci/tests/server/client.go | 11 - abci/tests/test_app/app.go | 25 - abci/tests/test_app/main.go | 12 +- abci/tests/test_cli/ex2.abci | 1 - abci/tests/test_cli/ex2.abci.out | 14 +- abci/types/application.go | 14 +- abci/types/messages.go | 13 - abci/types/result.go | 11 - abci/types/types.pb.go | 1274 ++++------------- docs/app-dev/abci-cli.md | 3 - .../adr-029-check-tx-consensus.md | 1 - docs/tutorials/go-built-in.md | 4 - docs/tutorials/go.md | 4 - evidence/mocks/block_store.go | 2 +- mempool/clist_mempool_test.go | 1 - p2p/mocks/peer.go | 2 +- proto/tendermint/abci/types.proto | 61 +- proxy/app_conn.go | 2 - proxy/mocks/app_conn_consensus.go | 2 +- proxy/mocks/app_conn_mempool.go | 2 +- proxy/mocks/app_conn_query.go | 2 +- proxy/mocks/app_conn_snapshot.go | 2 +- state/mocks/evidence_pool.go | 2 +- state/mocks/store.go | 2 +- statesync/mocks/state_provider.go | 2 +- 36 files changed, 342 insertions(+), 1284 deletions(-) diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index aab2f29ba..1e70bc1e4 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -11,6 +11,7 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi - CLI/RPC/Config - Apps + - [ABCI] \#5447 Remove `SetOption` method from `ABCI.Client` interface - P2P Protocol @@ -30,4 +31,3 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi ### BUG FIXES - [privval] \#5441 Fix faulty ping message encoding causing nil message errors in logs (@erikgrinaker) - diff --git a/UPGRADING.md b/UPGRADING.md index b1135645b..79b0e00b7 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -38,6 +38,8 @@ the encoding format (see "Protocol Buffers," below) and the block header (see "B * The field `Proof`, on the ABCI type `ResponseQuery`, is now named `ProofOps`. For more, see "Crypto," below. +* The method `SetOption` has been removed from the ABCI.Client interface. This feature was used in the early ABCI implementation's. + ### P2P Protocol The default codec is now proto3, not amino. The schema files can be found in the `/proto` diff --git a/abci/client/client.go b/abci/client/client.go index 09583327a..ede559fdc 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -14,6 +14,8 @@ const ( echoRetryIntervalSeconds = 1 ) +//go:generate mockery --case underscore --name Client + // Client defines an interface for an ABCI client. // All `Async` methods return a `ReqRes` object. // All `Sync` methods return the appropriate protobuf ResponseXxx struct and an error. @@ -28,7 +30,6 @@ type Client interface { FlushAsync() *ReqRes EchoAsync(msg string) *ReqRes InfoAsync(types.RequestInfo) *ReqRes - SetOptionAsync(types.RequestSetOption) *ReqRes DeliverTxAsync(types.RequestDeliverTx) *ReqRes CheckTxAsync(types.RequestCheckTx) *ReqRes QueryAsync(types.RequestQuery) *ReqRes @@ -44,7 +45,6 @@ type Client interface { FlushSync() error EchoSync(msg string) (*types.ResponseEcho, error) InfoSync(types.RequestInfo) (*types.ResponseInfo, error) - SetOptionSync(types.RequestSetOption) (*types.ResponseSetOption, error) DeliverTxSync(types.RequestDeliverTx) (*types.ResponseDeliverTx, error) CheckTxSync(types.RequestCheckTx) (*types.ResponseCheckTx, error) QuerySync(types.RequestQuery) (*types.ResponseQuery, error) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index da84bb77d..feeef7c8b 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -153,15 +153,6 @@ func (cli *grpcClient) InfoAsync(params types.RequestInfo) *ReqRes { return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_Info{Info: res}}) } -func (cli *grpcClient) SetOptionAsync(params types.RequestSetOption) *ReqRes { - req := types.ToRequestSetOption(params) - res, err := cli.client.SetOption(context.Background(), req.GetSetOption(), grpc.WaitForReady(true)) - if err != nil { - cli.StopForError(err) - } - return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_SetOption{SetOption: res}}) -} - func (cli *grpcClient) DeliverTxAsync(params types.RequestDeliverTx) *ReqRes { req := types.ToRequestDeliverTx(params) res, err := cli.client.DeliverTx(context.Background(), req.GetDeliverTx(), grpc.WaitForReady(true)) @@ -303,11 +294,6 @@ func (cli *grpcClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, err return reqres.Response.GetInfo(), cli.Error() } -func (cli *grpcClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) { - reqres := cli.SetOptionAsync(req) - return reqres.Response.GetSetOption(), cli.Error() -} - func (cli *grpcClient) DeliverTxSync(params types.RequestDeliverTx) (*types.ResponseDeliverTx, error) { reqres := cli.DeliverTxAsync(params) return reqres.Response.GetDeliverTx(), cli.Error() diff --git a/abci/client/local_client.go b/abci/client/local_client.go index b3bdc451d..293d5f549 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -69,17 +69,6 @@ func (app *localClient) InfoAsync(req types.RequestInfo) *ReqRes { ) } -func (app *localClient) SetOptionAsync(req types.RequestSetOption) *ReqRes { - app.mtx.Lock() - defer app.mtx.Unlock() - - res := app.Application.SetOption(req) - return app.callback( - types.ToRequestSetOption(req), - types.ToResponseSetOption(res), - ) -} - func (app *localClient) DeliverTxAsync(params types.RequestDeliverTx) *ReqRes { app.mtx.Lock() defer app.mtx.Unlock() @@ -219,14 +208,6 @@ func (app *localClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, er return &res, nil } -func (app *localClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) { - app.mtx.Lock() - defer app.mtx.Unlock() - - res := app.Application.SetOption(req) - return &res, nil -} - func (app *localClient) DeliverTxSync(req types.RequestDeliverTx) (*types.ResponseDeliverTx, error) { app.mtx.Lock() defer app.mtx.Unlock() diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 6d7f99b0f..2ff84183c 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v1.1.1. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks @@ -649,45 +649,6 @@ func (_m *Client) SetLogger(_a0 log.Logger) { _m.Called(_a0) } -// SetOptionAsync provides a mock function with given fields: _a0 -func (_m *Client) SetOptionAsync(_a0 types.RequestSetOption) *abcicli.ReqRes { - ret := _m.Called(_a0) - - var r0 *abcicli.ReqRes - if rf, ok := ret.Get(0).(func(types.RequestSetOption) *abcicli.ReqRes); ok { - r0 = rf(_a0) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*abcicli.ReqRes) - } - } - - return r0 -} - -// SetOptionSync provides a mock function with given fields: _a0 -func (_m *Client) SetOptionSync(_a0 types.RequestSetOption) (*types.ResponseSetOption, error) { - ret := _m.Called(_a0) - - var r0 *types.ResponseSetOption - if rf, ok := ret.Get(0).(func(types.RequestSetOption) *types.ResponseSetOption); ok { - r0 = rf(_a0) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*types.ResponseSetOption) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(types.RequestSetOption) error); ok { - r1 = rf(_a0) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - // SetResponseCallback provides a mock function with given fields: _a0 func (_m *Client) SetResponseCallback(_a0 abcicli.Callback) { _m.Called(_a0) diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 1e6a47801..040ac2d37 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -233,10 +233,6 @@ func (cli *socketClient) InfoAsync(req types.RequestInfo) *ReqRes { return cli.queueRequest(types.ToRequestInfo(req)) } -func (cli *socketClient) SetOptionAsync(req types.RequestSetOption) *ReqRes { - return cli.queueRequest(types.ToRequestSetOption(req)) -} - func (cli *socketClient) DeliverTxAsync(req types.RequestDeliverTx) *ReqRes { return cli.queueRequest(types.ToRequestDeliverTx(req)) } @@ -310,15 +306,6 @@ func (cli *socketClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, e return reqres.Response.GetInfo(), cli.Error() } -func (cli *socketClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) { - reqres := cli.queueRequest(types.ToRequestSetOption(req)) - if err := cli.FlushSync(); err != nil { - return nil, err - } - - return reqres.Response.GetSetOption(), cli.Error() -} - func (cli *socketClient) DeliverTxSync(req types.RequestDeliverTx) (*types.ResponseDeliverTx, error) { reqres := cli.queueRequest(types.ToRequestDeliverTx(req)) if err := cli.FlushSync(); err != nil { @@ -470,8 +457,6 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { _, ok = res.Value.(*types.Response_Flush) case *types.Request_Info: _, ok = res.Value.(*types.Response_Info) - case *types.Request_SetOption: - _, ok = res.Value.(*types.Response_SetOption) case *types.Request_DeliverTx: _, ok = res.Value.(*types.Response_DeliverTx) case *types.Request_CheckTx: diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index dba950916..128403162 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -148,7 +148,6 @@ func addCommands() { RootCmd.AddCommand(consoleCmd) RootCmd.AddCommand(echoCmd) RootCmd.AddCommand(infoCmd) - RootCmd.AddCommand(setOptionCmd) RootCmd.AddCommand(deliverTxCmd) RootCmd.AddCommand(checkTxCmd) RootCmd.AddCommand(commitCmd) @@ -176,7 +175,6 @@ you'd like to run: where example.file looks something like: - set_option serial on check_tx 0x00 check_tx 0xff deliver_tx 0x00 @@ -198,7 +196,7 @@ This command opens an interactive console for running any of the other commands without opening a new connection each time `, Args: cobra.ExactArgs(0), - ValidArgs: []string{"echo", "info", "set_option", "deliver_tx", "check_tx", "commit", "query"}, + ValidArgs: []string{"echo", "info", "deliver_tx", "check_tx", "commit", "query"}, RunE: cmdConsole, } @@ -216,13 +214,6 @@ var infoCmd = &cobra.Command{ Args: cobra.ExactArgs(0), RunE: cmdInfo, } -var setOptionCmd = &cobra.Command{ - Use: "set_option", - Short: "set an option on the application", - Long: "set an option on the application", - Args: cobra.ExactArgs(2), - RunE: cmdSetOption, -} var deliverTxCmd = &cobra.Command{ Use: "deliver_tx", @@ -324,7 +315,6 @@ func cmdTest(cmd *cobra.Command, args []string) error { return compose( []func() error{ func() error { return servertest.InitChain(client) }, - func() error { return servertest.SetOption(client, "serial", "on") }, func() error { return servertest.Commit(client, nil) }, func() error { return servertest.DeliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil) }, func() error { return servertest.Commit(client, nil) }, @@ -439,8 +429,6 @@ func muxOnCommands(cmd *cobra.Command, pArgs []string) error { return cmdInfo(cmd, actualArgs) case "query": return cmdQuery(cmd, actualArgs) - case "set_option": - return cmdSetOption(cmd, actualArgs) default: return cmdUnimplemented(cmd, pArgs) } @@ -464,7 +452,6 @@ func cmdUnimplemented(cmd *cobra.Command, args []string) error { fmt.Printf("%s: %s\n", deliverTxCmd.Use, deliverTxCmd.Short) fmt.Printf("%s: %s\n", queryCmd.Use, queryCmd.Short) fmt.Printf("%s: %s\n", commitCmd.Use, commitCmd.Short) - fmt.Printf("%s: %s\n", setOptionCmd.Use, setOptionCmd.Short) fmt.Println("Use \"[command] --help\" for more information about a command.") return nil @@ -504,25 +491,6 @@ func cmdInfo(cmd *cobra.Command, args []string) error { const codeBad uint32 = 10 -// Set an option on the application -func cmdSetOption(cmd *cobra.Command, args []string) error { - if len(args) < 2 { - printResponse(cmd, args, response{ - Code: codeBad, - Log: "want at least arguments of the form: ", - }) - return nil - } - - key, val := args[0], args[1] - _, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: val}) - if err != nil { - return err - } - printResponse(cmd, args, response{Log: "OK (SetOption doesn't return anything.)"}) // NOTE: Nothing to show... - return nil -} - // Append a new tx to application func cmdDeliverTx(cmd *cobra.Command, args []string) error { if len(args) == 0 { diff --git a/abci/example/counter/counter.go b/abci/example/counter/counter.go index 58f8aabb9..221fb12bd 100644 --- a/abci/example/counter/counter.go +++ b/abci/example/counter/counter.go @@ -24,24 +24,6 @@ func (app *Application) Info(req types.RequestInfo) types.ResponseInfo { return types.ResponseInfo{Data: fmt.Sprintf("{\"hashes\":%v,\"txs\":%v}", app.hashCount, app.txCount)} } -func (app *Application) SetOption(req types.RequestSetOption) types.ResponseSetOption { - key, value := req.Key, req.Value - if key == "serial" && value == "on" { - app.serial = true - } else { - /* - TODO Panic and have the ABCI server pass an exception. - The client can call SetOptionSync() and get an `error`. - return types.ResponseSetOption{ - Error: fmt.Sprintf("Unknown key (%s) or value (%s)", key, value), - } - */ - return types.ResponseSetOption{} - } - - return types.ResponseSetOption{} -} - func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { if app.serial { if len(req.Tx) > 8 { @@ -69,6 +51,7 @@ func (app *Application) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx Code: code.CodeTypeEncodingError, Log: fmt.Sprintf("Max tx size is 8 bytes, got %d", len(req.Tx))} } + tx8 := make([]byte, 8) copy(tx8[len(tx8)-len(req.Tx):], req.Tx) txValue := binary.BigEndian.Uint64(tx8) diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 27c22a719..2f5ad098b 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -62,10 +62,6 @@ func (app *PersistentKVStoreApplication) Info(req types.RequestInfo) types.Respo return res } -func (app *PersistentKVStoreApplication) SetOption(req types.RequestSetOption) types.ResponseSetOption { - return app.app.SetOption(req) -} - // tx is either "val:pubkey!power" or "key=value" or just arbitrary bytes func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { // if it starts with "val:", update the validator set diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 3f99a3765..cf3663d2d 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -200,9 +200,6 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types case *types.Request_Info: res := s.app.Info(*r.Info) responses <- types.ToResponseInfo(res) - case *types.Request_SetOption: - res := s.app.SetOption(*r.SetOption) - responses <- types.ToResponseSetOption(res) case *types.Request_DeliverTx: res := s.app.DeliverTx(*r.DeliverTx) responses <- types.ToResponseDeliverTx(res) diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go index 36989f6ac..c9d15a98a 100644 --- a/abci/tests/server/client.go +++ b/abci/tests/server/client.go @@ -29,17 +29,6 @@ func InitChain(client abcicli.Client) error { return nil } -func SetOption(client abcicli.Client, key, value string) error { - _, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value}) - if err != nil { - fmt.Println("Failed test: SetOption") - fmt.Printf("error while setting %v=%v: \nerror: %v\n", key, value, err) - return err - } - fmt.Println("Passed test: SetOption") - return nil -} - func Commit(client abcicli.Client, hashExp []byte) error { res, err := client.CommitSync() data := res.Data diff --git a/abci/tests/test_app/app.go b/abci/tests/test_app/app.go index 9c32fcc7d..8876ada48 100644 --- a/abci/tests/test_app/app.go +++ b/abci/tests/test_app/app.go @@ -25,13 +25,6 @@ func startClient(abciType string) abcicli.Client { return client } -func setOption(client abcicli.Client, key, value string) { - _, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value}) - if err != nil { - panicf("setting %v=%v: \nerr: %v", key, value, err) - } -} - func commit(client abcicli.Client, hashExp []byte) { res, err := client.CommitSync() if err != nil { @@ -55,24 +48,6 @@ func deliverTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp [] } } -/*func checkTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []byte) { - res, err := client.CheckTxSync(txBytes) - if err != nil { - panicf("client error: %v", err) - } - if res.IsErr() { - panicf("checking tx %X: %v\nlog: %v", txBytes, res.Log) - } - if res.Code != codeExp { - panicf("CheckTx response code was unexpected. Got %v expected %v. Log: %v", - res.Code, codeExp, res.Log) - } - if !bytes.Equal(res.Data, dataExp) { - panicf("CheckTx response data was unexpected. Got %X expected %X", - res.Data, dataExp) - } -}*/ - func panicf(format string, a ...interface{}) { panic(fmt.Sprintf(format, a...)) } diff --git a/abci/tests/test_app/main.go b/abci/tests/test_app/main.go index 32d04311f..78c5d78f3 100644 --- a/abci/tests/test_app/main.go +++ b/abci/tests/test_app/main.go @@ -7,7 +7,6 @@ import ( "os/exec" "time" - "github.com/tendermint/tendermint/abci/example/code" "github.com/tendermint/tendermint/abci/types" ) @@ -41,7 +40,7 @@ func ensureABCIIsUp(typ string, n int) error { if err == nil { break } - <-time.After(500 * time.Millisecond) + time.Sleep(500 * time.Millisecond) } return err } @@ -79,17 +78,16 @@ func testCounter() { } }() - setOption(client, "serial", "on") - commit(client, nil) - deliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil) + // commit(client, nil) + // deliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil) commit(client, nil) deliverTx(client, []byte{0x00}, types.CodeTypeOK, nil) commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 1}) - deliverTx(client, []byte{0x00}, code.CodeTypeBadNonce, nil) + // deliverTx(client, []byte{0x00}, code.CodeTypeBadNonce, nil) deliverTx(client, []byte{0x01}, types.CodeTypeOK, nil) deliverTx(client, []byte{0x00, 0x02}, types.CodeTypeOK, nil) deliverTx(client, []byte{0x00, 0x03}, types.CodeTypeOK, nil) deliverTx(client, []byte{0x00, 0x00, 0x04}, types.CodeTypeOK, nil) - deliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) + // deliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) } diff --git a/abci/tests/test_cli/ex2.abci b/abci/tests/test_cli/ex2.abci index 3b435f22a..965ca842c 100644 --- a/abci/tests/test_cli/ex2.abci +++ b/abci/tests/test_cli/ex2.abci @@ -1,4 +1,3 @@ -set_option serial on check_tx 0x00 check_tx 0xff deliver_tx 0x00 diff --git a/abci/tests/test_cli/ex2.abci.out b/abci/tests/test_cli/ex2.abci.out index 5bceb85d8..7ef8abbc4 100644 --- a/abci/tests/test_cli/ex2.abci.out +++ b/abci/tests/test_cli/ex2.abci.out @@ -1,7 +1,3 @@ -> set_option serial on --> code: OK --> log: OK (SetOption doesn't return anything.) - > check_tx 0x00 -> code: OK @@ -12,18 +8,16 @@ -> code: OK > check_tx 0x00 --> code: 2 --> log: Invalid nonce. Expected >= 1, got 0 +-> code: OK > deliver_tx 0x01 -> code: OK > deliver_tx 0x04 --> code: 2 --> log: Invalid nonce. Expected 2, got 4 +-> code: OK > info -> code: OK --> data: {"hashes":0,"txs":2} --> data.hex: 0x7B22686173686573223A302C22747873223A327D +-> data: {"hashes":0,"txs":3} +-> data.hex: 0x7B22686173686573223A302C22747873223A337D diff --git a/abci/types/application.go b/abci/types/application.go index 65cc78b8c..5b8270ba6 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -10,9 +10,8 @@ import ( // except CheckTx/DeliverTx, which take `tx []byte`, and `Commit`, which takes nothing. type Application interface { // Info/Query Connection - Info(RequestInfo) ResponseInfo // Return application info - SetOption(RequestSetOption) ResponseSetOption // Set application option - Query(RequestQuery) ResponseQuery // Query for state + Info(RequestInfo) ResponseInfo // Return application info + Query(RequestQuery) ResponseQuery // Query for state // Mempool Connection CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool @@ -47,10 +46,6 @@ func (BaseApplication) Info(req RequestInfo) ResponseInfo { return ResponseInfo{} } -func (BaseApplication) SetOption(req RequestSetOption) ResponseSetOption { - return ResponseSetOption{} -} - func (BaseApplication) DeliverTx(req RequestDeliverTx) ResponseDeliverTx { return ResponseDeliverTx{Code: CodeTypeOK} } @@ -119,11 +114,6 @@ func (app *GRPCApplication) Info(ctx context.Context, req *RequestInfo) (*Respon return &res, nil } -func (app *GRPCApplication) SetOption(ctx context.Context, req *RequestSetOption) (*ResponseSetOption, error) { - res := app.app.SetOption(*req) - return &res, nil -} - func (app *GRPCApplication) DeliverTx(ctx context.Context, req *RequestDeliverTx) (*ResponseDeliverTx, error) { res := app.app.DeliverTx(*req) return &res, nil diff --git a/abci/types/messages.go b/abci/types/messages.go index 531f75fed..eaf1721dd 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -87,12 +87,6 @@ func ToRequestInfo(req RequestInfo) *Request { } } -func ToRequestSetOption(req RequestSetOption) *Request { - return &Request{ - Value: &Request_SetOption{&req}, - } -} - func ToRequestDeliverTx(req RequestDeliverTx) *Request { return &Request{ Value: &Request_DeliverTx{&req}, @@ -184,13 +178,6 @@ func ToResponseInfo(res ResponseInfo) *Response { Value: &Response_Info{&res}, } } - -func ToResponseSetOption(res ResponseSetOption) *Response { - return &Response{ - Value: &Response_SetOption{&res}, - } -} - func ToResponseDeliverTx(res ResponseDeliverTx) *Response { return &Response{ Value: &Response_DeliverTx{&res}, diff --git a/abci/types/result.go b/abci/types/result.go index e8916960f..1442ea39c 100644 --- a/abci/types/result.go +++ b/abci/types/result.go @@ -52,16 +52,6 @@ var ( jsonpbUnmarshaller = jsonpb.Unmarshaler{} ) -func (r *ResponseSetOption) MarshalJSON() ([]byte, error) { - s, err := jsonpbMarshaller.MarshalToString(r) - return []byte(s), err -} - -func (r *ResponseSetOption) UnmarshalJSON(b []byte) error { - reader := bytes.NewBuffer(b) - return jsonpbUnmarshaller.Unmarshal(reader, r) -} - func (r *ResponseCheckTx) MarshalJSON() ([]byte, error) { s, err := jsonpbMarshaller.MarshalToString(r) return []byte(s), err @@ -126,6 +116,5 @@ var _ jsonRoundTripper = (*ResponseCommit)(nil) var _ jsonRoundTripper = (*ResponseQuery)(nil) var _ jsonRoundTripper = (*ResponseDeliverTx)(nil) var _ jsonRoundTripper = (*ResponseCheckTx)(nil) -var _ jsonRoundTripper = (*ResponseSetOption)(nil) var _ jsonRoundTripper = (*EventAttribute)(nil) diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index c99bf114e..8801f17d6 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -120,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30, 0} + return fileDescriptor_252557cfdd89a31a, []int{28, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32, 0} + return fileDescriptor_252557cfdd89a31a, []int{30, 0} } type Request struct { @@ -165,7 +165,6 @@ type Request struct { // *Request_Echo // *Request_Flush // *Request_Info - // *Request_SetOption // *Request_InitChain // *Request_Query // *Request_BeginBlock @@ -228,47 +227,43 @@ type Request_Flush struct { type Request_Info struct { Info *RequestInfo `protobuf:"bytes,3,opt,name=info,proto3,oneof" json:"info,omitempty"` } -type Request_SetOption struct { - SetOption *RequestSetOption `protobuf:"bytes,4,opt,name=set_option,json=setOption,proto3,oneof" json:"set_option,omitempty"` -} type Request_InitChain struct { - InitChain *RequestInitChain `protobuf:"bytes,5,opt,name=init_chain,json=initChain,proto3,oneof" json:"init_chain,omitempty"` + InitChain *RequestInitChain `protobuf:"bytes,4,opt,name=init_chain,json=initChain,proto3,oneof" json:"init_chain,omitempty"` } type Request_Query struct { - Query *RequestQuery `protobuf:"bytes,6,opt,name=query,proto3,oneof" json:"query,omitempty"` + Query *RequestQuery `protobuf:"bytes,5,opt,name=query,proto3,oneof" json:"query,omitempty"` } type Request_BeginBlock struct { - BeginBlock *RequestBeginBlock `protobuf:"bytes,7,opt,name=begin_block,json=beginBlock,proto3,oneof" json:"begin_block,omitempty"` + BeginBlock *RequestBeginBlock `protobuf:"bytes,6,opt,name=begin_block,json=beginBlock,proto3,oneof" json:"begin_block,omitempty"` } type Request_CheckTx struct { - CheckTx *RequestCheckTx `protobuf:"bytes,8,opt,name=check_tx,json=checkTx,proto3,oneof" json:"check_tx,omitempty"` + CheckTx *RequestCheckTx `protobuf:"bytes,7,opt,name=check_tx,json=checkTx,proto3,oneof" json:"check_tx,omitempty"` } type Request_DeliverTx struct { - DeliverTx *RequestDeliverTx `protobuf:"bytes,9,opt,name=deliver_tx,json=deliverTx,proto3,oneof" json:"deliver_tx,omitempty"` + DeliverTx *RequestDeliverTx `protobuf:"bytes,8,opt,name=deliver_tx,json=deliverTx,proto3,oneof" json:"deliver_tx,omitempty"` } type Request_EndBlock struct { - EndBlock *RequestEndBlock `protobuf:"bytes,10,opt,name=end_block,json=endBlock,proto3,oneof" json:"end_block,omitempty"` + EndBlock *RequestEndBlock `protobuf:"bytes,9,opt,name=end_block,json=endBlock,proto3,oneof" json:"end_block,omitempty"` } type Request_Commit struct { - Commit *RequestCommit `protobuf:"bytes,11,opt,name=commit,proto3,oneof" json:"commit,omitempty"` + Commit *RequestCommit `protobuf:"bytes,10,opt,name=commit,proto3,oneof" json:"commit,omitempty"` } type Request_ListSnapshots struct { - ListSnapshots *RequestListSnapshots `protobuf:"bytes,12,opt,name=list_snapshots,json=listSnapshots,proto3,oneof" json:"list_snapshots,omitempty"` + ListSnapshots *RequestListSnapshots `protobuf:"bytes,11,opt,name=list_snapshots,json=listSnapshots,proto3,oneof" json:"list_snapshots,omitempty"` } type Request_OfferSnapshot struct { - OfferSnapshot *RequestOfferSnapshot `protobuf:"bytes,13,opt,name=offer_snapshot,json=offerSnapshot,proto3,oneof" json:"offer_snapshot,omitempty"` + OfferSnapshot *RequestOfferSnapshot `protobuf:"bytes,12,opt,name=offer_snapshot,json=offerSnapshot,proto3,oneof" json:"offer_snapshot,omitempty"` } type Request_LoadSnapshotChunk struct { - LoadSnapshotChunk *RequestLoadSnapshotChunk `protobuf:"bytes,14,opt,name=load_snapshot_chunk,json=loadSnapshotChunk,proto3,oneof" json:"load_snapshot_chunk,omitempty"` + LoadSnapshotChunk *RequestLoadSnapshotChunk `protobuf:"bytes,13,opt,name=load_snapshot_chunk,json=loadSnapshotChunk,proto3,oneof" json:"load_snapshot_chunk,omitempty"` } type Request_ApplySnapshotChunk struct { - ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` + ApplySnapshotChunk *RequestApplySnapshotChunk `protobuf:"bytes,14,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } func (*Request_Echo) isRequest_Value() {} func (*Request_Flush) isRequest_Value() {} func (*Request_Info) isRequest_Value() {} -func (*Request_SetOption) isRequest_Value() {} func (*Request_InitChain) isRequest_Value() {} func (*Request_Query) isRequest_Value() {} func (*Request_BeginBlock) isRequest_Value() {} @@ -309,13 +304,6 @@ func (m *Request) GetInfo() *RequestInfo { return nil } -func (m *Request) GetSetOption() *RequestSetOption { - if x, ok := m.GetValue().(*Request_SetOption); ok { - return x.SetOption - } - return nil -} - func (m *Request) GetInitChain() *RequestInitChain { if x, ok := m.GetValue().(*Request_InitChain); ok { return x.InitChain @@ -399,7 +387,6 @@ func (*Request) XXX_OneofWrappers() []interface{} { (*Request_Echo)(nil), (*Request_Flush)(nil), (*Request_Info)(nil), - (*Request_SetOption)(nil), (*Request_InitChain)(nil), (*Request_Query)(nil), (*Request_BeginBlock)(nil), @@ -554,59 +541,6 @@ func (m *RequestInfo) GetP2PVersion() uint64 { return 0 } -// nondeterministic -type RequestSetOption struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` -} - -func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } -func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } -func (*RequestSetOption) ProtoMessage() {} -func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{4} -} -func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RequestSetOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RequestSetOption.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RequestSetOption) XXX_Merge(src proto.Message) { - xxx_messageInfo_RequestSetOption.Merge(m, src) -} -func (m *RequestSetOption) XXX_Size() int { - return m.Size() -} -func (m *RequestSetOption) XXX_DiscardUnknown() { - xxx_messageInfo_RequestSetOption.DiscardUnknown(m) -} - -var xxx_messageInfo_RequestSetOption proto.InternalMessageInfo - -func (m *RequestSetOption) GetKey() string { - if m != nil { - return m.Key - } - return "" -} - -func (m *RequestSetOption) GetValue() string { - if m != nil { - return m.Value - } - return "" -} - type RequestInitChain struct { Time time.Time `protobuf:"bytes,1,opt,name=time,proto3,stdtime" json:"time"` ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` @@ -620,7 +554,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{5} + return fileDescriptor_252557cfdd89a31a, []int{4} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -702,7 +636,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{6} + return fileDescriptor_252557cfdd89a31a, []int{5} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -770,7 +704,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{7} + return fileDescriptor_252557cfdd89a31a, []int{6} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -836,7 +770,7 @@ func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{8} + return fileDescriptor_252557cfdd89a31a, []int{7} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -887,7 +821,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{9} + return fileDescriptor_252557cfdd89a31a, []int{8} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -931,7 +865,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{10} + return fileDescriptor_252557cfdd89a31a, []int{9} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -974,7 +908,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{11} + return fileDescriptor_252557cfdd89a31a, []int{10} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1011,7 +945,7 @@ func (m *RequestListSnapshots) Reset() { *m = RequestListSnapshots{} } func (m *RequestListSnapshots) String() string { return proto.CompactTextString(m) } func (*RequestListSnapshots) ProtoMessage() {} func (*RequestListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{12} + return fileDescriptor_252557cfdd89a31a, []int{11} } func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +984,7 @@ func (m *RequestOfferSnapshot) Reset() { *m = RequestOfferSnapshot{} } func (m *RequestOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*RequestOfferSnapshot) ProtoMessage() {} func (*RequestOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{13} + return fileDescriptor_252557cfdd89a31a, []int{12} } func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1104,7 +1038,7 @@ func (m *RequestLoadSnapshotChunk) Reset() { *m = RequestLoadSnapshotChu func (m *RequestLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestLoadSnapshotChunk) ProtoMessage() {} func (*RequestLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{14} + return fileDescriptor_252557cfdd89a31a, []int{13} } func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1165,7 +1099,7 @@ func (m *RequestApplySnapshotChunk) Reset() { *m = RequestApplySnapshotC func (m *RequestApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestApplySnapshotChunk) ProtoMessage() {} func (*RequestApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{15} + return fileDescriptor_252557cfdd89a31a, []int{14} } func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1221,7 +1155,6 @@ type Response struct { // *Response_Echo // *Response_Flush // *Response_Info - // *Response_SetOption // *Response_InitChain // *Response_Query // *Response_BeginBlock @@ -1240,7 +1173,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_252557cfdd89a31a, []int{15} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1287,48 +1220,44 @@ type Response_Flush struct { type Response_Info struct { Info *ResponseInfo `protobuf:"bytes,4,opt,name=info,proto3,oneof" json:"info,omitempty"` } -type Response_SetOption struct { - SetOption *ResponseSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,proto3,oneof" json:"set_option,omitempty"` -} type Response_InitChain struct { - InitChain *ResponseInitChain `protobuf:"bytes,6,opt,name=init_chain,json=initChain,proto3,oneof" json:"init_chain,omitempty"` + InitChain *ResponseInitChain `protobuf:"bytes,5,opt,name=init_chain,json=initChain,proto3,oneof" json:"init_chain,omitempty"` } type Response_Query struct { - Query *ResponseQuery `protobuf:"bytes,7,opt,name=query,proto3,oneof" json:"query,omitempty"` + Query *ResponseQuery `protobuf:"bytes,6,opt,name=query,proto3,oneof" json:"query,omitempty"` } type Response_BeginBlock struct { - BeginBlock *ResponseBeginBlock `protobuf:"bytes,8,opt,name=begin_block,json=beginBlock,proto3,oneof" json:"begin_block,omitempty"` + BeginBlock *ResponseBeginBlock `protobuf:"bytes,7,opt,name=begin_block,json=beginBlock,proto3,oneof" json:"begin_block,omitempty"` } type Response_CheckTx struct { - CheckTx *ResponseCheckTx `protobuf:"bytes,9,opt,name=check_tx,json=checkTx,proto3,oneof" json:"check_tx,omitempty"` + CheckTx *ResponseCheckTx `protobuf:"bytes,8,opt,name=check_tx,json=checkTx,proto3,oneof" json:"check_tx,omitempty"` } type Response_DeliverTx struct { - DeliverTx *ResponseDeliverTx `protobuf:"bytes,10,opt,name=deliver_tx,json=deliverTx,proto3,oneof" json:"deliver_tx,omitempty"` + DeliverTx *ResponseDeliverTx `protobuf:"bytes,9,opt,name=deliver_tx,json=deliverTx,proto3,oneof" json:"deliver_tx,omitempty"` } type Response_EndBlock struct { - EndBlock *ResponseEndBlock `protobuf:"bytes,11,opt,name=end_block,json=endBlock,proto3,oneof" json:"end_block,omitempty"` + EndBlock *ResponseEndBlock `protobuf:"bytes,10,opt,name=end_block,json=endBlock,proto3,oneof" json:"end_block,omitempty"` } type Response_Commit struct { - Commit *ResponseCommit `protobuf:"bytes,12,opt,name=commit,proto3,oneof" json:"commit,omitempty"` + Commit *ResponseCommit `protobuf:"bytes,11,opt,name=commit,proto3,oneof" json:"commit,omitempty"` } type Response_ListSnapshots struct { - ListSnapshots *ResponseListSnapshots `protobuf:"bytes,13,opt,name=list_snapshots,json=listSnapshots,proto3,oneof" json:"list_snapshots,omitempty"` + ListSnapshots *ResponseListSnapshots `protobuf:"bytes,12,opt,name=list_snapshots,json=listSnapshots,proto3,oneof" json:"list_snapshots,omitempty"` } type Response_OfferSnapshot struct { - OfferSnapshot *ResponseOfferSnapshot `protobuf:"bytes,14,opt,name=offer_snapshot,json=offerSnapshot,proto3,oneof" json:"offer_snapshot,omitempty"` + OfferSnapshot *ResponseOfferSnapshot `protobuf:"bytes,13,opt,name=offer_snapshot,json=offerSnapshot,proto3,oneof" json:"offer_snapshot,omitempty"` } type Response_LoadSnapshotChunk struct { - LoadSnapshotChunk *ResponseLoadSnapshotChunk `protobuf:"bytes,15,opt,name=load_snapshot_chunk,json=loadSnapshotChunk,proto3,oneof" json:"load_snapshot_chunk,omitempty"` + LoadSnapshotChunk *ResponseLoadSnapshotChunk `protobuf:"bytes,14,opt,name=load_snapshot_chunk,json=loadSnapshotChunk,proto3,oneof" json:"load_snapshot_chunk,omitempty"` } type Response_ApplySnapshotChunk struct { - ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,16,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` + ApplySnapshotChunk *ResponseApplySnapshotChunk `protobuf:"bytes,15,opt,name=apply_snapshot_chunk,json=applySnapshotChunk,proto3,oneof" json:"apply_snapshot_chunk,omitempty"` } func (*Response_Exception) isResponse_Value() {} func (*Response_Echo) isResponse_Value() {} func (*Response_Flush) isResponse_Value() {} func (*Response_Info) isResponse_Value() {} -func (*Response_SetOption) isResponse_Value() {} func (*Response_InitChain) isResponse_Value() {} func (*Response_Query) isResponse_Value() {} func (*Response_BeginBlock) isResponse_Value() {} @@ -1376,13 +1305,6 @@ func (m *Response) GetInfo() *ResponseInfo { return nil } -func (m *Response) GetSetOption() *ResponseSetOption { - if x, ok := m.GetValue().(*Response_SetOption); ok { - return x.SetOption - } - return nil -} - func (m *Response) GetInitChain() *ResponseInitChain { if x, ok := m.GetValue().(*Response_InitChain); ok { return x.InitChain @@ -1467,7 +1389,6 @@ func (*Response) XXX_OneofWrappers() []interface{} { (*Response_Echo)(nil), (*Response_Flush)(nil), (*Response_Info)(nil), - (*Response_SetOption)(nil), (*Response_InitChain)(nil), (*Response_Query)(nil), (*Response_BeginBlock)(nil), @@ -1491,7 +1412,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_252557cfdd89a31a, []int{16} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1535,7 +1456,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_252557cfdd89a31a, []int{17} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1578,7 +1499,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_252557cfdd89a31a, []int{18} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1619,7 +1540,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_252557cfdd89a31a, []int{19} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1683,68 +1604,6 @@ func (m *ResponseInfo) GetLastBlockAppHash() []byte { return nil } -// nondeterministic -type ResponseSetOption struct { - Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` - // bytes data = 2; - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` -} - -func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } -func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } -func (*ResponseSetOption) ProtoMessage() {} -func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} -} -func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ResponseSetOption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ResponseSetOption.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ResponseSetOption) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResponseSetOption.Merge(m, src) -} -func (m *ResponseSetOption) XXX_Size() int { - return m.Size() -} -func (m *ResponseSetOption) XXX_DiscardUnknown() { - xxx_messageInfo_ResponseSetOption.DiscardUnknown(m) -} - -var xxx_messageInfo_ResponseSetOption proto.InternalMessageInfo - -func (m *ResponseSetOption) GetCode() uint32 { - if m != nil { - return m.Code - } - return 0 -} - -func (m *ResponseSetOption) GetLog() string { - if m != nil { - return m.Log - } - return "" -} - -func (m *ResponseSetOption) GetInfo() string { - if m != nil { - return m.Info - } - return "" -} - type ResponseInitChain struct { ConsensusParams *ConsensusParams `protobuf:"bytes,1,opt,name=consensus_params,json=consensusParams,proto3" json:"consensus_params,omitempty"` Validators []ValidatorUpdate `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators"` @@ -1755,7 +1614,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_252557cfdd89a31a, []int{20} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1822,7 +1681,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{23} + return fileDescriptor_252557cfdd89a31a, []int{21} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1922,7 +1781,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{24} + return fileDescriptor_252557cfdd89a31a, []int{22} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1973,7 +1832,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{25} + return fileDescriptor_252557cfdd89a31a, []int{23} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2073,7 +1932,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_252557cfdd89a31a, []int{24} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2168,7 +2027,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27} + return fileDescriptor_252557cfdd89a31a, []int{25} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2228,7 +2087,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{28} + return fileDescriptor_252557cfdd89a31a, []int{26} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2279,7 +2138,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29} + return fileDescriptor_252557cfdd89a31a, []int{27} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2323,7 +2182,7 @@ func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30} + return fileDescriptor_252557cfdd89a31a, []int{28} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2367,7 +2226,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31} + return fileDescriptor_252557cfdd89a31a, []int{29} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2413,7 +2272,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32} + return fileDescriptor_252557cfdd89a31a, []int{30} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2476,7 +2335,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33} + return fileDescriptor_252557cfdd89a31a, []int{31} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2545,7 +2404,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{34} + return fileDescriptor_252557cfdd89a31a, []int{32} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2597,7 +2456,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_252557cfdd89a31a, []int{33} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2652,7 +2511,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_252557cfdd89a31a, []int{34} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2706,7 +2565,7 @@ func (m *EventAttribute) Reset() { *m = EventAttribute{} } func (m *EventAttribute) String() string { return proto.CompactTextString(m) } func (*EventAttribute) ProtoMessage() {} func (*EventAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{37} + return fileDescriptor_252557cfdd89a31a, []int{35} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2770,7 +2629,7 @@ func (m *TxResult) Reset() { *m = TxResult{} } func (m *TxResult) String() string { return proto.CompactTextString(m) } func (*TxResult) ProtoMessage() {} func (*TxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{38} + return fileDescriptor_252557cfdd89a31a, []int{36} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2838,7 +2697,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{39} + return fileDescriptor_252557cfdd89a31a, []int{37} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2891,7 +2750,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{40} + return fileDescriptor_252557cfdd89a31a, []int{38} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2944,7 +2803,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{41} + return fileDescriptor_252557cfdd89a31a, []int{39} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3005,7 +2864,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{42} + return fileDescriptor_252557cfdd89a31a, []int{40} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3081,7 +2940,7 @@ func (m *Snapshot) Reset() { *m = Snapshot{} } func (m *Snapshot) String() string { return proto.CompactTextString(m) } func (*Snapshot) ProtoMessage() {} func (*Snapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{43} + return fileDescriptor_252557cfdd89a31a, []int{41} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3154,7 +3013,6 @@ func init() { proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.RequestInfo") - proto.RegisterType((*RequestSetOption)(nil), "tendermint.abci.RequestSetOption") proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.RequestInitChain") proto.RegisterType((*RequestQuery)(nil), "tendermint.abci.RequestQuery") proto.RegisterType((*RequestBeginBlock)(nil), "tendermint.abci.RequestBeginBlock") @@ -3171,7 +3029,6 @@ func init() { proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.ResponseFlush") proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.ResponseInfo") - proto.RegisterType((*ResponseSetOption)(nil), "tendermint.abci.ResponseSetOption") proto.RegisterType((*ResponseInitChain)(nil), "tendermint.abci.ResponseInitChain") proto.RegisterType((*ResponseQuery)(nil), "tendermint.abci.ResponseQuery") proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.abci.ResponseBeginBlock") @@ -3199,179 +3056,175 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2741 bytes of a gzipped FileDescriptorProto + // 2677 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x73, 0x1b, 0xc7, - 0x11, 0xc6, 0xfb, 0xd1, 0x24, 0x1e, 0x1c, 0xd1, 0x12, 0xb4, 0x92, 0x48, 0x79, 0x55, 0x72, 0x2c, - 0xd9, 0x26, 0x63, 0xaa, 0xa4, 0x48, 0xb1, 0x13, 0x9b, 0x80, 0x20, 0x83, 0x26, 0x4d, 0x30, 0x4b, - 0x48, 0xce, 0xcb, 0x5a, 0x2f, 0xb0, 0x43, 0x60, 0x2d, 0x60, 0x77, 0x8d, 0x1d, 0x50, 0xa4, 0x8f, - 0x71, 0x72, 0x51, 0x2e, 0xce, 0x2d, 0x17, 0xff, 0x8f, 0x9c, 0x72, 0xc9, 0xc5, 0x55, 0xb9, 0xf8, - 0x98, 0x93, 0x93, 0x92, 0x2a, 0x97, 0xfc, 0x81, 0x9c, 0x52, 0x49, 0xcd, 0x63, 0x5f, 0x00, 0x16, - 0x00, 0xed, 0xdc, 0x7c, 0x9b, 0x99, 0xed, 0xee, 0xc5, 0xf4, 0x4e, 0x7f, 0xfd, 0x75, 0x0f, 0xe0, - 0x12, 0xc1, 0xa6, 0x8e, 0x87, 0x03, 0xc3, 0x24, 0x9b, 0x5a, 0xbb, 0x63, 0x6c, 0x92, 0x53, 0x1b, - 0x3b, 0x1b, 0xf6, 0xd0, 0x22, 0x16, 0x2a, 0xf9, 0x0f, 0x37, 0xe8, 0x43, 0xe9, 0x4a, 0x40, 0xba, - 0x33, 0x3c, 0xb5, 0x89, 0xb5, 0x69, 0x0f, 0x2d, 0xeb, 0x88, 0xcb, 0x4b, 0x97, 0x03, 0x8f, 0x99, - 0x9d, 0xa0, 0xb5, 0xd0, 0x53, 0xa1, 0xfc, 0x04, 0x9f, 0xba, 0x4f, 0xaf, 0x4c, 0xe8, 0xda, 0xda, - 0x50, 0x1b, 0xb8, 0x8f, 0xd7, 0xbb, 0x96, 0xd5, 0xed, 0xe3, 0x4d, 0x36, 0x6b, 0x8f, 0x8e, 0x36, - 0x89, 0x31, 0xc0, 0x0e, 0xd1, 0x06, 0xb6, 0x10, 0x58, 0xed, 0x5a, 0x5d, 0x8b, 0x0d, 0x37, 0xe9, - 0x88, 0xaf, 0xca, 0x7f, 0xc8, 0x41, 0x56, 0xc1, 0x9f, 0x8e, 0xb0, 0x43, 0xd0, 0x16, 0xa4, 0x70, - 0xa7, 0x67, 0x55, 0xe2, 0x57, 0xe3, 0xaf, 0x2e, 0x6d, 0x5d, 0xde, 0x18, 0xdb, 0xdc, 0x86, 0x90, - 0xab, 0x77, 0x7a, 0x56, 0x23, 0xa6, 0x30, 0x59, 0x74, 0x1b, 0xd2, 0x47, 0xfd, 0x91, 0xd3, 0xab, - 0x24, 0x98, 0xd2, 0x95, 0x28, 0xa5, 0x07, 0x54, 0xa8, 0x11, 0x53, 0xb8, 0x34, 0x7d, 0x95, 0x61, - 0x1e, 0x59, 0x95, 0xe4, 0xec, 0x57, 0xed, 0x98, 0x47, 0xec, 0x55, 0x54, 0x16, 0x55, 0x01, 0x1c, - 0x4c, 0x54, 0xcb, 0x26, 0x86, 0x65, 0x56, 0x52, 0x4c, 0xf3, 0xe5, 0x28, 0xcd, 0x43, 0x4c, 0x9a, - 0x4c, 0xb0, 0x11, 0x53, 0xf2, 0x8e, 0x3b, 0xa1, 0x36, 0x0c, 0xd3, 0x20, 0x6a, 0xa7, 0xa7, 0x19, - 0x66, 0x25, 0x3d, 0xdb, 0xc6, 0x8e, 0x69, 0x90, 0x1a, 0x15, 0xa4, 0x36, 0x0c, 0x77, 0x42, 0xb7, - 0xfc, 0xe9, 0x08, 0x0f, 0x4f, 0x2b, 0x99, 0xd9, 0x5b, 0xfe, 0x19, 0x15, 0xa2, 0x5b, 0x66, 0xd2, - 0xa8, 0x0e, 0x4b, 0x6d, 0xdc, 0x35, 0x4c, 0xb5, 0xdd, 0xb7, 0x3a, 0x4f, 0x2a, 0x59, 0xa6, 0x2c, - 0x47, 0x29, 0x57, 0xa9, 0x68, 0x95, 0x4a, 0x36, 0x62, 0x0a, 0xb4, 0xbd, 0x19, 0x7a, 0x1b, 0x72, - 0x9d, 0x1e, 0xee, 0x3c, 0x51, 0xc9, 0x49, 0x25, 0xc7, 0x6c, 0xac, 0x47, 0xd9, 0xa8, 0x51, 0xb9, - 0xd6, 0x49, 0x23, 0xa6, 0x64, 0x3b, 0x7c, 0x48, 0xf7, 0xaf, 0xe3, 0xbe, 0x71, 0x8c, 0x87, 0x54, - 0x3f, 0x3f, 0x7b, 0xff, 0xf7, 0xb9, 0x24, 0xb3, 0x90, 0xd7, 0xdd, 0x09, 0x7a, 0x07, 0xf2, 0xd8, - 0xd4, 0xc5, 0x36, 0x80, 0x99, 0xb8, 0x1a, 0x79, 0x56, 0x4c, 0xdd, 0xdd, 0x44, 0x0e, 0x8b, 0x31, - 0xba, 0x0b, 0x99, 0x8e, 0x35, 0x18, 0x18, 0xa4, 0xb2, 0xc4, 0xb4, 0xd7, 0x22, 0x37, 0xc0, 0xa4, - 0x1a, 0x31, 0x45, 0xc8, 0xa3, 0x7d, 0x28, 0xf6, 0x0d, 0x87, 0xa8, 0x8e, 0xa9, 0xd9, 0x4e, 0xcf, - 0x22, 0x4e, 0x65, 0x99, 0x59, 0xb8, 0x1e, 0x65, 0x61, 0xcf, 0x70, 0xc8, 0xa1, 0x2b, 0xdc, 0x88, - 0x29, 0x85, 0x7e, 0x70, 0x81, 0xda, 0xb3, 0x8e, 0x8e, 0xf0, 0xd0, 0x33, 0x58, 0x29, 0xcc, 0xb6, - 0xd7, 0xa4, 0xd2, 0xae, 0x3e, 0xb5, 0x67, 0x05, 0x17, 0xd0, 0xaf, 0xe0, 0x5c, 0xdf, 0xd2, 0x74, - 0xcf, 0x9c, 0xda, 0xe9, 0x8d, 0xcc, 0x27, 0x95, 0x22, 0x33, 0x7a, 0x23, 0xf2, 0x47, 0x5a, 0x9a, - 0xee, 0x9a, 0xa8, 0x51, 0x85, 0x46, 0x4c, 0x59, 0xe9, 0x8f, 0x2f, 0xa2, 0xc7, 0xb0, 0xaa, 0xd9, - 0x76, 0xff, 0x74, 0xdc, 0x7a, 0x89, 0x59, 0xbf, 0x19, 0x65, 0x7d, 0x9b, 0xea, 0x8c, 0x9b, 0x47, - 0xda, 0xc4, 0x6a, 0x35, 0x0b, 0xe9, 0x63, 0xad, 0x3f, 0xc2, 0xf2, 0x0f, 0x60, 0x29, 0x10, 0xea, - 0xa8, 0x02, 0xd9, 0x01, 0x76, 0x1c, 0xad, 0x8b, 0x19, 0x32, 0xe4, 0x15, 0x77, 0x2a, 0x17, 0x61, - 0x39, 0x18, 0xde, 0xf2, 0xc0, 0x53, 0xa4, 0x81, 0x4b, 0x15, 0x8f, 0xf1, 0xd0, 0xa1, 0xd1, 0x2a, - 0x14, 0xc5, 0x14, 0x5d, 0x83, 0x02, 0x3b, 0x3e, 0xaa, 0xfb, 0x9c, 0xa2, 0x47, 0x4a, 0x59, 0x66, - 0x8b, 0x8f, 0x84, 0xd0, 0x3a, 0x2c, 0xd9, 0x5b, 0xb6, 0x27, 0x92, 0x64, 0x22, 0x60, 0x6f, 0xd9, - 0x42, 0x40, 0xfe, 0x31, 0x94, 0xc7, 0xa3, 0x1d, 0x95, 0x21, 0xf9, 0x04, 0x9f, 0x8a, 0xf7, 0xd1, - 0x21, 0x5a, 0x15, 0xdb, 0x62, 0xef, 0xc8, 0x2b, 0x62, 0x8f, 0x7f, 0x4d, 0x78, 0xca, 0x5e, 0x98, - 0xa3, 0xbb, 0x90, 0xa2, 0xa8, 0x29, 0x00, 0x50, 0xda, 0xe0, 0x90, 0xba, 0xe1, 0x42, 0xea, 0x46, - 0xcb, 0x85, 0xd4, 0x6a, 0xee, 0xab, 0x6f, 0xd6, 0x63, 0x5f, 0xfc, 0x7d, 0x3d, 0xae, 0x30, 0x0d, - 0x74, 0x91, 0x46, 0xa5, 0x66, 0x98, 0xaa, 0xa1, 0x8b, 0xf7, 0x64, 0xd9, 0x7c, 0x47, 0x47, 0xbb, - 0x50, 0xee, 0x58, 0xa6, 0x83, 0x4d, 0x67, 0xe4, 0xa8, 0x1c, 0xb2, 0x05, 0xec, 0x4d, 0x46, 0x4d, - 0xcd, 0x15, 0x3c, 0x60, 0x72, 0x4a, 0xa9, 0x13, 0x5e, 0x40, 0x0f, 0x00, 0x8e, 0xb5, 0xbe, 0xa1, - 0x6b, 0xc4, 0x1a, 0x3a, 0x95, 0xd4, 0xd5, 0xe4, 0x54, 0x33, 0x8f, 0x5c, 0x91, 0x87, 0xb6, 0xae, - 0x11, 0x5c, 0x4d, 0xd1, 0x5f, 0xab, 0x04, 0x34, 0xd1, 0x2b, 0x50, 0xd2, 0x6c, 0x5b, 0x75, 0x88, - 0x46, 0xb0, 0xda, 0x3e, 0x25, 0xd8, 0x61, 0x60, 0xb8, 0xac, 0x14, 0x34, 0xdb, 0x3e, 0xa4, 0xab, - 0x55, 0xba, 0x88, 0xae, 0x43, 0x91, 0x02, 0x9f, 0xa1, 0xf5, 0xd5, 0x1e, 0x36, 0xba, 0x3d, 0xc2, - 0x40, 0x2f, 0xa9, 0x14, 0xc4, 0x6a, 0x83, 0x2d, 0xca, 0xba, 0x77, 0x10, 0x18, 0xe8, 0x21, 0x04, - 0x29, 0x5d, 0x23, 0x1a, 0x73, 0xe4, 0xb2, 0xc2, 0xc6, 0x74, 0xcd, 0xd6, 0x48, 0x4f, 0xb8, 0x87, - 0x8d, 0xd1, 0x79, 0xc8, 0x08, 0xb3, 0x49, 0x66, 0x56, 0xcc, 0xe8, 0x37, 0xb3, 0x87, 0xd6, 0x31, - 0x66, 0x28, 0x9f, 0x53, 0xf8, 0x44, 0xfe, 0x6d, 0x02, 0x56, 0x26, 0xe0, 0x91, 0xda, 0xed, 0x69, - 0x4e, 0xcf, 0x7d, 0x17, 0x1d, 0xa3, 0x3b, 0xd4, 0xae, 0xa6, 0xe3, 0xa1, 0x48, 0x4b, 0x95, 0xa0, - 0x8b, 0x78, 0xca, 0x6d, 0xb0, 0xe7, 0xc2, 0x35, 0x42, 0x1a, 0x35, 0xa1, 0xdc, 0xd7, 0x1c, 0xa2, - 0x72, 0xb8, 0x51, 0x03, 0x29, 0x6a, 0x12, 0x64, 0xf7, 0x34, 0x17, 0xa0, 0xe8, 0x61, 0x17, 0x86, - 0x8a, 0xfd, 0xd0, 0x2a, 0x52, 0x60, 0xb5, 0x7d, 0xfa, 0x99, 0x66, 0x12, 0xc3, 0xc4, 0xea, 0xc4, - 0x97, 0xbb, 0x38, 0x61, 0xb4, 0x7e, 0x6c, 0xe8, 0xd8, 0xec, 0xb8, 0x9f, 0xec, 0x9c, 0xa7, 0xec, - 0x7d, 0x52, 0x47, 0x56, 0xa0, 0x18, 0x06, 0x78, 0x54, 0x84, 0x04, 0x39, 0x11, 0x0e, 0x48, 0x90, - 0x13, 0xf4, 0x43, 0x48, 0xd1, 0x4d, 0xb2, 0xcd, 0x17, 0xa7, 0x64, 0x57, 0xa1, 0xd7, 0x3a, 0xb5, - 0xb1, 0xc2, 0x24, 0x65, 0xd9, 0x8b, 0x06, 0x0f, 0xf4, 0xc7, 0xad, 0xca, 0x37, 0xa0, 0x34, 0x86, - 0xea, 0x81, 0xef, 0x17, 0x0f, 0x7e, 0x3f, 0xb9, 0x04, 0x85, 0x10, 0x84, 0xcb, 0xe7, 0x61, 0x75, - 0x1a, 0x22, 0xcb, 0x3d, 0x6f, 0x3d, 0x84, 0xac, 0xe8, 0x36, 0xe4, 0x3c, 0x48, 0xe6, 0xd1, 0x38, - 0xe9, 0x2b, 0x57, 0x58, 0xf1, 0x44, 0x69, 0x18, 0xd2, 0x63, 0xcd, 0xce, 0x43, 0x82, 0xfd, 0xf0, - 0xac, 0x66, 0xdb, 0x0d, 0xcd, 0xe9, 0xc9, 0x1f, 0x43, 0x25, 0x0a, 0x6e, 0xc7, 0xb6, 0x91, 0xf2, - 0x8e, 0xe1, 0x79, 0xc8, 0x1c, 0x59, 0xc3, 0x81, 0x46, 0x98, 0xb1, 0x82, 0x22, 0x66, 0xf4, 0x78, - 0x72, 0xe8, 0x4d, 0xb2, 0x65, 0x3e, 0x91, 0x55, 0xb8, 0x18, 0x09, 0xb9, 0x54, 0xc5, 0x30, 0x75, - 0xcc, 0xfd, 0x59, 0x50, 0xf8, 0xc4, 0x37, 0xc4, 0x7f, 0x2c, 0x9f, 0xd0, 0xd7, 0x3a, 0x6c, 0xaf, - 0xcc, 0x7e, 0x5e, 0x11, 0x33, 0xf9, 0x9f, 0x39, 0xc8, 0x29, 0xd8, 0xb1, 0x29, 0x26, 0xa0, 0x2a, - 0xe4, 0xf1, 0x49, 0x07, 0x73, 0x32, 0x14, 0x8f, 0x24, 0x13, 0x5c, 0xba, 0xee, 0x4a, 0xd2, 0x4c, - 0xee, 0xa9, 0xa1, 0x5b, 0x82, 0xf0, 0x45, 0x73, 0x37, 0xa1, 0x1e, 0x64, 0x7c, 0x77, 0x5c, 0xc6, - 0x97, 0x8c, 0x4c, 0xde, 0x5c, 0x6b, 0x8c, 0xf2, 0xdd, 0x12, 0x94, 0x2f, 0x35, 0xe7, 0x65, 0x21, - 0xce, 0x57, 0x0b, 0x71, 0xbe, 0xf4, 0x9c, 0x6d, 0x46, 0x90, 0xbe, 0x5a, 0x88, 0xf4, 0x65, 0xe6, - 0x18, 0x89, 0x60, 0x7d, 0x77, 0x5c, 0xd6, 0x97, 0x9d, 0xb3, 0xed, 0x31, 0xda, 0xf7, 0x20, 0x4c, - 0xfb, 0x38, 0x65, 0xbb, 0x16, 0xa9, 0x1d, 0xc9, 0xfb, 0x7e, 0x12, 0xe0, 0x7d, 0xf9, 0x48, 0xd2, - 0xc5, 0x8d, 0x4c, 0x21, 0x7e, 0xb5, 0x10, 0xf1, 0x83, 0x39, 0x3e, 0x88, 0x60, 0x7e, 0xef, 0x06, - 0x99, 0xdf, 0x52, 0x24, 0x79, 0x14, 0x87, 0x66, 0x1a, 0xf5, 0xbb, 0xe7, 0x51, 0xbf, 0xe5, 0x48, - 0xee, 0x2a, 0xf6, 0x30, 0xce, 0xfd, 0x9a, 0x13, 0xdc, 0x8f, 0x73, 0xb5, 0x57, 0x22, 0x4d, 0xcc, - 0x21, 0x7f, 0xcd, 0x09, 0xf2, 0x57, 0x9c, 0x63, 0x70, 0x0e, 0xfb, 0xfb, 0xf5, 0x74, 0xf6, 0x17, - 0xcd, 0xcf, 0xc4, 0xcf, 0x5c, 0x8c, 0xfe, 0xa9, 0x11, 0xf4, 0xaf, 0xcc, 0xcc, 0xbf, 0x16, 0x69, - 0xfe, 0xec, 0xfc, 0xef, 0x06, 0x4d, 0xb3, 0x63, 0xc0, 0x41, 0xa1, 0x0a, 0x0f, 0x87, 0xd6, 0x50, - 0x50, 0x2b, 0x3e, 0x91, 0x5f, 0xa5, 0x89, 0xdf, 0x07, 0x89, 0x19, 0x5c, 0x91, 0xa5, 0x84, 0x00, - 0x30, 0xc8, 0x7f, 0x8a, 0xfb, 0xba, 0x2c, 0x57, 0x06, 0x49, 0x43, 0x5e, 0x90, 0x86, 0x00, 0x85, - 0x4c, 0x84, 0x29, 0xe4, 0x3a, 0x2c, 0x51, 0xa8, 0x1f, 0x63, 0x87, 0x9a, 0xed, 0xb2, 0x43, 0x74, - 0x13, 0x56, 0x58, 0x2e, 0xe7, 0x44, 0x53, 0xe0, 0x7b, 0x8a, 0xa5, 0xa9, 0x12, 0x7d, 0xc0, 0x0f, - 0x27, 0x07, 0xfa, 0x37, 0xe0, 0x5c, 0x40, 0xd6, 0x4b, 0x21, 0x9c, 0x12, 0x95, 0x3d, 0xe9, 0x6d, - 0x91, 0x4b, 0x3e, 0xf0, 0x1d, 0xe4, 0x33, 0x4f, 0x04, 0xa9, 0x8e, 0xa5, 0x63, 0x01, 0xf0, 0x6c, - 0x4c, 0xd9, 0x68, 0xdf, 0xea, 0x0a, 0x18, 0xa7, 0x43, 0x2a, 0xe5, 0xa1, 0x60, 0x9e, 0x83, 0x9c, - 0xfc, 0x97, 0xb8, 0x6f, 0xcf, 0x27, 0xa3, 0xd3, 0x78, 0x63, 0xfc, 0xff, 0xc3, 0x1b, 0x13, 0xdf, - 0x9a, 0x37, 0x06, 0x13, 0x6c, 0x32, 0x9c, 0x60, 0xff, 0x1d, 0xf7, 0xbf, 0xb0, 0xc7, 0x02, 0xbf, - 0x9d, 0x47, 0xfc, 0x6c, 0x99, 0x66, 0xdf, 0x4b, 0x64, 0x4b, 0xc1, 0xed, 0x33, 0xec, 0xbd, 0x61, - 0x6e, 0x9f, 0xe5, 0xf9, 0x93, 0x4d, 0xd0, 0x5d, 0xc8, 0xb3, 0xa6, 0x8b, 0x6a, 0xd9, 0x8e, 0x00, - 0xdc, 0x4b, 0xc1, 0xbd, 0xf2, 0xde, 0xca, 0xc6, 0x01, 0x95, 0x69, 0xda, 0x8e, 0x92, 0xb3, 0xc5, - 0x28, 0x40, 0x04, 0xf2, 0x21, 0x3e, 0x7a, 0x19, 0xf2, 0xf4, 0xd7, 0x3b, 0xb6, 0xd6, 0xc1, 0x0c, - 0x3c, 0xf3, 0x8a, 0xbf, 0x20, 0x3f, 0x06, 0x34, 0x09, 0xdf, 0xa8, 0x01, 0x19, 0x7c, 0x8c, 0x4d, - 0x42, 0xbf, 0x1a, 0x75, 0xf7, 0xf9, 0x29, 0x64, 0x0f, 0x9b, 0xa4, 0x5a, 0xa1, 0x4e, 0xfe, 0xd7, - 0x37, 0xeb, 0x65, 0x2e, 0xfd, 0xba, 0x35, 0x30, 0x08, 0x1e, 0xd8, 0xe4, 0x54, 0x11, 0xfa, 0xf2, - 0xe7, 0x09, 0xca, 0xbc, 0x42, 0xd0, 0x3e, 0xd5, 0xb7, 0x6e, 0x00, 0x25, 0x02, 0xac, 0x7b, 0x31, - 0x7f, 0xaf, 0x01, 0x74, 0x35, 0x47, 0x7d, 0xaa, 0x99, 0x04, 0xeb, 0xc2, 0xe9, 0x81, 0x15, 0x24, - 0x41, 0x8e, 0xce, 0x46, 0x0e, 0xd6, 0x45, 0x01, 0xe0, 0xcd, 0x03, 0xfb, 0xcc, 0x7e, 0xb7, 0x7d, - 0x86, 0xbd, 0x9c, 0x1b, 0xf7, 0xf2, 0xef, 0x12, 0x7e, 0x94, 0xf8, 0x24, 0xf5, 0xfb, 0xe7, 0x87, - 0xdf, 0xb3, 0xca, 0x35, 0x9c, 0x63, 0xd1, 0x21, 0xac, 0x78, 0x51, 0xaa, 0x8e, 0x58, 0xf4, 0xba, - 0xe7, 0x6e, 0xd1, 0x30, 0x2f, 0x1f, 0x87, 0x97, 0x1d, 0xf4, 0x73, 0xb8, 0x30, 0x86, 0x40, 0x9e, - 0xe9, 0xc4, 0x82, 0x40, 0xf4, 0x52, 0x18, 0x88, 0x5c, 0xcb, 0xbe, 0xaf, 0x92, 0xdf, 0x31, 0x36, - 0x76, 0x68, 0x31, 0x14, 0x64, 0x0c, 0x53, 0xbf, 0xfe, 0x35, 0x28, 0x0c, 0x31, 0xa1, 0xf5, 0x79, - 0xa8, 0xdc, 0x5c, 0xe6, 0x8b, 0xa2, 0x88, 0x3d, 0x80, 0x97, 0xa6, 0x32, 0x07, 0xf4, 0x23, 0xc8, - 0xfb, 0xa4, 0x23, 0x1e, 0x51, 0xb9, 0x79, 0xd5, 0x88, 0x2f, 0x2b, 0xff, 0x39, 0xee, 0x9b, 0x0c, - 0xd7, 0x37, 0x75, 0xc8, 0x0c, 0xb1, 0x33, 0xea, 0xf3, 0x8a, 0xa3, 0xb8, 0xf5, 0xc6, 0x62, 0x9c, - 0x83, 0xae, 0x8e, 0xfa, 0x44, 0x11, 0xca, 0xf2, 0x63, 0xc8, 0xf0, 0x15, 0xb4, 0x04, 0xd9, 0x87, - 0xfb, 0xbb, 0xfb, 0xcd, 0x0f, 0xf7, 0xcb, 0x31, 0x04, 0x90, 0xd9, 0xae, 0xd5, 0xea, 0x07, 0xad, - 0x72, 0x1c, 0xe5, 0x21, 0xbd, 0x5d, 0x6d, 0x2a, 0xad, 0x72, 0x82, 0x2e, 0x2b, 0xf5, 0xf7, 0xeb, - 0xb5, 0x56, 0x39, 0x89, 0x56, 0xa0, 0xc0, 0xc7, 0xea, 0x83, 0xa6, 0xf2, 0xc1, 0x76, 0xab, 0x9c, - 0x0a, 0x2c, 0x1d, 0xd6, 0xf7, 0xef, 0xd7, 0x95, 0x72, 0x5a, 0x7e, 0x93, 0x96, 0x34, 0x11, 0x2c, - 0xc5, 0x2f, 0x5e, 0xe2, 0x81, 0xe2, 0x45, 0xfe, 0x63, 0x02, 0xa4, 0x68, 0xea, 0x81, 0xde, 0x1f, - 0xdb, 0xf8, 0xd6, 0x19, 0x78, 0xcb, 0xd8, 0xee, 0xd1, 0x75, 0x28, 0x0e, 0xf1, 0x11, 0x26, 0x9d, - 0x1e, 0xa7, 0x42, 0x3c, 0xb1, 0x15, 0x94, 0x82, 0x58, 0x65, 0x4a, 0x0e, 0x17, 0xfb, 0x04, 0x77, - 0x88, 0xca, 0xeb, 0x28, 0x7e, 0xe8, 0xf2, 0x54, 0x8c, 0xae, 0x1e, 0xf2, 0x45, 0xf9, 0xe3, 0x33, - 0xf9, 0x32, 0x0f, 0x69, 0xa5, 0xde, 0x52, 0x7e, 0x51, 0x4e, 0x22, 0x04, 0x45, 0x36, 0x54, 0x0f, - 0xf7, 0xb7, 0x0f, 0x0e, 0x1b, 0x4d, 0xea, 0xcb, 0x73, 0x50, 0x72, 0x7d, 0xe9, 0x2e, 0xa6, 0xe5, - 0xff, 0xc6, 0xa1, 0x34, 0x16, 0x20, 0x68, 0x0b, 0xd2, 0x9c, 0x4e, 0x47, 0x35, 0xdd, 0x59, 0x7c, - 0x8b, 0x68, 0xe2, 0xa2, 0xe8, 0x6d, 0xc8, 0x61, 0xd1, 0x27, 0x98, 0x16, 0x88, 0xbc, 0xbf, 0xe1, - 0x76, 0x12, 0x84, 0xaa, 0xa7, 0x81, 0xde, 0x81, 0xbc, 0x17, 0xe9, 0xa2, 0x86, 0x7b, 0x79, 0x52, - 0xdd, 0xc3, 0x08, 0xa1, 0xef, 0xeb, 0xa0, 0x7b, 0x3e, 0x27, 0x4b, 0x4d, 0x92, 0x78, 0xa1, 0xce, - 0x05, 0x84, 0xb2, 0x2b, 0x2f, 0xd7, 0x60, 0x29, 0xb0, 0x1f, 0x74, 0x09, 0xf2, 0x03, 0xed, 0x44, - 0xf4, 0x9f, 0x78, 0x07, 0x21, 0x37, 0xd0, 0x4e, 0x78, 0xeb, 0xe9, 0x02, 0x64, 0xe9, 0xc3, 0xae, - 0xc6, 0xd1, 0x26, 0xa9, 0x64, 0x06, 0xda, 0xc9, 0x7b, 0x9a, 0x23, 0x7f, 0x04, 0xc5, 0x70, 0xef, - 0x85, 0x9e, 0xc4, 0xa1, 0x35, 0x32, 0x75, 0x66, 0x23, 0xad, 0xf0, 0x09, 0xba, 0x0d, 0xe9, 0x63, - 0x8b, 0x83, 0xd5, 0xf4, 0x90, 0x7d, 0x64, 0x11, 0x1c, 0xe8, 0xdd, 0x70, 0x69, 0xf9, 0x33, 0x48, - 0x33, 0xf0, 0xa1, 0x40, 0xc2, 0xba, 0x28, 0x82, 0x8f, 0xd2, 0x31, 0xfa, 0x08, 0x40, 0x23, 0x64, - 0x68, 0xb4, 0x47, 0xbe, 0xe1, 0xf5, 0xe9, 0xe0, 0xb5, 0xed, 0xca, 0x55, 0x2f, 0x0b, 0x14, 0x5b, - 0xf5, 0x55, 0x03, 0x48, 0x16, 0x30, 0x28, 0xef, 0x43, 0x31, 0xac, 0x1b, 0xec, 0x67, 0x2e, 0x4f, - 0xe9, 0x67, 0x7a, 0x9c, 0xc7, 0x63, 0x4c, 0x49, 0xde, 0x31, 0x63, 0x13, 0xf9, 0x59, 0x1c, 0x72, - 0xad, 0x13, 0x71, 0xac, 0x23, 0x9a, 0x35, 0xbe, 0x6a, 0x22, 0xd8, 0x9a, 0xe0, 0xdd, 0x9f, 0xa4, - 0xd7, 0x53, 0x7a, 0xd7, 0x0b, 0xdc, 0xd4, 0xa2, 0xc5, 0xa3, 0xdb, 0x5c, 0x13, 0x60, 0xf5, 0x16, - 0xe4, 0xbd, 0x53, 0x45, 0x89, 0xbd, 0xa6, 0xeb, 0x43, 0xec, 0x38, 0x62, 0x6f, 0xee, 0x94, 0xf5, - 0xfe, 0xac, 0xa7, 0xa2, 0xf9, 0x91, 0x54, 0xf8, 0x44, 0xd6, 0xa1, 0x34, 0x96, 0xb6, 0xd0, 0x5b, - 0x90, 0xb5, 0x47, 0x6d, 0xd5, 0x75, 0xcf, 0x58, 0xf0, 0xb8, 0x24, 0x6f, 0xd4, 0xee, 0x1b, 0x9d, - 0x5d, 0x7c, 0xea, 0xfe, 0x18, 0x7b, 0xd4, 0xde, 0xe5, 0x5e, 0xe4, 0x6f, 0x49, 0x04, 0xdf, 0x72, - 0x0c, 0x39, 0xf7, 0x50, 0xa0, 0x9f, 0x06, 0xe3, 0xc4, 0xed, 0x08, 0x47, 0xa6, 0x52, 0x61, 0x3e, - 0x10, 0x26, 0x37, 0x61, 0xc5, 0x31, 0xba, 0x26, 0xd6, 0x55, 0xbf, 0xb4, 0x60, 0x6f, 0xcb, 0x29, - 0x25, 0xfe, 0x60, 0xcf, 0xad, 0x2b, 0xe4, 0xff, 0xc4, 0x21, 0xe7, 0x06, 0x2c, 0x7a, 0x33, 0x70, - 0xee, 0x8a, 0x53, 0x1a, 0x25, 0xae, 0xa0, 0xdf, 0xbe, 0x0b, 0xff, 0xd6, 0xc4, 0xd9, 0x7f, 0x6b, - 0x54, 0x1f, 0xd6, 0x6d, 0x88, 0xa7, 0xce, 0xdc, 0x10, 0x7f, 0x1d, 0x10, 0xb1, 0x88, 0xd6, 0x57, - 0x8f, 0x2d, 0x62, 0x98, 0x5d, 0x95, 0x3b, 0x9b, 0x33, 0xaa, 0x32, 0x7b, 0xf2, 0x88, 0x3d, 0x38, - 0x60, 0x7e, 0xff, 0x4d, 0x1c, 0x72, 0x5e, 0x6e, 0x3c, 0x6b, 0x37, 0xee, 0x3c, 0x64, 0x04, 0xfc, - 0xf3, 0x76, 0x9c, 0x98, 0x79, 0x8d, 0xe1, 0x54, 0xa0, 0x31, 0x2c, 0x41, 0x6e, 0x80, 0x89, 0xc6, - 0x08, 0x02, 0xaf, 0xee, 0xbc, 0xf9, 0xcd, 0x7b, 0xb0, 0x14, 0x68, 0x8c, 0xd2, 0xc8, 0xdb, 0xaf, - 0x7f, 0x58, 0x8e, 0x49, 0xd9, 0x67, 0x5f, 0x5e, 0x4d, 0xee, 0xe3, 0xa7, 0xf4, 0xcc, 0x2a, 0xf5, - 0x5a, 0xa3, 0x5e, 0xdb, 0x2d, 0xc7, 0xa5, 0xa5, 0x67, 0x5f, 0x5e, 0xcd, 0x2a, 0x98, 0xf5, 0x57, - 0x6e, 0x36, 0x60, 0x39, 0xf8, 0x55, 0xc2, 0x19, 0x04, 0x41, 0xf1, 0xfe, 0xc3, 0x83, 0xbd, 0x9d, - 0xda, 0x76, 0xab, 0xae, 0x3e, 0x6a, 0xb6, 0xea, 0xe5, 0x38, 0xba, 0x00, 0xe7, 0xf6, 0x76, 0xde, - 0x6b, 0xb4, 0xd4, 0xda, 0xde, 0x4e, 0x7d, 0xbf, 0xa5, 0x6e, 0xb7, 0x5a, 0xdb, 0xb5, 0xdd, 0x72, - 0x62, 0xeb, 0x73, 0x80, 0xd2, 0x76, 0xb5, 0xb6, 0x43, 0xb3, 0x9f, 0xd1, 0xd1, 0x44, 0xff, 0x2a, - 0xc5, 0x8a, 0xeb, 0x99, 0x37, 0xb2, 0xd2, 0xec, 0xf6, 0x1d, 0x7a, 0x00, 0x69, 0x56, 0x77, 0xa3, - 0xd9, 0x57, 0xb4, 0xd2, 0x9c, 0x7e, 0x1e, 0xfd, 0x31, 0x2c, 0x3c, 0x66, 0xde, 0xd9, 0x4a, 0xb3, - 0xdb, 0x7b, 0x48, 0x81, 0xbc, 0x5f, 0x38, 0xcf, 0xbf, 0xc3, 0x95, 0x16, 0x68, 0xf9, 0x51, 0x9b, - 0x7e, 0x59, 0x30, 0xff, 0x4e, 0x53, 0x5a, 0x00, 0xc0, 0xd0, 0x1e, 0x64, 0xdd, 0x82, 0x6b, 0xde, - 0x2d, 0xab, 0x34, 0xb7, 0x1d, 0x47, 0x3f, 0x01, 0x2f, 0x8c, 0x67, 0x5f, 0x19, 0x4b, 0x73, 0x7a, - 0x8b, 0x68, 0x07, 0x32, 0x82, 0xeb, 0xce, 0xb9, 0x39, 0x95, 0xe6, 0xb5, 0xd7, 0xa8, 0xd3, 0xfc, - 0x8e, 0xc3, 0xfc, 0x8b, 0x70, 0x69, 0x81, 0xb6, 0x29, 0x7a, 0x08, 0x10, 0x28, 0x83, 0x17, 0xb8, - 0xe1, 0x96, 0x16, 0x69, 0x87, 0xa2, 0x26, 0xe4, 0xbc, 0x72, 0x67, 0xee, 0x7d, 0xb3, 0x34, 0xbf, - 0x2f, 0x89, 0x1e, 0x43, 0x21, 0xcc, 0xf3, 0x17, 0xbb, 0x45, 0x96, 0x16, 0x6c, 0x38, 0x52, 0xfb, - 0x61, 0xd2, 0xbf, 0xd8, 0xad, 0xb2, 0xb4, 0x60, 0xff, 0x11, 0x7d, 0x02, 0x2b, 0x93, 0xa4, 0x7c, - 0xf1, 0x4b, 0x66, 0xe9, 0x0c, 0x1d, 0x49, 0x34, 0x00, 0x34, 0x85, 0xcc, 0x9f, 0xe1, 0xce, 0x59, - 0x3a, 0x4b, 0x83, 0xb2, 0x5a, 0xff, 0xea, 0xf9, 0x5a, 0xfc, 0xeb, 0xe7, 0x6b, 0xf1, 0x7f, 0x3c, - 0x5f, 0x8b, 0x7f, 0xf1, 0x62, 0x2d, 0xf6, 0xf5, 0x8b, 0xb5, 0xd8, 0xdf, 0x5e, 0xac, 0xc5, 0x7e, - 0xf9, 0x5a, 0xd7, 0x20, 0xbd, 0x51, 0x7b, 0xa3, 0x63, 0x0d, 0x36, 0x83, 0x7f, 0x88, 0x99, 0xf6, - 0x27, 0x9d, 0x76, 0x86, 0x25, 0xaa, 0x5b, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xae, 0x48, - 0xb4, 0xc4, 0x23, 0x00, 0x00, + 0x11, 0xc6, 0x1b, 0xd8, 0x26, 0xf1, 0xe0, 0x88, 0x96, 0x61, 0x58, 0x26, 0xe5, 0x75, 0xd9, 0xb1, + 0x64, 0x9b, 0x8c, 0xa9, 0x92, 0x22, 0x95, 0x9d, 0xd8, 0x04, 0x04, 0x19, 0x34, 0x19, 0x92, 0x59, + 0x42, 0x72, 0x5e, 0xd6, 0x7a, 0x80, 0x1d, 0x02, 0x6b, 0x01, 0xbb, 0x6b, 0xec, 0x80, 0x22, 0x7d, + 0xcc, 0xe3, 0xa2, 0x5c, 0x7c, 0xcc, 0xc5, 0x55, 0xf9, 0x07, 0xb9, 0xe6, 0x94, 0x4b, 0x2e, 0xae, + 0x4a, 0xa5, 0xca, 0xc7, 0x9c, 0x9c, 0x94, 0x74, 0xcb, 0x1f, 0xc8, 0x29, 0x95, 0xd4, 0x3c, 0xf6, + 0x05, 0x60, 0x09, 0x30, 0xce, 0x2d, 0xb7, 0x9d, 0xde, 0xee, 0xc6, 0x4c, 0xef, 0xf4, 0xd7, 0xdf, + 0xf4, 0x00, 0x5e, 0xa4, 0xc4, 0x32, 0xc8, 0x68, 0x68, 0x5a, 0x74, 0x13, 0x77, 0xba, 0xe6, 0x26, + 0x3d, 0x73, 0x88, 0xbb, 0xe1, 0x8c, 0x6c, 0x6a, 0xa3, 0x72, 0xf0, 0x72, 0x83, 0xbd, 0xac, 0xbd, + 0x14, 0xd2, 0xee, 0x8e, 0xce, 0x1c, 0x6a, 0x6f, 0x3a, 0x23, 0xdb, 0x3e, 0x16, 0xfa, 0xb5, 0x2b, + 0xa1, 0xd7, 0xdc, 0x4f, 0xd8, 0x5b, 0xe4, 0xad, 0x34, 0x7e, 0x44, 0xce, 0xbc, 0xb7, 0x2f, 0x4d, + 0xd9, 0x3a, 0x78, 0x84, 0x87, 0xde, 0xeb, 0xf5, 0x9e, 0x6d, 0xf7, 0x06, 0x64, 0x93, 0x8f, 0x3a, + 0xe3, 0xe3, 0x4d, 0x6a, 0x0e, 0x89, 0x4b, 0xf1, 0xd0, 0x91, 0x0a, 0xab, 0x3d, 0xbb, 0x67, 0xf3, + 0xc7, 0x4d, 0xf6, 0x24, 0xa4, 0xea, 0x5f, 0xf2, 0x90, 0xd7, 0xc8, 0x67, 0x63, 0xe2, 0x52, 0xb4, + 0x05, 0x19, 0xd2, 0xed, 0xdb, 0xd5, 0xe4, 0xd5, 0xe4, 0xeb, 0x4b, 0x5b, 0x57, 0x36, 0x26, 0x16, + 0xb7, 0x21, 0xf5, 0x9a, 0xdd, 0xbe, 0xdd, 0x4a, 0x68, 0x5c, 0x17, 0xdd, 0x84, 0xec, 0xf1, 0x60, + 0xec, 0xf6, 0xab, 0x29, 0x6e, 0xf4, 0x52, 0x9c, 0xd1, 0x3d, 0xa6, 0xd4, 0x4a, 0x68, 0x42, 0x9b, + 0xfd, 0x94, 0x69, 0x1d, 0xdb, 0xd5, 0xf4, 0xf9, 0x3f, 0xb5, 0x63, 0x1d, 0xf3, 0x9f, 0x62, 0xba, + 0xa8, 0x0e, 0x60, 0x5a, 0x26, 0xd5, 0xbb, 0x7d, 0x6c, 0x5a, 0xd5, 0x0c, 0xb7, 0x7c, 0x39, 0xde, + 0xd2, 0xa4, 0x0d, 0xa6, 0xd8, 0x4a, 0x68, 0x8a, 0xe9, 0x0d, 0xd8, 0x74, 0x3f, 0x1b, 0x93, 0xd1, + 0x59, 0x35, 0x7b, 0xfe, 0x74, 0x7f, 0xc4, 0x94, 0xd8, 0x74, 0xb9, 0x36, 0x6a, 0xc2, 0x52, 0x87, + 0xf4, 0x4c, 0x4b, 0xef, 0x0c, 0xec, 0xee, 0xa3, 0x6a, 0x8e, 0x1b, 0xab, 0x71, 0xc6, 0x75, 0xa6, + 0x5a, 0x67, 0x9a, 0xad, 0x84, 0x06, 0x1d, 0x7f, 0x84, 0xde, 0x85, 0x42, 0xb7, 0x4f, 0xba, 0x8f, + 0x74, 0x7a, 0x5a, 0xcd, 0x73, 0x1f, 0xeb, 0x71, 0x3e, 0x1a, 0x4c, 0xaf, 0x7d, 0xda, 0x4a, 0x68, + 0xf9, 0xae, 0x78, 0x64, 0xeb, 0x37, 0xc8, 0xc0, 0x3c, 0x21, 0x23, 0x66, 0x5f, 0x38, 0x7f, 0xfd, + 0x77, 0x85, 0x26, 0xf7, 0xa0, 0x18, 0xde, 0x00, 0xbd, 0x07, 0x0a, 0xb1, 0x0c, 0xb9, 0x0c, 0x85, + 0xbb, 0xb8, 0x1a, 0xfb, 0x9d, 0x2d, 0xc3, 0x5b, 0x44, 0x81, 0xc8, 0x67, 0x74, 0x1b, 0x72, 0x5d, + 0x7b, 0x38, 0x34, 0x69, 0x15, 0xb8, 0xf5, 0x5a, 0xec, 0x02, 0xb8, 0x56, 0x2b, 0xa1, 0x49, 0x7d, + 0xb4, 0x0f, 0xa5, 0x81, 0xe9, 0x52, 0xdd, 0xb5, 0xb0, 0xe3, 0xf6, 0x6d, 0xea, 0x56, 0x97, 0xb8, + 0x87, 0x57, 0xe3, 0x3c, 0xec, 0x99, 0x2e, 0x3d, 0xf2, 0x94, 0x5b, 0x09, 0xad, 0x38, 0x08, 0x0b, + 0x98, 0x3f, 0xfb, 0xf8, 0x98, 0x8c, 0x7c, 0x87, 0xd5, 0xe5, 0xf3, 0xfd, 0x1d, 0x30, 0x6d, 0xcf, + 0x9e, 0xf9, 0xb3, 0xc3, 0x02, 0xf4, 0x33, 0xb8, 0x34, 0xb0, 0xb1, 0xe1, 0xbb, 0xd3, 0xbb, 0xfd, + 0xb1, 0xf5, 0xa8, 0x5a, 0xe4, 0x4e, 0xaf, 0xc5, 0x4e, 0xd2, 0xc6, 0x86, 0xe7, 0xa2, 0xc1, 0x0c, + 0x5a, 0x09, 0x6d, 0x65, 0x30, 0x29, 0x44, 0x0f, 0x61, 0x15, 0x3b, 0xce, 0xe0, 0x6c, 0xd2, 0x7b, + 0x89, 0x7b, 0xbf, 0x1e, 0xe7, 0x7d, 0x9b, 0xd9, 0x4c, 0xba, 0x47, 0x78, 0x4a, 0x5a, 0xcf, 0x43, + 0xf6, 0x04, 0x0f, 0xc6, 0x44, 0xfd, 0x0e, 0x2c, 0x85, 0xd2, 0x14, 0x55, 0x21, 0x3f, 0x24, 0xae, + 0x8b, 0x7b, 0x84, 0x67, 0xb5, 0xa2, 0x79, 0x43, 0xb5, 0x04, 0xcb, 0xe1, 0xd4, 0x54, 0x87, 0xbe, + 0x21, 0x4b, 0x3a, 0x66, 0x78, 0x42, 0x46, 0xae, 0x69, 0x5b, 0x9e, 0xa1, 0x1c, 0xa2, 0x57, 0xa0, + 0xc8, 0xb7, 0x8f, 0xee, 0xbd, 0x67, 0x99, 0x9f, 0xd1, 0x96, 0xb9, 0xf0, 0x81, 0x54, 0x5a, 0x87, + 0x25, 0x67, 0xcb, 0xf1, 0x55, 0xd2, 0x5c, 0x05, 0x9c, 0x2d, 0x47, 0x2a, 0xa8, 0x7f, 0x4e, 0x41, + 0x65, 0x32, 0x55, 0xd1, 0x6d, 0xc8, 0x30, 0xd4, 0x92, 0x00, 0x54, 0xdb, 0x10, 0x90, 0xb6, 0xe1, + 0x41, 0xda, 0x46, 0xdb, 0x83, 0xb4, 0x7a, 0xe1, 0xab, 0x6f, 0xd6, 0x13, 0x5f, 0xfc, 0x6d, 0x3d, + 0xa9, 0x71, 0x0b, 0xf4, 0x02, 0xcb, 0x2c, 0x6c, 0x5a, 0xba, 0x69, 0xf0, 0xf9, 0x28, 0x2c, 0x6d, + 0xb0, 0x69, 0xed, 0x18, 0x68, 0x17, 0x2a, 0x5d, 0xdb, 0x72, 0x89, 0xe5, 0x8e, 0x5d, 0x5d, 0x40, + 0xa6, 0x84, 0x9d, 0xe9, 0x9d, 0xdf, 0xf0, 0x14, 0x0f, 0xb9, 0x9e, 0x56, 0xee, 0x46, 0x05, 0xe8, + 0x1e, 0xc0, 0x09, 0x1e, 0x98, 0x06, 0xa6, 0xf6, 0xc8, 0xad, 0x66, 0xae, 0xa6, 0x67, 0xba, 0x79, + 0xe0, 0xa9, 0xdc, 0x77, 0x0c, 0x4c, 0x49, 0x3d, 0xc3, 0x66, 0xab, 0x85, 0x2c, 0xd1, 0x6b, 0x50, + 0xc6, 0x8e, 0xa3, 0xbb, 0x14, 0x53, 0xa2, 0x77, 0xce, 0x28, 0x71, 0x39, 0x22, 0x2d, 0x6b, 0x45, + 0xec, 0x38, 0x47, 0x4c, 0x5a, 0x67, 0x42, 0xf4, 0x2a, 0x94, 0x18, 0x78, 0x99, 0x78, 0xa0, 0xf7, + 0x89, 0xd9, 0xeb, 0x53, 0x8e, 0x3d, 0x69, 0xad, 0x28, 0xa5, 0x2d, 0x2e, 0x54, 0x0d, 0xff, 0x63, + 0x72, 0xe0, 0x42, 0x08, 0x32, 0x06, 0xa6, 0x98, 0x07, 0x72, 0x59, 0xe3, 0xcf, 0x4c, 0xe6, 0x60, + 0xda, 0x97, 0xe1, 0xe1, 0xcf, 0xe8, 0x32, 0xe4, 0xa4, 0xdb, 0x34, 0x77, 0x2b, 0x47, 0x68, 0x15, + 0xb2, 0xce, 0xc8, 0x3e, 0x21, 0x1c, 0x65, 0x0b, 0x9a, 0x18, 0xa8, 0xbf, 0x4a, 0xc1, 0xca, 0x14, + 0xc4, 0x31, 0xbf, 0x7d, 0xec, 0xf6, 0xbd, 0xdf, 0x62, 0xcf, 0xe8, 0x16, 0xf3, 0x8b, 0x0d, 0x32, + 0x92, 0x65, 0xa1, 0x1a, 0x0e, 0x91, 0x28, 0x79, 0x2d, 0xfe, 0x5e, 0x86, 0x46, 0x6a, 0xa3, 0x03, + 0xa8, 0x0c, 0xb0, 0x4b, 0x75, 0x01, 0x19, 0x7a, 0xa8, 0x44, 0x4c, 0x03, 0xe5, 0x1e, 0xf6, 0x40, + 0x86, 0x6d, 0x58, 0xe9, 0xa8, 0x34, 0x88, 0x48, 0x91, 0x06, 0xab, 0x9d, 0xb3, 0xcf, 0xb1, 0x45, + 0x4d, 0x8b, 0xe8, 0x53, 0x5f, 0xee, 0x85, 0x29, 0xa7, 0xcd, 0x13, 0xd3, 0x20, 0x56, 0xd7, 0xfb, + 0x64, 0x97, 0x7c, 0x63, 0xff, 0x93, 0xba, 0xaa, 0x06, 0xa5, 0x28, 0x48, 0xa3, 0x12, 0xa4, 0xe8, + 0xa9, 0x0c, 0x40, 0x8a, 0x9e, 0xa2, 0xef, 0x42, 0x86, 0x2d, 0x92, 0x2f, 0xbe, 0x34, 0xa3, 0xba, + 0x49, 0xbb, 0xf6, 0x99, 0x43, 0x34, 0xae, 0xa9, 0xaa, 0x7e, 0x36, 0xf8, 0xc0, 0x3d, 0xe9, 0x55, + 0xbd, 0x06, 0xe5, 0x09, 0x64, 0x0e, 0x7d, 0xbf, 0x64, 0xf8, 0xfb, 0xa9, 0x65, 0x28, 0x46, 0x60, + 0x58, 0xbd, 0x0c, 0xab, 0xb3, 0x50, 0x55, 0xed, 0xfb, 0xf2, 0x08, 0x3a, 0xa2, 0x9b, 0x50, 0xf0, + 0x61, 0x55, 0x64, 0xe3, 0x74, 0xac, 0x3c, 0x65, 0xcd, 0x57, 0x65, 0x69, 0xc8, 0xb6, 0x35, 0xdf, + 0x0f, 0x29, 0x3e, 0xf1, 0x3c, 0x76, 0x9c, 0x16, 0x76, 0xfb, 0xea, 0x27, 0x50, 0x8d, 0x83, 0xcc, + 0x89, 0x65, 0x64, 0xfc, 0x6d, 0x78, 0x19, 0x72, 0xc7, 0xf6, 0x68, 0x88, 0x29, 0x77, 0x56, 0xd4, + 0xe4, 0x88, 0x6d, 0x4f, 0x01, 0x9f, 0x69, 0x2e, 0x16, 0x03, 0x55, 0x87, 0x17, 0x62, 0x61, 0x93, + 0x99, 0x98, 0x96, 0x41, 0x44, 0x3c, 0x8b, 0x9a, 0x18, 0x04, 0x8e, 0xc4, 0x64, 0xc5, 0x80, 0xfd, + 0xac, 0xcb, 0xd7, 0xca, 0xfd, 0x2b, 0x9a, 0x1c, 0xa9, 0xbf, 0x2b, 0x40, 0x41, 0x23, 0xae, 0xc3, + 0x30, 0x01, 0xd5, 0x41, 0x21, 0xa7, 0x5d, 0xe2, 0x50, 0x0f, 0x22, 0x67, 0x13, 0x02, 0xa1, 0xdd, + 0xf4, 0x34, 0x59, 0x35, 0xf6, 0xcd, 0xd0, 0x0d, 0x49, 0xb8, 0xe2, 0xb9, 0x93, 0x34, 0x0f, 0x33, + 0xae, 0x5b, 0x1e, 0xe3, 0x4a, 0xc7, 0x16, 0x60, 0x61, 0x35, 0x41, 0xb9, 0x6e, 0x48, 0xca, 0x95, + 0x99, 0xf3, 0x63, 0x11, 0xce, 0xd5, 0x88, 0x70, 0xae, 0xec, 0x9c, 0x65, 0xc6, 0x90, 0xae, 0x5b, + 0x1e, 0xe9, 0xca, 0xcd, 0x99, 0xf1, 0x04, 0xeb, 0xba, 0x17, 0x65, 0x5d, 0x82, 0x31, 0xbd, 0x12, + 0x6b, 0x1d, 0x4b, 0xbb, 0xbe, 0x1f, 0xa2, 0x5d, 0x85, 0x58, 0xce, 0x23, 0x9c, 0xcc, 0xe0, 0x5d, + 0x8d, 0x08, 0xef, 0x52, 0xe6, 0xc4, 0x20, 0x86, 0x78, 0xbd, 0x1f, 0x26, 0x5e, 0x10, 0xcb, 0xdd, + 0xe4, 0xf7, 0x9e, 0xc5, 0xbc, 0xee, 0xf8, 0xcc, 0x6b, 0x29, 0x96, 0x3a, 0xca, 0x35, 0x4c, 0x52, + 0xaf, 0x83, 0x29, 0xea, 0x25, 0xa8, 0xd2, 0x6b, 0xb1, 0x2e, 0xe6, 0x70, 0xaf, 0x83, 0x29, 0xee, + 0x55, 0x9c, 0xe3, 0x70, 0x0e, 0xf9, 0xfa, 0xf9, 0x6c, 0xf2, 0x15, 0x4f, 0x8f, 0xe4, 0x34, 0x17, + 0x63, 0x5f, 0x7a, 0x0c, 0xfb, 0x2a, 0x73, 0xf7, 0x6f, 0xc4, 0xba, 0xbf, 0x38, 0xfd, 0xba, 0xc6, + 0x2a, 0xe4, 0x44, 0xce, 0x33, 0x94, 0x21, 0xa3, 0x91, 0x3d, 0x92, 0x4c, 0x4a, 0x0c, 0xd4, 0xd7, + 0x59, 0xcd, 0x0e, 0xf2, 0xfb, 0x1c, 0xaa, 0xc6, 0xd1, 0x3c, 0x94, 0xd3, 0xea, 0x1f, 0x92, 0x81, + 0x2d, 0x2f, 0x73, 0xe1, 0x7a, 0xaf, 0xc8, 0x7a, 0x1f, 0x62, 0x70, 0xa9, 0x28, 0x83, 0x5b, 0x87, + 0x25, 0x86, 0xd2, 0x13, 0xe4, 0x0c, 0x3b, 0x1e, 0x39, 0x43, 0xd7, 0x61, 0x85, 0x97, 0x61, 0xc1, + 0xf3, 0x24, 0x34, 0x67, 0x78, 0x85, 0x29, 0xb3, 0x17, 0x62, 0x73, 0x0a, 0x8c, 0x7e, 0x0b, 0x2e, + 0x85, 0x74, 0x7d, 0xf4, 0x17, 0x6c, 0xa6, 0xe2, 0x6b, 0x6f, 0xcb, 0x32, 0xf0, 0xa7, 0x64, 0x10, + 0xa1, 0x80, 0xf8, 0xcd, 0xe2, 0x68, 0xc9, 0xff, 0x0d, 0x47, 0x4b, 0xfd, 0xd7, 0x1c, 0x2d, 0x5c, + 0xcc, 0xd2, 0xd1, 0x62, 0xf6, 0xcf, 0x64, 0xf0, 0x49, 0x7c, 0xc6, 0xd5, 0xb5, 0x0d, 0x22, 0xcb, + 0x0b, 0x7f, 0x46, 0x15, 0x48, 0x0f, 0xec, 0x9e, 0x2c, 0x22, 0xec, 0x91, 0x69, 0xf9, 0x18, 0xac, + 0x48, 0x88, 0xf5, 0x2b, 0x53, 0x96, 0x07, 0x58, 0x56, 0xa6, 0x0a, 0xa4, 0x1f, 0x11, 0x81, 0x98, + 0xcb, 0x1a, 0x7b, 0x64, 0x7a, 0x7c, 0x8f, 0x71, 0x1c, 0x5c, 0xd6, 0xc4, 0x00, 0xdd, 0x06, 0x85, + 0x37, 0x18, 0x74, 0xdb, 0x71, 0x25, 0xb8, 0xbd, 0x18, 0x5e, 0xab, 0xe8, 0x23, 0x6c, 0x1c, 0x32, + 0x9d, 0x03, 0xc7, 0xd5, 0x0a, 0x8e, 0x7c, 0x0a, 0x15, 0x5d, 0x25, 0xc2, 0xfd, 0xae, 0x80, 0xc2, + 0x66, 0xef, 0x3a, 0xb8, 0x4b, 0x38, 0x52, 0x29, 0x5a, 0x20, 0x50, 0x1f, 0x02, 0x9a, 0xc6, 0x5b, + 0xd4, 0x82, 0x1c, 0x39, 0x21, 0x16, 0x65, 0x5f, 0x8d, 0x85, 0xfb, 0xf2, 0x0c, 0x62, 0x45, 0x2c, + 0x5a, 0xaf, 0xb2, 0x20, 0xff, 0xe3, 0x9b, 0xf5, 0x8a, 0xd0, 0x7e, 0xd3, 0x1e, 0x9a, 0x94, 0x0c, + 0x1d, 0x7a, 0xa6, 0x49, 0x7b, 0xf5, 0x97, 0x29, 0xc6, 0x72, 0x22, 0x58, 0x3c, 0x33, 0xb6, 0xde, + 0x8e, 0x4f, 0x85, 0x18, 0xee, 0x62, 0xf1, 0x5e, 0x03, 0xe8, 0x61, 0x57, 0x7f, 0x8c, 0x2d, 0x4a, + 0x0c, 0x19, 0xf4, 0x90, 0x04, 0xd5, 0xa0, 0xc0, 0x46, 0x63, 0x97, 0x18, 0x92, 0x6c, 0xfb, 0xe3, + 0xd0, 0x3a, 0xf3, 0xdf, 0x6e, 0x9d, 0xd1, 0x28, 0x17, 0x26, 0xa3, 0xfc, 0xeb, 0x54, 0x90, 0x25, + 0x01, 0x21, 0xfc, 0xff, 0x8b, 0xc3, 0x6f, 0xf8, 0x29, 0x31, 0x5a, 0x14, 0xd1, 0x11, 0xac, 0xf8, + 0x59, 0xaa, 0x8f, 0x79, 0xf6, 0x7a, 0xfb, 0x6e, 0xd1, 0x34, 0xaf, 0x9c, 0x44, 0xc5, 0x2e, 0xfa, + 0x31, 0x3c, 0x3f, 0x81, 0x40, 0xbe, 0xeb, 0xd4, 0x82, 0x40, 0xf4, 0x5c, 0x14, 0x88, 0x3c, 0xcf, + 0x41, 0xac, 0xd2, 0xdf, 0x32, 0x37, 0x76, 0xd8, 0xc1, 0x23, 0x5c, 0xe2, 0x67, 0x7e, 0xfd, 0x57, + 0xa0, 0x38, 0x22, 0x94, 0x9d, 0x85, 0x23, 0x47, 0xbb, 0x65, 0x21, 0x94, 0x07, 0xc6, 0x43, 0x78, + 0x6e, 0x66, 0xa9, 0x47, 0xdf, 0x03, 0x25, 0x60, 0x09, 0xc9, 0x98, 0x53, 0x92, 0xcf, 0xfc, 0x03, + 0x5d, 0xf5, 0x8f, 0xc9, 0xc0, 0x65, 0xf4, 0x2c, 0xd1, 0x84, 0xdc, 0x88, 0xb8, 0xe3, 0x81, 0x60, + 0xf7, 0xa5, 0xad, 0xb7, 0x16, 0x23, 0x09, 0x4c, 0x3a, 0x1e, 0x50, 0x4d, 0x1a, 0xab, 0x0f, 0x21, + 0x27, 0x24, 0x68, 0x09, 0xf2, 0xf7, 0xf7, 0x77, 0xf7, 0x0f, 0x3e, 0xda, 0xaf, 0x24, 0x10, 0x40, + 0x6e, 0xbb, 0xd1, 0x68, 0x1e, 0xb6, 0x2b, 0x49, 0xa4, 0x40, 0x76, 0xbb, 0x7e, 0xa0, 0xb5, 0x2b, + 0x29, 0x26, 0xd6, 0x9a, 0x1f, 0x36, 0x1b, 0xed, 0x4a, 0x1a, 0xad, 0x40, 0x51, 0x3c, 0xeb, 0xf7, + 0x0e, 0xb4, 0x1f, 0x6e, 0xb7, 0x2b, 0x99, 0x90, 0xe8, 0xa8, 0xb9, 0x7f, 0xb7, 0xa9, 0x55, 0xb2, + 0xea, 0xdb, 0xec, 0xf8, 0x10, 0x43, 0x2b, 0x82, 0x83, 0x42, 0x32, 0x74, 0x50, 0x50, 0x7f, 0x9b, + 0x82, 0x5a, 0x3c, 0x57, 0x40, 0x1f, 0x4e, 0x2c, 0x7c, 0xeb, 0x02, 0x44, 0x63, 0x62, 0xf5, 0xe8, + 0x55, 0x28, 0x8d, 0xc8, 0x31, 0xa1, 0xdd, 0xbe, 0xe0, 0x2e, 0xa2, 0xb0, 0x15, 0xb5, 0xa2, 0x94, + 0x72, 0x23, 0x57, 0xa8, 0x7d, 0x4a, 0xba, 0x54, 0x17, 0x67, 0x16, 0xb1, 0xe9, 0x14, 0xa6, 0xc6, + 0xa4, 0x47, 0x42, 0xa8, 0x7e, 0x72, 0xa1, 0x58, 0x2a, 0x90, 0xd5, 0x9a, 0x6d, 0xed, 0x27, 0x95, + 0x34, 0x42, 0x50, 0xe2, 0x8f, 0xfa, 0xd1, 0xfe, 0xf6, 0xe1, 0x51, 0xeb, 0x80, 0xc5, 0xf2, 0x12, + 0x94, 0xbd, 0x58, 0x7a, 0xc2, 0xac, 0xfa, 0xef, 0x24, 0x94, 0x27, 0x12, 0x04, 0x6d, 0x41, 0x56, + 0xf0, 0xdf, 0xb8, 0x06, 0x33, 0xcf, 0x6f, 0x99, 0x4d, 0x42, 0x15, 0xbd, 0x0b, 0x05, 0x22, 0xcf, + 0xe4, 0xb3, 0x12, 0x51, 0xf4, 0x12, 0xbc, 0x53, 0xbb, 0x34, 0xf5, 0x2d, 0xd0, 0x7b, 0xa0, 0xf8, + 0x99, 0x2e, 0xcf, 0x4b, 0x2f, 0x4f, 0x9b, 0xfb, 0x18, 0x21, 0xed, 0x03, 0x1b, 0x74, 0x27, 0x20, + 0x51, 0x99, 0x69, 0xd6, 0x2d, 0xcd, 0x85, 0x82, 0x34, 0xf6, 0xf4, 0xd5, 0x06, 0x2c, 0x85, 0xd6, + 0x83, 0x5e, 0x04, 0x65, 0x88, 0x4f, 0x65, 0xaf, 0x47, 0x9c, 0xd6, 0x0b, 0x43, 0x7c, 0x2a, 0xda, + 0x3c, 0xcf, 0x43, 0x9e, 0xbd, 0xec, 0x61, 0x81, 0x36, 0x69, 0x2d, 0x37, 0xc4, 0xa7, 0x1f, 0x60, + 0x57, 0xfd, 0x18, 0x4a, 0xd1, 0x3e, 0x07, 0xdb, 0x89, 0x23, 0x7b, 0x6c, 0x19, 0xdc, 0x47, 0x56, + 0x13, 0x03, 0x74, 0x13, 0xb2, 0x27, 0xb6, 0x00, 0xab, 0xd9, 0x29, 0xfb, 0xc0, 0xa6, 0x24, 0xd4, + 0x27, 0x11, 0xda, 0xea, 0xe7, 0x90, 0xe5, 0xe0, 0xc3, 0x80, 0x84, 0x77, 0x2c, 0x24, 0x81, 0x64, + 0xcf, 0xe8, 0x63, 0x00, 0x4c, 0xe9, 0xc8, 0xec, 0x8c, 0x03, 0xc7, 0xeb, 0xb3, 0xc1, 0x6b, 0xdb, + 0xd3, 0xab, 0x5f, 0x91, 0x28, 0xb6, 0x1a, 0x98, 0x86, 0x90, 0x2c, 0xe4, 0x50, 0xdd, 0x87, 0x52, + 0xd4, 0xd6, 0xe3, 0x3c, 0xc9, 0x19, 0x9c, 0x27, 0x15, 0xe6, 0x3c, 0x3e, 0x63, 0x4a, 0x8b, 0xee, + 0x14, 0x1f, 0xa8, 0x4f, 0x92, 0x50, 0x68, 0x9f, 0xca, 0x6d, 0x1d, 0xd3, 0x18, 0x09, 0x4c, 0x53, + 0xe1, 0x36, 0x80, 0xe8, 0xb4, 0xa4, 0xfd, 0xfe, 0xcd, 0xfb, 0x7e, 0xe2, 0x66, 0x16, 0x3d, 0xed, + 0x79, 0x8d, 0x2c, 0x09, 0x56, 0xef, 0x80, 0xe2, 0xef, 0x2a, 0xc6, 0xc4, 0xb1, 0x61, 0x8c, 0x88, + 0xeb, 0xca, 0xb5, 0x79, 0x43, 0xde, 0x67, 0xb3, 0x1f, 0xcb, 0x46, 0x43, 0x5a, 0x13, 0x03, 0xd5, + 0x80, 0xf2, 0x44, 0xd9, 0x42, 0xef, 0x40, 0xde, 0x19, 0x77, 0x74, 0x2f, 0x3c, 0x13, 0xc9, 0xe3, + 0x91, 0xbc, 0x71, 0x67, 0x60, 0x76, 0x77, 0xc9, 0x99, 0x37, 0x19, 0x67, 0xdc, 0xd9, 0x15, 0x51, + 0x14, 0xbf, 0x92, 0x0a, 0xff, 0xca, 0x09, 0x14, 0xbc, 0x4d, 0x81, 0x7e, 0x10, 0xce, 0x13, 0xaf, + 0xfb, 0x1a, 0x5b, 0x4a, 0xa5, 0xfb, 0x50, 0x9a, 0x5c, 0x87, 0x15, 0xd7, 0xec, 0x59, 0xc4, 0xd0, + 0x83, 0xb3, 0x00, 0xff, 0xb5, 0x82, 0x56, 0x16, 0x2f, 0xf6, 0xbc, 0x83, 0x80, 0xfa, 0xaf, 0x24, + 0x14, 0xbc, 0x84, 0x45, 0x6f, 0x87, 0xf6, 0x5d, 0x69, 0x46, 0x53, 0xc2, 0x53, 0x0c, 0x5a, 0x65, + 0xd1, 0xb9, 0xa6, 0x2e, 0x3e, 0xd7, 0xb8, 0x9e, 0xa7, 0xd7, 0x7c, 0xce, 0x5c, 0xb8, 0xf9, 0xfc, + 0x26, 0x20, 0x6a, 0x53, 0x3c, 0xd0, 0x4f, 0x6c, 0x6a, 0x5a, 0x3d, 0x5d, 0x04, 0x5b, 0x30, 0xaa, + 0x0a, 0x7f, 0xf3, 0x80, 0xbf, 0x38, 0xe4, 0x71, 0xff, 0x45, 0x12, 0x0a, 0x7e, 0x6d, 0xbc, 0x68, + 0xe7, 0xeb, 0x32, 0xe4, 0x24, 0xfc, 0x8b, 0xd6, 0x97, 0x1c, 0xf9, 0x4d, 0xd8, 0x4c, 0xa8, 0x09, + 0x5b, 0x83, 0xc2, 0x90, 0x50, 0xcc, 0x09, 0x82, 0x38, 0x8e, 0xf9, 0xe3, 0xeb, 0x77, 0x60, 0x29, + 0xd4, 0x84, 0x64, 0x99, 0xb7, 0xdf, 0xfc, 0xa8, 0x92, 0xa8, 0xe5, 0x9f, 0x7c, 0x79, 0x35, 0xbd, + 0x4f, 0x1e, 0xb3, 0x3d, 0xab, 0x35, 0x1b, 0xad, 0x66, 0x63, 0xb7, 0x92, 0xac, 0x2d, 0x3d, 0xf9, + 0xf2, 0x6a, 0x5e, 0x23, 0xbc, 0x21, 0x72, 0xbd, 0x05, 0xcb, 0xe1, 0xaf, 0x12, 0xad, 0x20, 0x08, + 0x4a, 0x77, 0xef, 0x1f, 0xee, 0xed, 0x34, 0xb6, 0xdb, 0x4d, 0xfd, 0xc1, 0x41, 0xbb, 0x59, 0x49, + 0xa2, 0xe7, 0xe1, 0xd2, 0xde, 0xce, 0x07, 0xad, 0xb6, 0xde, 0xd8, 0xdb, 0x69, 0xee, 0xb7, 0xf5, + 0xed, 0x76, 0x7b, 0xbb, 0xb1, 0x5b, 0x49, 0x6d, 0xfd, 0x5e, 0x81, 0xf2, 0x76, 0xbd, 0xb1, 0xc3, + 0xaa, 0x9f, 0xd9, 0xc5, 0xfc, 0xac, 0xdc, 0x80, 0x0c, 0x3f, 0x0d, 0x9f, 0x7b, 0xfb, 0x58, 0x3b, + 0xbf, 0x55, 0x86, 0xee, 0x41, 0x96, 0x1f, 0x94, 0xd1, 0xf9, 0xd7, 0x91, 0xb5, 0x39, 0xbd, 0x33, + 0x36, 0x19, 0x9e, 0x1e, 0xe7, 0xde, 0x4f, 0xd6, 0xce, 0x6f, 0xa5, 0x21, 0x0d, 0x94, 0x80, 0xc2, + 0xcf, 0xbf, 0xaf, 0xab, 0x2d, 0x00, 0x36, 0x68, 0x0f, 0xf2, 0xde, 0xe1, 0x68, 0xde, 0x0d, 0x62, + 0x6d, 0x6e, 0xaf, 0x8b, 0x85, 0x4b, 0x1c, 0x62, 0xcf, 0xbf, 0x0e, 0xad, 0xcd, 0x69, 0xdc, 0xa1, + 0x1d, 0xc8, 0x49, 0x5e, 0x3a, 0xe7, 0x56, 0xb0, 0x36, 0xaf, 0x77, 0xc5, 0x82, 0x16, 0x74, 0x07, + 0xe6, 0x5f, 0xf2, 0xd6, 0x16, 0xe8, 0x49, 0xa2, 0xfb, 0x00, 0xa1, 0x23, 0xeb, 0x02, 0xb7, 0xb7, + 0xb5, 0x45, 0x7a, 0x8d, 0xe8, 0x00, 0x0a, 0xfe, 0xd1, 0x64, 0xee, 0x5d, 0x6a, 0x6d, 0x7e, 0xd3, + 0x0f, 0x3d, 0x84, 0x62, 0x94, 0x93, 0x2f, 0x76, 0x43, 0x5a, 0x5b, 0xb0, 0x9b, 0xc7, 0xfc, 0x47, + 0x09, 0xfa, 0x62, 0x37, 0xa6, 0xb5, 0x05, 0x9b, 0x7b, 0xe8, 0x53, 0x58, 0x99, 0x26, 0xd0, 0x8b, + 0x5f, 0xa0, 0xd6, 0x2e, 0xd0, 0xee, 0x43, 0x43, 0x40, 0x33, 0x88, 0xf7, 0x05, 0xee, 0x53, 0x6b, + 0x17, 0xe9, 0xfe, 0xd5, 0x9b, 0x5f, 0x3d, 0x5d, 0x4b, 0x7e, 0xfd, 0x74, 0x2d, 0xf9, 0xf7, 0xa7, + 0x6b, 0xc9, 0x2f, 0x9e, 0xad, 0x25, 0xbe, 0x7e, 0xb6, 0x96, 0xf8, 0xeb, 0xb3, 0xb5, 0xc4, 0x4f, + 0xdf, 0xe8, 0x99, 0xb4, 0x3f, 0xee, 0x6c, 0x74, 0xed, 0xe1, 0x66, 0xf8, 0x8f, 0x1a, 0xb3, 0xfe, + 0x3c, 0xd2, 0xc9, 0xf1, 0xa2, 0x72, 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x88, 0xe8, 0xa9, + 0x78, 0x5c, 0x22, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3389,7 +3242,6 @@ type ABCIApplicationClient interface { Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) - SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) @@ -3438,15 +3290,6 @@ func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts return out, nil } -func (c *aBCIApplicationClient) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) { - out := new(ResponseSetOption) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/SetOption", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *aBCIApplicationClient) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) { out := new(ResponseDeliverTx) err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/DeliverTx", in, out, opts...) @@ -3551,7 +3394,6 @@ type ABCIApplicationServer interface { Echo(context.Context, *RequestEcho) (*ResponseEcho, error) Flush(context.Context, *RequestFlush) (*ResponseFlush, error) Info(context.Context, *RequestInfo) (*ResponseInfo, error) - SetOption(context.Context, *RequestSetOption) (*ResponseSetOption, error) DeliverTx(context.Context, *RequestDeliverTx) (*ResponseDeliverTx, error) CheckTx(context.Context, *RequestCheckTx) (*ResponseCheckTx, error) Query(context.Context, *RequestQuery) (*ResponseQuery, error) @@ -3578,9 +3420,6 @@ func (*UnimplementedABCIApplicationServer) Flush(ctx context.Context, req *Reque func (*UnimplementedABCIApplicationServer) Info(ctx context.Context, req *RequestInfo) (*ResponseInfo, error) { return nil, status.Errorf(codes.Unimplemented, "method Info not implemented") } -func (*UnimplementedABCIApplicationServer) SetOption(ctx context.Context, req *RequestSetOption) (*ResponseSetOption, error) { - return nil, status.Errorf(codes.Unimplemented, "method SetOption not implemented") -} func (*UnimplementedABCIApplicationServer) DeliverTx(ctx context.Context, req *RequestDeliverTx) (*ResponseDeliverTx, error) { return nil, status.Errorf(codes.Unimplemented, "method DeliverTx not implemented") } @@ -3673,24 +3512,6 @@ func _ABCIApplication_Info_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } -func _ABCIApplication_SetOption_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RequestSetOption) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ABCIApplicationServer).SetOption(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/SetOption", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ABCIApplicationServer).SetOption(ctx, req.(*RequestSetOption)) - } - return interceptor(ctx, in, info, handler) -} - func _ABCIApplication_DeliverTx_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestDeliverTx) if err := dec(in); err != nil { @@ -3905,10 +3726,6 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "Info", Handler: _ABCIApplication_Info_Handler, }, - { - MethodName: "SetOption", - Handler: _ABCIApplication_SetOption_Handler, - }, { MethodName: "DeliverTx", Handler: _ABCIApplication_DeliverTx_Handler, @@ -4053,27 +3870,6 @@ func (m *Request_Info) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } -func (m *Request_SetOption) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Request_SetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.SetOption != nil { - { - size, err := m.SetOption.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - return len(dAtA) - i, nil -} func (m *Request_InitChain) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) @@ -4091,7 +3887,7 @@ func (m *Request_InitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x22 } return len(dAtA) - i, nil } @@ -4112,7 +3908,7 @@ func (m *Request_Query) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a } return len(dAtA) - i, nil } @@ -4133,7 +3929,7 @@ func (m *Request_BeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x32 } return len(dAtA) - i, nil } @@ -4154,7 +3950,7 @@ func (m *Request_CheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x3a } return len(dAtA) - i, nil } @@ -4175,7 +3971,7 @@ func (m *Request_DeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x42 } return len(dAtA) - i, nil } @@ -4196,7 +3992,7 @@ func (m *Request_EndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x52 + dAtA[i] = 0x4a } return len(dAtA) - i, nil } @@ -4217,7 +4013,7 @@ func (m *Request_Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x5a + dAtA[i] = 0x52 } return len(dAtA) - i, nil } @@ -4238,7 +4034,7 @@ func (m *Request_ListSnapshots) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x62 + dAtA[i] = 0x5a } return len(dAtA) - i, nil } @@ -4259,7 +4055,7 @@ func (m *Request_OfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6a + dAtA[i] = 0x62 } return len(dAtA) - i, nil } @@ -4280,7 +4076,7 @@ func (m *Request_LoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, erro i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x72 + dAtA[i] = 0x6a } return len(dAtA) - i, nil } @@ -4301,7 +4097,7 @@ func (m *Request_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x7a + dAtA[i] = 0x72 } return len(dAtA) - i, nil } @@ -4398,43 +4194,6 @@ func (m *RequestInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *RequestSetOption) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RequestSetOption) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RequestSetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Value) > 0 { - i -= len(m.Value) - copy(dAtA[i:], m.Value) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Value))) - i-- - dAtA[i] = 0x12 - } - if len(m.Key) > 0 { - i -= len(m.Key) - copy(dAtA[i:], m.Key) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Key))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *RequestInitChain) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4500,12 +4259,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n17, err17 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err17 != nil { - return 0, err17 + n16, err16 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err16 != nil { + return 0, err16 } - i -= n17 - i = encodeVarintTypes(dAtA, i, uint64(n17)) + i -= n16 + i = encodeVarintTypes(dAtA, i, uint64(n16)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -5004,27 +4763,6 @@ func (m *Response_Info) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } -func (m *Response_SetOption) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Response_SetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.SetOption != nil { - { - size, err := m.SetOption.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x2a - } - return len(dAtA) - i, nil -} func (m *Response_InitChain) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) @@ -5042,7 +4780,7 @@ func (m *Response_InitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x2a } return len(dAtA) - i, nil } @@ -5063,7 +4801,7 @@ func (m *Response_Query) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x32 } return len(dAtA) - i, nil } @@ -5084,7 +4822,7 @@ func (m *Response_BeginBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x3a } return len(dAtA) - i, nil } @@ -5105,7 +4843,7 @@ func (m *Response_CheckTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x42 } return len(dAtA) - i, nil } @@ -5126,7 +4864,7 @@ func (m *Response_DeliverTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x52 + dAtA[i] = 0x4a } return len(dAtA) - i, nil } @@ -5147,7 +4885,7 @@ func (m *Response_EndBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x5a + dAtA[i] = 0x52 } return len(dAtA) - i, nil } @@ -5168,7 +4906,7 @@ func (m *Response_Commit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x62 + dAtA[i] = 0x5a } return len(dAtA) - i, nil } @@ -5189,7 +4927,7 @@ func (m *Response_ListSnapshots) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6a + dAtA[i] = 0x62 } return len(dAtA) - i, nil } @@ -5210,7 +4948,7 @@ func (m *Response_OfferSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x72 + dAtA[i] = 0x6a } return len(dAtA) - i, nil } @@ -5231,7 +4969,7 @@ func (m *Response_LoadSnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x7a + dAtA[i] = 0x72 } return len(dAtA) - i, nil } @@ -5252,9 +4990,7 @@ func (m *Response_ApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, er i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 + dAtA[i] = 0x7a } return len(dAtA) - i, nil } @@ -5395,48 +5131,6 @@ func (m *ResponseInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ResponseSetOption) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ResponseSetOption) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ResponseSetOption) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Info) > 0 { - i -= len(m.Info) - copy(dAtA[i:], m.Info) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Info))) - i-- - dAtA[i] = 0x22 - } - if len(m.Log) > 0 { - i -= len(m.Log) - copy(dAtA[i:], m.Log) - i = encodeVarintTypes(dAtA, i, uint64(len(m.Log))) - i-- - dAtA[i] = 0x1a - } - if m.Code != 0 { - i = encodeVarintTypes(dAtA, i, uint64(m.Code)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *ResponseInitChain) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5998,20 +5692,20 @@ func (m *ResponseApplySnapshotChunk) MarshalToSizedBuffer(dAtA []byte) (int, err } } if len(m.RefetchChunks) > 0 { - dAtA41 := make([]byte, len(m.RefetchChunks)*10) - var j40 int + dAtA39 := make([]byte, len(m.RefetchChunks)*10) + var j38 int for _, num := range m.RefetchChunks { for num >= 1<<7 { - dAtA41[j40] = uint8(uint64(num)&0x7f | 0x80) + dAtA39[j38] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j40++ + j38++ } - dAtA41[j40] = uint8(num) - j40++ + dAtA39[j38] = uint8(num) + j38++ } - i -= j40 - copy(dAtA[i:], dAtA41[:j40]) - i = encodeVarintTypes(dAtA, i, uint64(j40)) + i -= j38 + copy(dAtA[i:], dAtA39[:j38]) + i = encodeVarintTypes(dAtA, i, uint64(j38)) i-- dAtA[i] = 0x12 } @@ -6451,12 +6145,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n49, err49 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err49 != nil { - return 0, err49 + n47, err47 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err47 != nil { + return 0, err47 } - i -= n49 - i = encodeVarintTypes(dAtA, i, uint64(n49)) + i -= n47 + i = encodeVarintTypes(dAtA, i, uint64(n47)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -6593,18 +6287,6 @@ func (m *Request_Info) Size() (n int) { } return n } -func (m *Request_SetOption) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.SetOption != nil { - l = m.SetOption.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} func (m *Request_InitChain) Size() (n int) { if m == nil { return 0 @@ -6778,23 +6460,6 @@ func (m *RequestInfo) Size() (n int) { return n } -func (m *RequestSetOption) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Key) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Value) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - func (m *RequestInitChain) Size() (n int) { if m == nil { return 0 @@ -7047,18 +6712,6 @@ func (m *Response_Info) Size() (n int) { } return n } -func (m *Response_SetOption) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.SetOption != nil { - l = m.SetOption.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} func (m *Response_InitChain) Size() (n int) { if m == nil { return 0 @@ -7187,7 +6840,7 @@ func (m *Response_ApplySnapshotChunk) Size() (n int) { _ = l if m.ApplySnapshotChunk != nil { l = m.ApplySnapshotChunk.Size() - n += 2 + l + sovTypes(uint64(l)) + n += 1 + l + sovTypes(uint64(l)) } return n } @@ -7253,26 +6906,6 @@ func (m *ResponseInfo) Size() (n int) { return n } -func (m *ResponseSetOption) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Code != 0 { - n += 1 + sovTypes(uint64(m.Code)) - } - l = len(m.Log) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - l = len(m.Info) - if l > 0 { - n += 1 + l + sovTypes(uint64(l)) - } - return n -} - func (m *ResponseInitChain) Size() (n int) { if m == nil { return 0 @@ -7890,41 +7523,6 @@ func (m *Request) Unmarshal(dAtA []byte) error { m.Value = &Request_Info{v} iNdEx = postIndex case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SetOption", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &RequestSetOption{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Value = &Request_SetOption{v} - iNdEx = postIndex - case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field InitChain", wireType) } @@ -7959,7 +7557,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_InitChain{v} iNdEx = postIndex - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType) } @@ -7994,7 +7592,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_Query{v} iNdEx = postIndex - case 7: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BeginBlock", wireType) } @@ -8029,7 +7627,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_BeginBlock{v} iNdEx = postIndex - case 8: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CheckTx", wireType) } @@ -8064,7 +7662,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_CheckTx{v} iNdEx = postIndex - case 9: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DeliverTx", wireType) } @@ -8099,7 +7697,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_DeliverTx{v} iNdEx = postIndex - case 10: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EndBlock", wireType) } @@ -8134,7 +7732,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_EndBlock{v} iNdEx = postIndex - case 11: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) } @@ -8169,7 +7767,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_Commit{v} iNdEx = postIndex - case 12: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ListSnapshots", wireType) } @@ -8204,7 +7802,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_ListSnapshots{v} iNdEx = postIndex - case 13: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OfferSnapshot", wireType) } @@ -8239,7 +7837,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_OfferSnapshot{v} iNdEx = postIndex - case 14: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LoadSnapshotChunk", wireType) } @@ -8274,7 +7872,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_LoadSnapshotChunk{v} iNdEx = postIndex - case 15: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ApplySnapshotChunk", wireType) } @@ -8594,123 +8192,6 @@ func (m *RequestInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestSetOption) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RequestSetOption: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RequestSetOption: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Key = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Value = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *RequestInitChain) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -10209,41 +9690,6 @@ func (m *Response) Unmarshal(dAtA []byte) error { m.Value = &Response_Info{v} iNdEx = postIndex case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SetOption", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ResponseSetOption{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Value = &Response_SetOption{v} - iNdEx = postIndex - case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field InitChain", wireType) } @@ -10278,7 +9724,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_InitChain{v} iNdEx = postIndex - case 7: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Query", wireType) } @@ -10313,7 +9759,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_Query{v} iNdEx = postIndex - case 8: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BeginBlock", wireType) } @@ -10348,7 +9794,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_BeginBlock{v} iNdEx = postIndex - case 9: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CheckTx", wireType) } @@ -10383,7 +9829,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_CheckTx{v} iNdEx = postIndex - case 10: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DeliverTx", wireType) } @@ -10418,7 +9864,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_DeliverTx{v} iNdEx = postIndex - case 11: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EndBlock", wireType) } @@ -10453,7 +9899,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_EndBlock{v} iNdEx = postIndex - case 12: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Commit", wireType) } @@ -10488,7 +9934,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_Commit{v} iNdEx = postIndex - case 13: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ListSnapshots", wireType) } @@ -10523,7 +9969,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_ListSnapshots{v} iNdEx = postIndex - case 14: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OfferSnapshot", wireType) } @@ -10558,7 +10004,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_OfferSnapshot{v} iNdEx = postIndex - case 15: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LoadSnapshotChunk", wireType) } @@ -10593,7 +10039,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_LoadSnapshotChunk{v} iNdEx = postIndex - case 16: + case 15: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ApplySnapshotChunk", wireType) } @@ -11064,142 +10510,6 @@ func (m *ResponseInfo) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResponseSetOption) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ResponseSetOption: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ResponseSetOption: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType) - } - m.Code = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Code |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Log", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Log = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Info = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ResponseInitChain) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/docs/app-dev/abci-cli.md b/docs/app-dev/abci-cli.md index f19d80abc..18a7984f7 100644 --- a/docs/app-dev/abci-cli.md +++ b/docs/app-dev/abci-cli.md @@ -285,9 +285,6 @@ abci-cli counter In another window, start the `abci-cli console`: ```sh -> set_option serial on --> code: OK --> log: OK (SetOption doesn't return anything.) > check_tx 0x00 -> code: OK diff --git a/docs/architecture/adr-029-check-tx-consensus.md b/docs/architecture/adr-029-check-tx-consensus.md index c1b882c61..191a0ec8e 100644 --- a/docs/architecture/adr-029-check-tx-consensus.md +++ b/docs/architecture/adr-029-check-tx-consensus.md @@ -43,7 +43,6 @@ However, this method should not be implemented like that, because checkTx will s type Application interface { // Info/Query Connection Info(RequestInfo) ResponseInfo // Return application info - SetOption(RequestSetOption) ResponseSetOption // Set application option Query(RequestQuery) ResponseQuery // Query for state // Mempool Connection diff --git a/docs/tutorials/go-built-in.md b/docs/tutorials/go-built-in.md index 1f60ee047..9611cff00 100644 --- a/docs/tutorials/go-built-in.md +++ b/docs/tutorials/go-built-in.md @@ -102,10 +102,6 @@ func (KVStoreApplication) Info(req abcitypes.RequestInfo) abcitypes.ResponseInfo return abcitypes.ResponseInfo{} } -func (KVStoreApplication) SetOption(req abcitypes.RequestSetOption) abcitypes.ResponseSetOption { - return abcitypes.ResponseSetOption{} -} - func (KVStoreApplication) DeliverTx(req abcitypes.RequestDeliverTx) abcitypes.ResponseDeliverTx { return abcitypes.ResponseDeliverTx{Code: 0} } diff --git a/docs/tutorials/go.md b/docs/tutorials/go.md index b9100e62c..728467cfc 100644 --- a/docs/tutorials/go.md +++ b/docs/tutorials/go.md @@ -105,10 +105,6 @@ func (KVStoreApplication) Info(req abcitypes.RequestInfo) abcitypes.ResponseInfo return abcitypes.ResponseInfo{} } -func (KVStoreApplication) SetOption(req abcitypes.RequestSetOption) abcitypes.ResponseSetOption { - return abcitypes.ResponseSetOption{} -} - func (KVStoreApplication) DeliverTx(req abcitypes.RequestDeliverTx) abcitypes.ResponseDeliverTx { return abcitypes.ResponseDeliverTx{Code: 0} } diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index e24cac4e0..3414e9952 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/mempool/clist_mempool_test.go b/mempool/clist_mempool_test.go index 5c27db5a7..92e0af9a0 100644 --- a/mempool/clist_mempool_test.go +++ b/mempool/clist_mempool_test.go @@ -262,7 +262,6 @@ func TestTxsAvailable(t *testing.T) { func TestSerialReap(t *testing.T) { app := counter.NewApplication(true) - app.SetOption(abci.RequestSetOption{Key: "serial", Value: "on"}) cc := proxy.NewLocalClientCreator(app) mempool, cleanup := newMempoolWithApp(cc) diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index 8f0e5ee5c..704f965cd 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 2cbcabb29..b95a8ed83 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -24,18 +24,17 @@ message Request { RequestEcho echo = 1; RequestFlush flush = 2; RequestInfo info = 3; - RequestSetOption set_option = 4; - RequestInitChain init_chain = 5; - RequestQuery query = 6; - RequestBeginBlock begin_block = 7; - RequestCheckTx check_tx = 8; - RequestDeliverTx deliver_tx = 9; - RequestEndBlock end_block = 10; - RequestCommit commit = 11; - RequestListSnapshots list_snapshots = 12; - RequestOfferSnapshot offer_snapshot = 13; - RequestLoadSnapshotChunk load_snapshot_chunk = 14; - RequestApplySnapshotChunk apply_snapshot_chunk = 15; + RequestInitChain init_chain = 4; + RequestQuery query = 5; + RequestBeginBlock begin_block = 6; + RequestCheckTx check_tx = 7; + RequestDeliverTx deliver_tx = 8; + RequestEndBlock end_block = 9; + RequestCommit commit = 10; + RequestListSnapshots list_snapshots = 11; + RequestOfferSnapshot offer_snapshot = 12; + RequestLoadSnapshotChunk load_snapshot_chunk = 13; + RequestApplySnapshotChunk apply_snapshot_chunk = 14; } } @@ -51,12 +50,6 @@ message RequestInfo { uint64 p2p_version = 3; } -// nondeterministic -message RequestSetOption { - string key = 1; - string value = 2; -} - message RequestInitChain { google.protobuf.Timestamp time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -134,18 +127,17 @@ message Response { ResponseEcho echo = 2; ResponseFlush flush = 3; ResponseInfo info = 4; - ResponseSetOption set_option = 5; - ResponseInitChain init_chain = 6; - ResponseQuery query = 7; - ResponseBeginBlock begin_block = 8; - ResponseCheckTx check_tx = 9; - ResponseDeliverTx deliver_tx = 10; - ResponseEndBlock end_block = 11; - ResponseCommit commit = 12; - ResponseListSnapshots list_snapshots = 13; - ResponseOfferSnapshot offer_snapshot = 14; - ResponseLoadSnapshotChunk load_snapshot_chunk = 15; - ResponseApplySnapshotChunk apply_snapshot_chunk = 16; + ResponseInitChain init_chain = 5; + ResponseQuery query = 6; + ResponseBeginBlock begin_block = 7; + ResponseCheckTx check_tx = 8; + ResponseDeliverTx deliver_tx = 9; + ResponseEndBlock end_block = 10; + ResponseCommit commit = 11; + ResponseListSnapshots list_snapshots = 12; + ResponseOfferSnapshot offer_snapshot = 13; + ResponseLoadSnapshotChunk load_snapshot_chunk = 14; + ResponseApplySnapshotChunk apply_snapshot_chunk = 15; } } @@ -170,14 +162,6 @@ message ResponseInfo { bytes last_block_app_hash = 5; } -// nondeterministic -message ResponseSetOption { - uint32 code = 1; - // bytes data = 2; - string log = 3; - string info = 4; -} - message ResponseInitChain { ConsensusParams consensus_params = 1; repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; @@ -392,7 +376,6 @@ service ABCIApplication { rpc Echo(RequestEcho) returns (ResponseEcho); rpc Flush(RequestFlush) returns (ResponseFlush); rpc Info(RequestInfo) returns (ResponseInfo); - rpc SetOption(RequestSetOption) returns (ResponseSetOption); rpc DeliverTx(RequestDeliverTx) returns (ResponseDeliverTx); rpc CheckTx(RequestCheckTx) returns (ResponseCheckTx); rpc Query(RequestQuery) returns (ResponseQuery); diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 720007ed1..61652b30b 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -39,8 +39,6 @@ type AppConnQuery interface { EchoSync(string) (*types.ResponseEcho, error) InfoSync(types.RequestInfo) (*types.ResponseInfo, error) QuerySync(types.RequestQuery) (*types.ResponseQuery, error) - - // SetOptionSync(key string, value string) (res types.Result) } type AppConnSnapshot interface { diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index f3546c11d..7e5f81489 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index a7d3ca307..b068c01eb 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index 4de683cdb..970dfab3a 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index 9f31ea9b9..8cd39c923 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index bfd82e596..33e28d7f7 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/state/mocks/store.go b/state/mocks/store.go index 17e1ef7b9..233505a26 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index 47dbb86d2..888553165 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.1.0. DO NOT EDIT. +// Code generated by mockery v2.3.0. DO NOT EDIT. package mocks