From 6a91c969d951bfe3539f2026b2b81107b7c2df5e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 09:37:29 +0000 Subject: [PATCH 01/34] chore(gov): improve proposal conversion error message (backport #15979) (#15980) Co-authored-by: Julien Robert Co-authored-by: marbar3778 --- CHANGELOG.md | 4 ++++ x/gov/migrations/v3/convert.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0350ade9e8..082be85953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Improvements + +* (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. + ## [v0.47.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.2) - 2023-04-27 ### Improvements diff --git a/x/gov/migrations/v3/convert.go b/x/gov/migrations/v3/convert.go index 1c9879c0cf..cf471634c8 100644 --- a/x/gov/migrations/v3/convert.go +++ b/x/gov/migrations/v3/convert.go @@ -49,7 +49,7 @@ func ConvertToLegacyProposal(proposal v1.Proposal) (v1beta1.Proposal, error) { return v1beta1.Proposal{}, err } if len(msgs) != 1 { - return v1beta1.Proposal{}, sdkerrors.ErrInvalidType.Wrap("can't convert a gov/v1 Proposal to gov/v1beta1 Proposal when amount of proposal messages is more than one") + return v1beta1.Proposal{}, sdkerrors.ErrInvalidType.Wrap("can't convert a gov/v1 Proposal to gov/v1beta1 Proposal when amount of proposal messages not exactly one") } if legacyMsg, ok := msgs[0].(*v1.MsgExecLegacyContent); ok { // check that the content struct can be unmarshalled From ec4d9b7b6f92c2cbe8f4b201ad889ea556c9ceed Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sat, 29 Apr 2023 00:08:35 +0200 Subject: [PATCH 02/34] feat: use cosmossdk.io/log in v0.47 (#15984) --- CHANGELOG.md | 1 + go.mod | 5 +++- go.sum | 15 +++++++++++- server/log/cmt_logger.go | 22 ++++++++++++++++++ server/util.go | 50 +++++++++++++++++++++++++--------------- simapp/go.mod | 5 +++- simapp/go.sum | 15 +++++++++++- tests/go.mod | 5 +++- tests/go.sum | 15 +++++++++++- 9 files changed, 109 insertions(+), 24 deletions(-) create mode 100644 server/log/cmt_logger.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 082be85953..0c24438673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. ## [v0.47.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.2) - 2023-04-27 diff --git a/go.mod b/go.mod index ca93092ef2..11ea5bb359 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( cosmossdk.io/core v0.5.1 cosmossdk.io/depinject v1.0.0-alpha.3 cosmossdk.io/errors v1.0.0-beta.7 + cosmossdk.io/log v1.1.0 cosmossdk.io/math v1.0.0 cosmossdk.io/tools/rosetta v0.2.1 github.com/99designs/keyring v1.2.1 @@ -41,11 +42,12 @@ require ( github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b github.com/magiconair/properties v1.8.6 github.com/manifoldco/promptui v0.9.0 - github.com/mattn/go-isatty v0.0.16 + github.com/mattn/go-isatty v0.0.18 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 github.com/prometheus/common v0.37.0 github.com/rakyll/statik v0.1.7 + github.com/rs/zerolog v1.29.1 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 @@ -122,6 +124,7 @@ require ( github.com/klauspost/compress v1.16.3 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect diff --git a/go.sum b/go.sum index c0b8cce47a..22f2941fab 100644 --- a/go.sum +++ b/go.sum @@ -196,6 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= +cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -311,6 +313,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= @@ -440,6 +443,7 @@ github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= @@ -710,11 +714,15 @@ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -868,6 +876,9 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1222,6 +1233,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1245,6 +1257,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/server/log/cmt_logger.go b/server/log/cmt_logger.go new file mode 100644 index 0000000000..82d7a783f3 --- /dev/null +++ b/server/log/cmt_logger.go @@ -0,0 +1,22 @@ +package server + +import ( + "cosmossdk.io/log" + cmtlog "github.com/cometbft/cometbft/libs/log" +) + +var _ cmtlog.Logger = (*CometLoggerWrapper)(nil) + +// CometLoggerWrapper provides a wrapper around a zerolog.Logger instance. +// It implements CometBFT's Logger interface. +type CometLoggerWrapper struct { + log.Logger +} + +// With returns a new wrapped logger with additional context provided by a set +// of key/value tuples. The number of tuples must be even and the key of the +// tuple must be a string. +func (cmt CometLoggerWrapper) With(keyVals ...interface{}) cmtlog.Logger { + logger := cmt.Logger.With(keyVals...) + return CometLoggerWrapper{logger} +} diff --git a/server/util.go b/server/util.go index 33262096da..c601c078bb 100644 --- a/server/util.go +++ b/server/util.go @@ -14,21 +14,24 @@ import ( "syscall" "time" + "github.com/rs/zerolog" + "github.com/spf13/cast" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/spf13/viper" + + "cosmossdk.io/log" dbm "github.com/cometbft/cometbft-db" tmcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" - tmflags "github.com/cometbft/cometbft/libs/cli/flags" tmlog "github.com/cometbft/cometbft/libs/log" tmtypes "github.com/cometbft/cometbft/types" - "github.com/spf13/cast" - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "github.com/spf13/viper" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server/config" + serverlog "github.com/cosmos/cosmos-sdk/server/log" "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" @@ -153,24 +156,35 @@ func InterceptConfigsPreRunHandler(cmd *cobra.Command, customAppConfigTemplate s return err } - var logger tmlog.Logger + var opts []log.Option if serverCtx.Viper.GetString(flags.FlagLogFormat) == tmcfg.LogFormatJSON { - logger = tmlog.NewTMJSONLogger(tmlog.NewSyncWriter(os.Stdout)) - } else { - logger = tmlog.NewTMLogger(tmlog.NewSyncWriter(os.Stdout)) - } - logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, tmcfg.DefaultLogLevel) - if err != nil { - return err + opts = append(opts, log.OutputJSONOption()) } - // Check if the tendermint flag for trace logging is set if it is then setup - // a tracing logger in this app as well. - if serverCtx.Viper.GetBool(tmcli.TraceFlag) { - logger = tmlog.NewTracingLogger(logger) + // check and set filter level or keys for the logger if any + logLvlStr := serverCtx.Viper.GetString(flags.FlagLogLevel) + if logLvlStr != "" { + logLvl, err := zerolog.ParseLevel(logLvlStr) + switch { + case err != nil: + // If the log level is not a valid zerolog level, then we try to parse it as a key filter. + filterFunc, err := log.ParseLogLevel(logLvlStr) + if err != nil { + return err + } + + opts = append(opts, log.FilterOption(filterFunc)) + case serverCtx.Viper.GetBool(tmcli.TraceFlag): + // Check if the CometBFT flag for trace logging is set if it is then setup a tracing logger in this app as well. + // Note it overrides log level passed in `log_levels`. + opts = append(opts, log.LevelOption(zerolog.TraceLevel)) + default: + opts = append(opts, log.LevelOption(logLvl)) + } } - serverCtx.Logger = logger.With("module", "server") + logger := log.NewLogger(tmlog.NewSyncWriter(os.Stdout), opts...).With(log.ModuleKey, "server") + serverCtx.Logger = serverlog.CometLoggerWrapper{Logger: logger} return SetCmdServerContext(cmd, serverCtx) } diff --git a/simapp/go.mod b/simapp/go.mod index f29af85129..c1d2736e69 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -27,6 +27,7 @@ require ( cloud.google.com/go/iam v0.12.0 // indirect cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect + cosmossdk.io/log v1.1.0 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect @@ -109,7 +110,8 @@ require ( github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/manifoldco/promptui v0.9.0 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect @@ -129,6 +131,7 @@ require ( github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect + github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index 4cdaacc2ca..f54e3b20ba 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -196,6 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= +cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -311,6 +313,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= @@ -441,6 +444,7 @@ github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= @@ -704,11 +708,15 @@ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -860,6 +868,9 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1216,6 +1227,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1239,6 +1251,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/tests/go.mod b/tests/go.mod index 532a7c5053..79df2812ae 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -28,6 +28,7 @@ require ( cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect + cosmossdk.io/log v1.1.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -106,7 +107,8 @@ require ( github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/manifoldco/promptui v0.9.0 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.18 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect @@ -126,6 +128,7 @@ require ( github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect + github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index 4374f3dc81..8d4579730d 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -196,6 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= +cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -311,6 +313,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= @@ -439,6 +442,7 @@ github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGF github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= @@ -702,11 +706,15 @@ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA= github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= +github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -858,6 +866,9 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1212,6 +1223,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1235,6 +1247,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 02e72750217b62d0933684969da5b6b208b37e51 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 07:38:36 +0200 Subject: [PATCH 03/34] fix(x/group): v2 migration (backport #16017) (#16018) --- CHANGELOG.md | 4 +++ x/group/migrations/v2/migrate.go | 6 ++++ x/group/migrations/v2/migrate_test.go | 48 ++++++++++++++------------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c24438673..bf3c871b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. +### Bug Fixes + +* (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. + ## [v0.47.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.2) - 2023-04-27 ### Improvements diff --git a/x/group/migrations/v2/migrate.go b/x/group/migrations/v2/migrate.go index 7e6c342136..ddf9f00d38 100644 --- a/x/group/migrations/v2/migrate.go +++ b/x/group/migrations/v2/migrate.go @@ -68,6 +68,12 @@ func Migrate( return fmt.Errorf("failed to create new group policy account: %w", err) } + // set account number + err = baseAccount.SetAccountNumber(oldAcc.GetAccountNumber()) + if err != nil { + return err + } + // NOTE: we do not call NewAccount because we do not want to bump the account number // set new account diff --git a/x/group/migrations/v2/migrate_test.go b/x/group/migrations/v2/migrate_test.go index 9773021679..3366324fa0 100644 --- a/x/group/migrations/v2/migrate_test.go +++ b/x/group/migrations/v2/migrate_test.go @@ -21,11 +21,11 @@ import ( ) var ( - policies = []sdk.AccAddress{policyAddr1, policyAddr2, policyAddr3} - policyAddr1 = sdk.MustAccAddressFromBech32("cosmos1q32tjg5qm3n9fj8wjgpd7gl98prefntrckjkyvh8tntp7q33zj0s5tkjrk") - policyAddr2 = sdk.MustAccAddressFromBech32("cosmos1afk9zr2hn2jsac63h4hm60vl9z3e5u69gndzf7c99cqge3vzwjzsfwkgpd") - policyAddr3 = sdk.MustAccAddressFromBech32("cosmos1dlszg2sst9r69my4f84l3mj66zxcf3umcgujys30t84srg95dgvsmn3jeu") - accountAddr = sdk.AccAddress("addr2_______________") + policies = []sdk.AccAddress{policyAddr1, policyAddr2, policyAddr3} + policyAddr1 = sdk.MustAccAddressFromBech32("cosmos1q32tjg5qm3n9fj8wjgpd7gl98prefntrckjkyvh8tntp7q33zj0s5tkjrk") + policyAddr2 = sdk.MustAccAddressFromBech32("cosmos1afk9zr2hn2jsac63h4hm60vl9z3e5u69gndzf7c99cqge3vzwjzsfwkgpd") + policyAddr3 = sdk.MustAccAddressFromBech32("cosmos1dlszg2sst9r69my4f84l3mj66zxcf3umcgujys30t84srg95dgvsmn3jeu") + authorityAddr = sdk.AccAddress("authority") ) func TestMigrate(t *testing.T) { @@ -34,24 +34,23 @@ func TestMigrate(t *testing.T) { tKey := sdk.NewTransientStoreKey("transient_test") ctx := testutil.DefaultContext(storeKey, tKey) - accountKeeper := createOldPolicyAccount(ctx, storeKey, cdc) - groupPolicyTable, groupPolicySeq, err := createGroupPolicies(ctx, storeKey, cdc) + oldAccs, accountKeeper := createOldPolicyAccount(ctx, storeKey, cdc, policies) + groupPolicyTable, groupPolicySeq, err := createGroupPolicies(ctx, storeKey, cdc, policies) require.NoError(t, err) - oldAcc := accountKeeper.GetAccount(ctx, policyAddr1) - require.NoError(t, v2.Migrate(ctx, storeKey, accountKeeper, groupPolicySeq, groupPolicyTable)) - newAcc := accountKeeper.GetAccount(ctx, policyAddr1) - - require.NotEqual(t, oldAcc, newAcc) - require.True(t, func() bool { _, ok := oldAcc.(*authtypes.ModuleAccount); return ok }()) - require.True(t, func() bool { _, ok := newAcc.(*authtypes.BaseAccount); return ok }()) - require.Equal(t, oldAcc.GetAddress(), newAcc.GetAddress()) - require.Equal(t, oldAcc.GetAccountNumber(), newAcc.GetAccountNumber()) - require.Equal(t, newAcc.GetPubKey().Address().Bytes(), newAcc.GetAddress().Bytes()) + for i, policyAddr := range policies { + oldAcc := oldAccs[i] + newAcc := accountKeeper.GetAccount(ctx, policyAddr) + require.NotEqual(t, oldAcc, newAcc) + require.True(t, func() bool { _, ok := newAcc.(*authtypes.BaseAccount); return ok }()) + require.Equal(t, oldAcc.GetAddress(), newAcc.GetAddress()) + require.Equal(t, int(oldAcc.GetAccountNumber()), int(newAcc.GetAccountNumber())) + require.Equal(t, newAcc.GetPubKey().Address().Bytes(), newAcc.GetAddress().Bytes()) + } } -func createGroupPolicies(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Codec) (orm.PrimaryKeyTable, orm.Sequence, error) { +func createGroupPolicies(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Codec, policies []sdk.AccAddress) (orm.PrimaryKeyTable, orm.Sequence, error) { groupPolicyTable, err := orm.NewPrimaryKeyTable([2]byte{groupkeeper.GroupPolicyTablePrefix}, &group.GroupPolicyInfo{}, cdc) if err != nil { panic(err.Error()) @@ -60,7 +59,7 @@ func createGroupPolicies(ctx sdk.Context, storeKey storetypes.StoreKey, cdc code groupPolicySeq := orm.NewSequence(v2.GroupPolicyTableSeqPrefix) for _, policyAddr := range policies { - groupPolicyInfo, err := group.NewGroupPolicyInfo(policyAddr, 1, accountAddr, "", 1, group.NewPercentageDecisionPolicy("1", 1, 1), ctx.BlockTime()) + groupPolicyInfo, err := group.NewGroupPolicyInfo(policyAddr, 1, authorityAddr, "", 1, group.NewPercentageDecisionPolicy("1", 1, 1), ctx.BlockTime()) if err != nil { return orm.PrimaryKeyTable{}, orm.Sequence{}, err } @@ -76,9 +75,11 @@ func createGroupPolicies(ctx sdk.Context, storeKey storetypes.StoreKey, cdc code } // createOldPolicyAccount re-creates the group policy account using a module account -func createOldPolicyAccount(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Codec) group.AccountKeeper { - accountKeeper := authkeeper.NewAccountKeeper(cdc, storeKey, authtypes.ProtoBaseAccount, nil, sdk.Bech32MainPrefix, accountAddr.String()) - for _, policyAddr := range policies { +func createOldPolicyAccount(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Codec, policies []sdk.AccAddress) ([]*authtypes.ModuleAccount, group.AccountKeeper) { + accountKeeper := authkeeper.NewAccountKeeper(cdc, storeKey, authtypes.ProtoBaseAccount, nil, sdk.Bech32MainPrefix, authorityAddr.String()) + + oldPolicyAccounts := make([]*authtypes.ModuleAccount, len(policies)) + for i, policyAddr := range policies { acc := accountKeeper.NewAccount(ctx, &authtypes.ModuleAccount{ BaseAccount: &authtypes.BaseAccount{ Address: policyAddr.String(), @@ -86,7 +87,8 @@ func createOldPolicyAccount(ctx sdk.Context, storeKey storetypes.StoreKey, cdc c Name: policyAddr.String(), }) accountKeeper.SetAccount(ctx, acc) + oldPolicyAccounts[i] = acc.(*authtypes.ModuleAccount) } - return accountKeeper + return oldPolicyAccounts, accountKeeper } From 9e632939711471a94c0fdb400bf58d866755f58e Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Sun, 7 May 2023 12:24:14 +0200 Subject: [PATCH 04/34] ci: bump go in CI (#16050) --- .github/workflows/build.yml | 3 ++- .github/workflows/codeql-analysis.yml | 3 ++- .github/workflows/dependabot-update-all.yml | 3 ++- .github/workflows/dependencies-review.yml | 3 ++- .github/workflows/lint.yml | 3 ++- .github/workflows/release-cosmovisor.yml | 3 ++- .github/workflows/release-rosetta.yml | 3 ++- .github/workflows/release.yml | 3 ++- .github/workflows/sims-045.yml | 15 ++++++++++----- .github/workflows/sims-046.yml | 15 ++++++++++----- .github/workflows/sims-047.yml | 15 ++++++++++----- .github/workflows/sims-nightly.yml | 6 ++++-- .github/workflows/sims.yml | 12 ++++++++---- .github/workflows/test.yml | 21 ++++++++++++++------- simapp/app_v2.go | 2 +- 15 files changed, 73 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f92e22499..e4f452bd06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: technote-space/get-diff-action@v6.1.1 id: git_diff with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 215b72f0ad..34f9bf8326 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,8 @@ jobs: uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml index 799ad222e2..cc5589ab7e 100644 --- a/.github/workflows/dependabot-update-all.yml +++ b/.github/workflows/dependabot-update-all.yml @@ -17,7 +17,8 @@ jobs: token: ${{ secrets.PRBOT_PAT }} - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Extract updated dependency id: deps run: | diff --git a/.github/workflows/dependencies-review.yml b/.github/workflows/dependencies-review.yml index 5a63493155..52b58c3a48 100644 --- a/.github/workflows/dependencies-review.yml +++ b/.github/workflows/dependencies-review.yml @@ -10,7 +10,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: "Checkout Repository" uses: actions/checkout@v3 - name: "Dependency Review" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 02f5fb62d4..b4861d80ab 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/release-cosmovisor.yml b/.github/workflows/release-cosmovisor.yml index 1f9f671842..9b64aac56b 100644 --- a/.github/workflows/release-cosmovisor.yml +++ b/.github/workflows/release-cosmovisor.yml @@ -16,7 +16,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true # get 'v*.*.*' part from 'cosmovisor/v*.*.*' and save to $GITHUB_ENV - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/cosmovisor/}" >> $GITHUB_ENV diff --git a/.github/workflows/release-rosetta.yml b/.github/workflows/release-rosetta.yml index d6768c754d..577edbce7d 100644 --- a/.github/workflows/release-rosetta.yml +++ b/.github/workflows/release-rosetta.yml @@ -16,7 +16,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true # get 'v*.*.*' part from 'rosetta/v*.*.*' and save to $GITHUB_ENV - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/rosetta/}" >> $GITHUB_ENV diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f7ade2502..6a129b6146 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,8 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Unshallow run: git fetch --prune --unshallow - name: Create release diff --git a/.github/workflows/sims-045.yml b/.github/workflows/sims-045.yml index 1fe940fe96..2c768e2727 100644 --- a/.github/workflows/sims-045.yml +++ b/.github/workflows/sims-045.yml @@ -21,7 +21,8 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - run: make build install-runsim: @@ -32,7 +33,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - uses: actions/cache@v3 @@ -49,7 +51,8 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -67,7 +70,8 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -86,7 +90,8 @@ jobs: ref: "release/v0.45.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/sims-046.yml b/.github/workflows/sims-046.yml index 676e34f8d0..293872992c 100644 --- a/.github/workflows/sims-046.yml +++ b/.github/workflows/sims-046.yml @@ -21,7 +21,8 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - run: make build install-runsim: @@ -32,7 +33,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - uses: actions/cache@v3 @@ -50,7 +52,8 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -68,7 +71,8 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -86,7 +90,8 @@ jobs: ref: "release/v0.46.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/sims-047.yml b/.github/workflows/sims-047.yml index 15dc4a5048..8219ff6edf 100644 --- a/.github/workflows/sims-047.yml +++ b/.github/workflows/sims-047.yml @@ -21,7 +21,8 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - run: make build install-runsim: @@ -32,7 +33,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - uses: actions/cache@v3 @@ -50,7 +52,8 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -68,7 +71,8 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -86,7 +90,8 @@ jobs: ref: "release/v0.47.x" - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml index 559a3077c4..804bf9147b 100644 --- a/.github/workflows/sims-nightly.yml +++ b/.github/workflows/sims-nightly.yml @@ -22,7 +22,8 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 - uses: actions/cache@v3 @@ -36,7 +37,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index 1642e5b31c..45ac6f0f60 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -21,7 +21,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - run: make build - name: Install runsim run: go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -38,7 +39,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -54,7 +56,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin @@ -71,7 +74,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - uses: actions/cache@v3 with: path: ~/go/bin diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 694af38953..76fa60202e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true - name: Create a file with all core Cosmos SDK pkgs run: go list ./... > pkgs.txt - name: Split pkgs into 4 files @@ -52,7 +53,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: go.sum - uses: technote-space/get-diff-action@v6.1.1 @@ -83,7 +85,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: go.sum - uses: technote-space/get-diff-action@v6.1.1 @@ -113,7 +116,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: go.sum - uses: technote-space/get-diff-action@v6.1.1 @@ -190,7 +194,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: go.sum - uses: technote-space/get-diff-action@v6.1.1 @@ -219,7 +224,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: go.sum - uses: technote-space/get-diff-action@v6.1.1 @@ -244,7 +250,8 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19.8 + go-version: "1.19" + check-latest: true cache: true cache-dependency-path: simapp/go.sum - uses: technote-space/get-diff-action@v6.1.1 diff --git a/simapp/app_v2.go b/simapp/app_v2.go index cbacf2a7b6..c5c1ddad76 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -361,7 +361,7 @@ func (app *SimApp) GetSubspace(moduleName string) paramstypes.Subspace { return subspace } -// SimulationManager implements the SimulationApp interface +// SimulationManager implements the SimulationApp interface. func (app *SimApp) SimulationManager() *module.SimulationManager { return app.sm } From 850bd7138e5681b03a07fc110398a5c439ce1db7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 11:36:08 +0000 Subject: [PATCH 05/34] fix: fetch account number/sequence when not in offline mode (backport #16075) (#16081) Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + client/account_retriever.go | 6 ++++-- client/tx/factory.go | 20 +++++++++++++++----- client/tx/factory_test.go | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 client/tx/factory_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3c871b02..c7b9f696a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (client) [#16075](https://github.com/cosmos/cosmos-sdk/pull/16075) Partly revert [#15953](https://github.com/cosmos/cosmos-sdk/issues/15953) and `factory.Prepare` now does nothing in offline mode. * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. diff --git a/client/account_retriever.go b/client/account_retriever.go index 24de5423e2..ff5be9bc85 100644 --- a/client/account_retriever.go +++ b/client/account_retriever.go @@ -28,7 +28,9 @@ var _ AccountRetriever = (*MockAccountRetriever)(nil) // MockAccountRetriever defines a no-op basic AccountRetriever that can be used // in mocked contexts. Tests or context that need more sophisticated testing // state should implement their own mock AccountRetriever. -type MockAccountRetriever struct{} +type MockAccountRetriever struct { + ReturnAccNum, ReturnAccSeq uint64 +} func (mar MockAccountRetriever) GetAccount(_ Context, _ sdk.AccAddress) (Account, error) { return nil, nil @@ -43,5 +45,5 @@ func (mar MockAccountRetriever) EnsureExists(_ Context, _ sdk.AccAddress) error } func (mar MockAccountRetriever) GetAccountNumberSequence(_ Context, _ sdk.AccAddress) (uint64, uint64, error) { - return 0, 0, nil + return mar.ReturnAccNum, mar.ReturnAccSeq, nil } diff --git a/client/tx/factory.go b/client/tx/factory.go index e9482bc854..99195f2c21 100644 --- a/client/tx/factory.go +++ b/client/tx/factory.go @@ -430,9 +430,14 @@ func (f Factory) getSimPK() (cryptotypes.PubKey, error) { // Prepare ensures the account defined by ctx.GetFromAddress() exists and // if the account number and/or the account sequence number are zero (not set), -// they will be queried for and set on the provided Factory. A new Factory with -// the updated fields will be returned. +// they will be queried for and set on the provided Factory. +// A new Factory with the updated fields will be returned. +// Note: When in offline mode, the Prepare does nothing and returns the original factory. func (f Factory) Prepare(clientCtx client.Context) (Factory, error) { + if clientCtx.Offline { + return f, nil + } + fc := f from := clientCtx.GetFromAddress() @@ -441,14 +446,19 @@ func (f Factory) Prepare(clientCtx client.Context) (Factory, error) { } initNum, initSeq := fc.accountNumber, fc.sequence - if initNum == 0 && initSeq == 0 { + if initNum == 0 || initSeq == 0 { num, seq, err := fc.accountRetriever.GetAccountNumberSequence(clientCtx, from) if err != nil { return fc, err } - fc = fc.WithAccountNumber(num) - fc = fc.WithSequence(seq) + if initNum == 0 { + fc = fc.WithAccountNumber(num) + } + + if initSeq == 0 { + fc = fc.WithSequence(seq) + } } return fc, nil diff --git a/client/tx/factory_test.go b/client/tx/factory_test.go new file mode 100644 index 0000000000..7a8c4cc2dd --- /dev/null +++ b/client/tx/factory_test.go @@ -0,0 +1,34 @@ +package tx_test + +import ( + "testing" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/tx" + "github.com/stretchr/testify/require" +) + +func TestFactoryPrepate(t *testing.T) { + t.Parallel() + + factory := tx.Factory{} + clientCtx := client.Context{} + + output, err := factory.Prepare(clientCtx.WithOffline(true)) + require.NoError(t, err) + require.Equal(t, output, factory) + + factory = tx.Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}).WithAccountNumber(5) + output, err = factory.Prepare(clientCtx.WithFrom("foo")) + require.NoError(t, err) + require.NotEqual(t, output, factory) + require.Equal(t, output.AccountNumber(), uint64(5)) + require.Equal(t, output.Sequence(), uint64(1)) + + factory = tx.Factory{}.WithAccountRetriever(client.MockAccountRetriever{ReturnAccNum: 10, ReturnAccSeq: 1}) + output, err = factory.Prepare(clientCtx.WithFrom("foo")) + require.NoError(t, err) + require.NotEqual(t, output, factory) + require.Equal(t, output.AccountNumber(), uint64(10)) + require.Equal(t, output.Sequence(), uint64(1)) +} From fcb125a9283aa0c5582da609f6f5dbdfc6d693f8 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 14:27:59 +0000 Subject: [PATCH 06/34] chore(auth/vesting): fix typo in `create-period-vesting-account` cmd example (backport #16085) (#16086) Co-authored-by: Julien Robert --- x/auth/vesting/client/cli/tx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/auth/vesting/client/cli/tx.go b/x/auth/vesting/client/cli/tx.go index 3c88d04500..f2ef3ba67f 100644 --- a/x/auth/vesting/client/cli/tx.go +++ b/x/auth/vesting/client/cli/tx.go @@ -142,7 +142,7 @@ func NewMsgCreatePeriodicVestingAccountCmd() *cobra.Command { An array of coin strings and unix epoch times for coins to vest { "start_time": 1625204910, -"period":[ +"periods":[ { "coins": "10test", "length_seconds":2592000 //30 days From fdb9fbeba0be5e214eeaeddba7ebf5789d29478a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 18:38:09 +0200 Subject: [PATCH 07/34] fix: correct path required proto testdata (backport #14991) (#16083) Co-authored-by: Julien Robert --- CHANGELOG.md | 5 + Makefile | 2 +- baseapp/abci_test.go | 6 +- baseapp/block_gas_test.go | 2 +- baseapp/grpcrouter_test.go | 2 +- baseapp/testutil/messages.pb.go | 77 +- baseapp/testutil/messages.proto | 1 - client/context_test.go | 16 +- codec/types/types_test.go | 6 +- codec/unknownproto/unknown_fields_test.go | 6 +- codec/yaml_test.go | 6 +- simapp/app.go | 2 +- simapp/app_v2.go | 2 +- testutil/testdata/README.md | 6 + testutil/testdata/buf.gen.pulsar.yaml | 4 +- testutil/testdata/buf.gen.yaml | 3 +- testutil/testdata/codec.go | 8 +- testutil/testdata/query.pb.go | 100 +- testutil/testdata/testdata.pb.go | 102 +- .../testpb/pulsar_query.go} | 2 +- testutil/testdata/{ => testpb}/query.proto | 6 +- .../testpb}/query.pulsar.go | 482 +- .../testpb}/query_grpc.pb.go | 14 +- testutil/testdata/{ => testpb}/testdata.proto | 2 +- .../testpb}/testdata.pulsar.go | 699 +-- testutil/testdata/{ => testpb}/tx.proto | 6 +- .../testpb}/tx.pulsar.go | 272 +- .../testpb}/tx_grpc.pb.go | 10 +- .../testdata/{ => testpb}/unknonwnproto.proto | 2 +- .../testpb}/unknonwnproto.pulsar.go | 4444 ++++++++--------- testutil/testdata/tx.pb.go | 68 +- testutil/testdata/unknonwnproto.pb.go | 356 +- types/tx_msg_test.go | 4 +- x/auth/tx/encode_decode_test.go | 2 +- x/staking/types/staking.pb.go | 1348 ++--- 35 files changed, 4048 insertions(+), 4025 deletions(-) create mode 100644 testutil/testdata/README.md rename testutil/{testdata_pulsar/query.go => testdata/testpb/pulsar_query.go} (96%) rename testutil/testdata/{ => testpb}/query.proto (89%) rename testutil/{testdata_pulsar => testdata/testpb}/query.pulsar.go (86%) rename testutil/{testdata_pulsar => testdata/testpb}/query_grpc.pb.go (95%) rename testutil/testdata/{ => testpb}/testdata.proto (98%) rename testutil/{testdata_pulsar => testdata/testpb}/testdata.pulsar.go (87%) rename testutil/testdata/{ => testpb}/tx.proto (89%) rename testutil/{testdata_pulsar => testdata/testpb}/tx.pulsar.go (85%) rename testutil/{testdata_pulsar => testdata/testpb}/tx_grpc.pb.go (95%) rename testutil/testdata/{ => testpb}/unknonwnproto.proto (99%) rename testutil/{testdata_pulsar => testdata/testpb}/unknonwnproto.pulsar.go (86%) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b9f696a3..4f43850cf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (deps) [#16083](https://github.com/cosmos/cosmos-sdk/pull/16083) Bumps `proto-builder` image to 0.13.0. * (client) [#16075](https://github.com/cosmos/cosmos-sdk/pull/16075) Partly revert [#15953](https://github.com/cosmos/cosmos-sdk/issues/15953) and `factory.Prepare` now does nothing in offline mode. * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. @@ -47,6 +48,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. +### API Breaking Changes + +* (testutil) [#14991](https://github.com/cosmos/cosmos-sdk/pull/14991) The `testutil/testdata_pulsar` package has moved to `testutil/testdata/testpb`. Chains will not notice this breaking change as this package contains testing utilities only used by the SDK internally. + ## [v0.47.2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.2) - 2023-04-27 ### Improvements diff --git a/Makefile b/Makefile index 4fc8409abe..42273bb038 100644 --- a/Makefile +++ b/Makefile @@ -399,7 +399,7 @@ devdoc-update: ### Protobuf ### ############################################################################### -protoVer=0.11.6 +protoVer=0.13.0 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index 04f4198072..61f8a7d551 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -190,7 +190,7 @@ func TestABCI_GRPCQuery(t *testing.T) { resQuery := suite.baseApp.Query(abci.RequestQuery{ Data: reqBz, - Path: "/testdata.Query/SayHello", + Path: "/testpb.Query/SayHello", }) require.Equal(t, sdkerrors.ErrInvalidHeight.ABCICode(), resQuery.Code, resQuery) require.Contains(t, resQuery.Log, "TestABCI_GRPCQuery is not ready; please wait for first block") @@ -201,7 +201,7 @@ func TestABCI_GRPCQuery(t *testing.T) { reqQuery := abci.RequestQuery{ Data: reqBz, - Path: "/testdata.Query/SayHello", + Path: "/testpb.Query/SayHello", } resQuery = suite.baseApp.Query(reqQuery) @@ -1453,7 +1453,7 @@ func TestABCI_PrepareProposal_ReachedMaxBytes(t *testing.T) { Height: 1, } resPrepareProposal := suite.baseApp.PrepareProposal(reqPrepareProposal) - require.Equal(t, 10, len(resPrepareProposal.Txs)) + require.Equal(t, 11, len(resPrepareProposal.Txs)) } func TestABCI_PrepareProposal_BadEncoding(t *testing.T) { diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index ef5c090faf..009748cb68 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -166,7 +166,7 @@ func TestBaseApp_BlockGas(t *testing.T) { require.Equal(t, []byte("ok"), okValue) } // check block gas is always consumed - baseGas := uint64(51822) // baseGas is the gas consumed before tx msg + baseGas := uint64(51732) // baseGas is the gas consumed before tx msg expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas) if expGasConsumed > txtypes.MaxGasWanted { // capped by gasLimit diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index 760f3f8cf0..2e364613ff 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil/testdata" - "github.com/cosmos/cosmos-sdk/testutil/testdata_pulsar" + testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/baseapp/testutil/messages.pb.go b/baseapp/testutil/messages.pb.go index 55aa0b2daa..6ab32a7ce4 100644 --- a/baseapp/testutil/messages.pb.go +++ b/baseapp/testutil/messages.pb.go @@ -266,41 +266,40 @@ func (m *MsgCreateKeyValueResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgCreateKeyValueResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgCounter)(nil), "testdata.MsgCounter") - proto.RegisterType((*MsgCounter2)(nil), "testdata.MsgCounter2") - proto.RegisterType((*MsgCreateCounterResponse)(nil), "testdata.MsgCreateCounterResponse") - proto.RegisterType((*MsgKeyValue)(nil), "testdata.MsgKeyValue") - proto.RegisterType((*MsgCreateKeyValueResponse)(nil), "testdata.MsgCreateKeyValueResponse") + proto.RegisterType((*MsgCounter)(nil), "MsgCounter") + proto.RegisterType((*MsgCounter2)(nil), "MsgCounter2") + proto.RegisterType((*MsgCreateCounterResponse)(nil), "MsgCreateCounterResponse") + proto.RegisterType((*MsgKeyValue)(nil), "MsgKeyValue") + proto.RegisterType((*MsgCreateKeyValueResponse)(nil), "MsgCreateKeyValueResponse") } func init() { proto.RegisterFile("messages.proto", fileDescriptor_4dc296cbfe5ffcd5) } var fileDescriptor_4dc296cbfe5ffcd5 = []byte{ - // 378 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xc1, 0x8a, 0x9b, 0x50, - 0x14, 0x86, 0x63, 0xa5, 0x89, 0x3d, 0x4d, 0xdb, 0x20, 0x69, 0x31, 0x16, 0x24, 0x58, 0x28, 0xd9, - 0x44, 0xc1, 0x3e, 0x41, 0xdb, 0x45, 0x5b, 0x5a, 0x1b, 0xb0, 0xd0, 0x61, 0x66, 0x13, 0xae, 0xe6, - 0xe4, 0x46, 0xa2, 0xf7, 0x8a, 0xf7, 0x3a, 0x90, 0xb7, 0x98, 0xc7, 0x9a, 0x65, 0x96, 0xb3, 0x1c, - 0x92, 0x17, 0x19, 0xd4, 0x98, 0x30, 0xc1, 0xc5, 0x2c, 0x66, 0xe5, 0x39, 0xff, 0x0f, 0xdf, 0xcf, - 0xf9, 0xbd, 0xf0, 0x36, 0x45, 0x21, 0x08, 0x45, 0xe1, 0x64, 0x39, 0x97, 0x5c, 0xd7, 0x24, 0x0a, - 0xb9, 0x20, 0x92, 0x98, 0x43, 0xca, 0x29, 0xaf, 0x44, 0xb7, 0x9c, 0x6a, 0xdf, 0x1c, 0x51, 0xce, - 0x69, 0x82, 0x6e, 0xb5, 0x85, 0xc5, 0xd2, 0x25, 0x6c, 0x53, 0x5b, 0xf6, 0x5f, 0x00, 0x5f, 0xd0, - 0xef, 0xbc, 0x60, 0x12, 0x73, 0xdd, 0x80, 0x5e, 0x54, 0x8f, 0x86, 0x32, 0x56, 0x26, 0x6a, 0xd0, - 0xac, 0xfa, 0x67, 0x78, 0xb7, 0x24, 0x71, 0x32, 0xe7, 0x6c, 0xbe, 0x22, 0x6c, 0x91, 0x60, 0x6e, - 0xbc, 0x18, 0x2b, 0x13, 0x2d, 0x78, 0x53, 0xca, 0x33, 0xf6, 0xb3, 0x16, 0xed, 0x19, 0xbc, 0x3e, - 0xf1, 0xbc, 0x67, 0x00, 0x9a, 0x60, 0x94, 0xc0, 0x1c, 0x89, 0xc4, 0x03, 0x36, 0x40, 0x91, 0x71, - 0x26, 0xd0, 0xf6, 0xab, 0xb0, 0xdf, 0xb8, 0xf9, 0x4f, 0x92, 0x02, 0xf5, 0x01, 0xa8, 0x6b, 0xdc, - 0x54, 0x41, 0xfd, 0xa0, 0x1c, 0xf5, 0x21, 0xbc, 0xbc, 0x2e, 0xad, 0x0a, 0xdd, 0x0f, 0xea, 0x45, - 0xff, 0x00, 0x5d, 0x11, 0x53, 0x86, 0xb9, 0xa1, 0x8e, 0x95, 0xc9, 0xab, 0xe0, 0xb0, 0xd9, 0x1f, - 0x61, 0x74, 0x8c, 0x6a, 0xa0, 0x4d, 0x96, 0x77, 0x01, 0xbd, 0xa6, 0xa5, 0x3f, 0x30, 0xf8, 0xc5, - 0xa2, 0x1c, 0x53, 0x64, 0xb2, 0xd1, 0x86, 0x4e, 0xf3, 0x0f, 0x9c, 0xd3, 0xfd, 0xa6, 0xfd, 0x58, - 0x6d, 0x3b, 0xc2, 0xbb, 0x04, 0xed, 0x58, 0x97, 0xdf, 0x42, 0x7e, 0xdf, 0x46, 0xf6, 0x9e, 0x84, - 0xf6, 0x41, 0x3b, 0x96, 0xf3, 0x15, 0xd4, 0x7f, 0x28, 0xcf, 0x68, 0x8d, 0x6b, 0x7e, 0x6a, 0xa1, - 0x9d, 0x57, 0xf0, 0xed, 0xc7, 0xed, 0xce, 0x52, 0xb6, 0x3b, 0x4b, 0xb9, 0xdf, 0x59, 0xca, 0xcd, - 0xde, 0xea, 0x6c, 0xf7, 0x56, 0xe7, 0x6e, 0x6f, 0x75, 0xae, 0xa6, 0x34, 0x96, 0xab, 0x22, 0x74, - 0x22, 0x9e, 0xba, 0x11, 0x17, 0x29, 0x17, 0x87, 0xcf, 0x54, 0x2c, 0xd6, 0x6e, 0x48, 0x04, 0x92, - 0x2c, 0x73, 0xcb, 0x88, 0x42, 0xc6, 0x49, 0xd8, 0xad, 0xde, 0xde, 0x97, 0x87, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x63, 0x31, 0xab, 0xcc, 0xc8, 0x02, 0x00, 0x00, + // 364 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x4f, 0x6b, 0xe2, 0x50, + 0x14, 0xc5, 0xcd, 0x84, 0x51, 0xe7, 0xea, 0xcc, 0x48, 0x90, 0x21, 0x66, 0x20, 0x48, 0x16, 0x83, + 0x1b, 0x13, 0xc8, 0xec, 0xc6, 0xdd, 0x0c, 0x83, 0x2d, 0xc5, 0x0a, 0x29, 0x74, 0xd1, 0x8d, 0xbc, + 0xc4, 0xeb, 0x33, 0x98, 0xbc, 0x17, 0xf2, 0x5e, 0x0a, 0x7e, 0x8b, 0x7e, 0xac, 0x2e, 0x5d, 0x76, + 0x59, 0xf4, 0x8b, 0x94, 0xfc, 0xd3, 0x2e, 0x6a, 0x57, 0x5d, 0xe5, 0x9c, 0x73, 0xc9, 0xef, 0xe4, + 0x5e, 0x02, 0xdf, 0x62, 0x14, 0x82, 0x50, 0x14, 0x76, 0x92, 0x72, 0xc9, 0x8d, 0x3e, 0xe5, 0x94, + 0x17, 0xd2, 0xc9, 0x55, 0x95, 0x0e, 0x28, 0xe7, 0x34, 0x42, 0xa7, 0x70, 0x7e, 0xb6, 0x72, 0x08, + 0xdb, 0x96, 0x23, 0xeb, 0x1a, 0x60, 0x26, 0xe8, 0x3f, 0x9e, 0x31, 0x89, 0xa9, 0xa6, 0x43, 0x2b, + 0x28, 0xa5, 0xae, 0x0c, 0x95, 0x91, 0xea, 0xd5, 0x56, 0xfb, 0x05, 0xdf, 0x57, 0x24, 0x8c, 0x16, + 0x9c, 0x2d, 0xd6, 0x84, 0x2d, 0x23, 0x4c, 0xf5, 0x4f, 0x43, 0x65, 0xd4, 0xf6, 0xbe, 0xe6, 0xf1, + 0x9c, 0x5d, 0x94, 0xa1, 0x35, 0x87, 0xce, 0x89, 0xe7, 0x7e, 0x00, 0xd0, 0x00, 0x3d, 0x07, 0xa6, + 0x48, 0x24, 0x56, 0x58, 0x0f, 0x45, 0xc2, 0x99, 0x40, 0x6b, 0x56, 0x94, 0x5d, 0xe1, 0xf6, 0x96, + 0x44, 0x19, 0x6a, 0x3d, 0x50, 0x37, 0xb8, 0x2d, 0x8a, 0xba, 0x5e, 0x2e, 0xb5, 0x3e, 0x7c, 0xbe, + 0xcf, 0x47, 0x05, 0xba, 0xeb, 0x95, 0x46, 0xfb, 0x01, 0x4d, 0x11, 0x52, 0x86, 0xa9, 0xae, 0x0e, + 0x95, 0xd1, 0x17, 0xaf, 0x72, 0xd6, 0x4f, 0x18, 0x1c, 0xab, 0x6a, 0x68, 0xdd, 0xe5, 0xfe, 0x87, + 0x56, 0x7d, 0xa5, 0x3f, 0xd0, 0xbb, 0x64, 0x41, 0x8a, 0x31, 0x32, 0x59, 0x67, 0x1d, 0xfb, 0xb4, + 0xb6, 0x31, 0xb0, 0xcf, 0x7d, 0xb2, 0x3b, 0x85, 0xf6, 0xf1, 0x38, 0x93, 0x37, 0x38, 0xdd, 0x57, + 0x1c, 0xf7, 0x3d, 0xd0, 0x04, 0xda, 0xc7, 0xc5, 0x1d, 0x50, 0x6f, 0x50, 0x96, 0xef, 0xd6, 0xa1, + 0x61, 0xd8, 0x67, 0x97, 0xf9, 0x3b, 0x7d, 0xdc, 0x9b, 0xca, 0x6e, 0x6f, 0x2a, 0xcf, 0x7b, 0x53, + 0x79, 0x38, 0x98, 0x8d, 0xdd, 0xc1, 0x6c, 0x3c, 0x1d, 0xcc, 0xc6, 0xdd, 0x98, 0x86, 0x72, 0x9d, + 0xf9, 0x76, 0xc0, 0x63, 0x27, 0xe0, 0x22, 0xe6, 0xa2, 0x7a, 0x8c, 0xc5, 0x72, 0xe3, 0xf8, 0x44, + 0x20, 0x49, 0x12, 0x47, 0xa2, 0x90, 0x99, 0x0c, 0x23, 0xbf, 0x59, 0xfc, 0x45, 0xbf, 0x5f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x23, 0xdc, 0x12, 0x4d, 0x88, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -328,7 +327,7 @@ func NewCounterClient(cc grpc1.ClientConn) CounterClient { func (c *counterClient) IncrementCounter(ctx context.Context, in *MsgCounter, opts ...grpc.CallOption) (*MsgCreateCounterResponse, error) { out := new(MsgCreateCounterResponse) - err := c.cc.Invoke(ctx, "/testdata.Counter/IncrementCounter", in, out, opts...) + err := c.cc.Invoke(ctx, "/Counter/IncrementCounter", in, out, opts...) if err != nil { return nil, err } @@ -362,7 +361,7 @@ func _Counter_IncrementCounter_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Counter/IncrementCounter", + FullMethod: "/Counter/IncrementCounter", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CounterServer).IncrementCounter(ctx, req.(*MsgCounter)) @@ -371,7 +370,7 @@ func _Counter_IncrementCounter_Handler(srv interface{}, ctx context.Context, dec } var _Counter_serviceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Counter", + ServiceName: "Counter", HandlerType: (*CounterServer)(nil), Methods: []grpc.MethodDesc{ { @@ -400,7 +399,7 @@ func NewCounter2Client(cc grpc1.ClientConn) Counter2Client { func (c *counter2Client) IncrementCounter(ctx context.Context, in *MsgCounter2, opts ...grpc.CallOption) (*MsgCreateCounterResponse, error) { out := new(MsgCreateCounterResponse) - err := c.cc.Invoke(ctx, "/testdata.Counter2/IncrementCounter", in, out, opts...) + err := c.cc.Invoke(ctx, "/Counter2/IncrementCounter", in, out, opts...) if err != nil { return nil, err } @@ -434,7 +433,7 @@ func _Counter2_IncrementCounter_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Counter2/IncrementCounter", + FullMethod: "/Counter2/IncrementCounter", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(Counter2Server).IncrementCounter(ctx, req.(*MsgCounter2)) @@ -443,7 +442,7 @@ func _Counter2_IncrementCounter_Handler(srv interface{}, ctx context.Context, de } var _Counter2_serviceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Counter2", + ServiceName: "Counter2", HandlerType: (*Counter2Server)(nil), Methods: []grpc.MethodDesc{ { @@ -472,7 +471,7 @@ func NewKeyValueClient(cc grpc1.ClientConn) KeyValueClient { func (c *keyValueClient) Set(ctx context.Context, in *MsgKeyValue, opts ...grpc.CallOption) (*MsgCreateKeyValueResponse, error) { out := new(MsgCreateKeyValueResponse) - err := c.cc.Invoke(ctx, "/testdata.KeyValue/Set", in, out, opts...) + err := c.cc.Invoke(ctx, "/KeyValue/Set", in, out, opts...) if err != nil { return nil, err } @@ -506,7 +505,7 @@ func _KeyValue_Set_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.KeyValue/Set", + FullMethod: "/KeyValue/Set", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(KeyValueServer).Set(ctx, req.(*MsgKeyValue)) @@ -515,7 +514,7 @@ func _KeyValue_Set_Handler(srv interface{}, ctx context.Context, dec func(interf } var _KeyValue_serviceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.KeyValue", + ServiceName: "KeyValue", HandlerType: (*KeyValueServer)(nil), Methods: []grpc.MethodDesc{ { diff --git a/baseapp/testutil/messages.proto b/baseapp/testutil/messages.proto index 866e336669..6a04a94e5c 100644 --- a/baseapp/testutil/messages.proto +++ b/baseapp/testutil/messages.proto @@ -1,5 +1,4 @@ syntax = "proto3"; -package testdata; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; diff --git a/client/context_test.go b/client/context_test.go index 0af1ccc6bd..433c783f26 100644 --- a/client/context_test.go +++ b/client/context_test.go @@ -50,7 +50,7 @@ func TestContext_PrintProto(t *testing.T) { err = ctx.PrintProto(hasAnimal) require.NoError(t, err) require.Equal(t, - `{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"} + `{"animal":{"@type":"/testpb.Dog","size":"big","name":"Spot"},"x":"10"} `, buf.String()) // yaml @@ -61,7 +61,7 @@ func TestContext_PrintProto(t *testing.T) { require.NoError(t, err) require.Equal(t, `animal: - '@type': /testdata.Dog + '@type': /testpb.Dog name: Spot size: big x: "10" @@ -93,7 +93,7 @@ func TestContext_PrintObjectLegacy(t *testing.T) { err = ctx.PrintObjectLegacy(hasAnimal) require.NoError(t, err) require.Equal(t, - `{"type":"testdata/HasAnimal","value":{"animal":{"type":"testdata/Dog","value":{"size":"big","name":"Spot"}},"x":"10"}} + `{"type":"testpb/HasAnimal","value":{"animal":{"type":"testpb/Dog","value":{"size":"big","name":"Spot"}},"x":"10"}} `, buf.String()) // yaml @@ -103,10 +103,10 @@ func TestContext_PrintObjectLegacy(t *testing.T) { err = ctx.PrintObjectLegacy(hasAnimal) require.NoError(t, err) require.Equal(t, - `type: testdata/HasAnimal + `type: testpb/HasAnimal value: animal: - type: testdata/Dog + type: testpb/Dog value: name: Spot size: big @@ -116,7 +116,7 @@ value: func TestContext_PrintRaw(t *testing.T) { ctx := client.Context{} - hasAnimal := json.RawMessage(`{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"}`) + hasAnimal := json.RawMessage(`{"animal":{"@type":"/testpb.Dog","size":"big","name":"Spot"},"x":"10"}`) // json buf := &bytes.Buffer{} @@ -125,7 +125,7 @@ func TestContext_PrintRaw(t *testing.T) { err := ctx.PrintRaw(hasAnimal) require.NoError(t, err) require.Equal(t, - `{"animal":{"@type":"/testdata.Dog","size":"big","name":"Spot"},"x":"10"} + `{"animal":{"@type":"/testpb.Dog","size":"big","name":"Spot"},"x":"10"} `, buf.String()) // yaml @@ -136,7 +136,7 @@ func TestContext_PrintRaw(t *testing.T) { require.NoError(t, err) require.Equal(t, `animal: - '@type': /testdata.Dog + '@type': /testpb.Dog name: Spot size: big x: "10" diff --git a/codec/types/types_test.go b/codec/types/types_test.go index 3ae4a951a5..dddacfe18b 100644 --- a/codec/types/types_test.go +++ b/codec/types/types_test.go @@ -80,7 +80,7 @@ func TestRegister(t *testing.T) { // Duplicate registration with different concrete type on same typeURL. require.PanicsWithError( t, - "concrete type *testdata.Dog has already been registered under typeURL /testdata.Dog, cannot register *types_test.FakeDog under same typeURL. "+ + "concrete type *testdata.Dog has already been registered under typeURL /testpb.Dog, cannot register *types_test.FakeDog under same typeURL. "+ "This usually means that there are conflicting modules registering different concrete types for a same interface implementation", func() { registry.RegisterImplementations((*testdata.Animal)(nil), &FakeDog{}) @@ -151,7 +151,7 @@ func TestAny_ProtoJSON(t *testing.T) { jm := &jsonpb.Marshaler{} json, err := jm.MarshalToString(any) require.NoError(t, err) - require.Equal(t, "{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}", json) + require.Equal(t, "{\"@type\":\"/testpb.Dog\",\"name\":\"Spot\"}", json) registry := testdata.NewTestInterfaceRegistry() jum := &jsonpb.Unmarshaler{} @@ -170,7 +170,7 @@ func TestAny_ProtoJSON(t *testing.T) { require.NoError(t, err) json, err = jm.MarshalToString(ha) require.NoError(t, err) - require.Equal(t, "{\"animal\":{\"@type\":\"/testdata.Dog\",\"name\":\"Spot\"}}", json) + require.Equal(t, "{\"animal\":{\"@type\":\"/testpb.Dog\",\"name\":\"Spot\"}}", json) require.NoError(t, err) var ha2 testdata.HasAnimal diff --git a/codec/unknownproto/unknown_fields_test.go b/codec/unknownproto/unknown_fields_test.go index 5a93c311b9..7e0af479ad 100644 --- a/codec/unknownproto/unknown_fields_test.go +++ b/codec/unknownproto/unknown_fields_test.go @@ -389,7 +389,7 @@ func TestRejectUnknownFieldsNested(t *testing.T) { name: "unknown field types.Any in G", in: &testdata.TestVersion3{ G: &types.Any{ - TypeUrl: "/testdata.TestVersion1", + TypeUrl: "/testpb.TestVersion1", Value: mustMarshal(&testdata.TestVersion2{ Sum: &testdata.TestVersion2_F{ F: &testdata.TestVersion2{ @@ -410,7 +410,7 @@ func TestRejectUnknownFieldsNested(t *testing.T) { in: &testdata.TestVersionFD1WithExtraAny{ G: &testdata.AnyWithExtra{ Any: &types.Any{ - TypeUrl: "/testdata.TestVersion1", + TypeUrl: "/testpb.TestVersion1", Value: mustMarshal(&testdata.TestVersion2{ Sum: &testdata.TestVersion2_F{ F: &testdata.TestVersion2{ @@ -434,7 +434,7 @@ func TestRejectUnknownFieldsNested(t *testing.T) { name: "mismatched types.Any in G", in: &testdata.TestVersion1{ G: &types.Any{ - TypeUrl: "/testdata.TestVersion4LoneNesting", + TypeUrl: "/testpb.TestVersion4LoneNesting", Value: mustMarshal(&testdata.TestVersion3LoneNesting_Inner1{ Inner: &testdata.TestVersion3LoneNesting_Inner1_InnerInner{ Id: "ID", diff --git a/codec/yaml_test.go b/codec/yaml_test.go index e9206a74a3..8601f35b0c 100644 --- a/codec/yaml_test.go +++ b/codec/yaml_test.go @@ -28,7 +28,7 @@ func TestMarshalYAML(t *testing.T) { bz, err := codec.MarshalYAML(protoCdc, hasAnimal) require.NoError(t, err) require.Equal(t, `animal: - '@type': /testdata.Dog + '@type': /testpb.Dog name: Spot size: small x: "0" @@ -38,10 +38,10 @@ x: "0" aminoCdc := codec.NewAminoCodec(&codec.LegacyAmino{testdata.NewTestAmino()}) bz, err = codec.MarshalYAML(aminoCdc, hasAnimal) require.NoError(t, err) - require.Equal(t, `type: testdata/HasAnimal + require.Equal(t, `type: testpb/HasAnimal value: animal: - type: testdata/Dog + type: testpb/Dog value: name: Spot size: small diff --git a/simapp/app.go b/simapp/app.go index 8f36bc694d..078bda0193 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -33,7 +33,7 @@ import ( "github.com/cosmos/cosmos-sdk/std" "github.com/cosmos/cosmos-sdk/store/streaming" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata_pulsar" + testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/version" diff --git a/simapp/app_v2.go b/simapp/app_v2.go index c5c1ddad76..57a498ac25 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -24,7 +24,7 @@ import ( servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/store/streaming" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata_pulsar" + testdata_pulsar "github.com/cosmos/cosmos-sdk/testutil/testdata/testpb" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" diff --git a/testutil/testdata/README.md b/testutil/testdata/README.md new file mode 100644 index 0000000000..86a2726aa4 --- /dev/null +++ b/testutil/testdata/README.md @@ -0,0 +1,6 @@ +# testdata + +The testdata directory contains gogo and pulsar generated code: + +* `testdata/*.go` : gogo +* `testdata/testpb/*.go`: pulsar diff --git a/testutil/testdata/buf.gen.pulsar.yaml b/testutil/testdata/buf.gen.pulsar.yaml index fbfec36e76..6cb4f02a9b 100644 --- a/testutil/testdata/buf.gen.pulsar.yaml +++ b/testutil/testdata/buf.gen.pulsar.yaml @@ -11,8 +11,8 @@ managed: buf.build/cosmos/cosmos-sdk: cosmossdk.io/api plugins: - name: go-pulsar - out: ../testdata_pulsar + out: . opt: paths=source_relative - name: go-grpc - out: ../testdata_pulsar + out: . opt: paths=source_relative diff --git a/testutil/testdata/buf.gen.yaml b/testutil/testdata/buf.gen.yaml index d7d17bbb26..5a8136666e 100644 --- a/testutil/testdata/buf.gen.yaml +++ b/testutil/testdata/buf.gen.yaml @@ -2,4 +2,5 @@ version: v1 plugins: - name: gocosmos out: ../.. - opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types + opt: + - plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types diff --git a/testutil/testdata/codec.go b/testutil/testdata/codec.go index 2f3aecb986..eb2424c40f 100644 --- a/testutil/testdata/codec.go +++ b/testutil/testdata/codec.go @@ -43,14 +43,14 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { func NewTestAmino() *amino.Codec { cdc := amino.NewCodec() cdc.RegisterInterface((*Animal)(nil), nil) - cdc.RegisterConcrete(&Dog{}, "testdata/Dog", nil) - cdc.RegisterConcrete(&Cat{}, "testdata/Cat", nil) + cdc.RegisterConcrete(&Dog{}, "testpb/Dog", nil) + cdc.RegisterConcrete(&Cat{}, "testpb/Cat", nil) cdc.RegisterInterface((*HasAnimalI)(nil), nil) - cdc.RegisterConcrete(&HasAnimal{}, "testdata/HasAnimal", nil) + cdc.RegisterConcrete(&HasAnimal{}, "testpb/HasAnimal", nil) cdc.RegisterInterface((*HasHasAnimalI)(nil), nil) - cdc.RegisterConcrete(&HasHasAnimal{}, "testdata/HasHasAnimal", nil) + cdc.RegisterConcrete(&HasHasAnimal{}, "testpb/HasHasAnimal", nil) return cdc } diff --git a/testutil/testdata/query.pb.go b/testutil/testdata/query.pb.go index 2127724e24..d104840c5d 100644 --- a/testutil/testdata/query.pb.go +++ b/testutil/testdata/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: query.proto +// source: testpb/query.proto package testdata @@ -36,7 +36,7 @@ func (m *EchoRequest) Reset() { *m = EchoRequest{} } func (m *EchoRequest) String() string { return proto.CompactTextString(m) } func (*EchoRequest) ProtoMessage() {} func (*EchoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{0} + return fileDescriptor_b00998f1336963e3, []int{0} } func (m *EchoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -80,7 +80,7 @@ func (m *EchoResponse) Reset() { *m = EchoResponse{} } func (m *EchoResponse) String() string { return proto.CompactTextString(m) } func (*EchoResponse) ProtoMessage() {} func (*EchoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{1} + return fileDescriptor_b00998f1336963e3, []int{1} } func (m *EchoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,7 +124,7 @@ func (m *SayHelloRequest) Reset() { *m = SayHelloRequest{} } func (m *SayHelloRequest) String() string { return proto.CompactTextString(m) } func (*SayHelloRequest) ProtoMessage() {} func (*SayHelloRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{2} + return fileDescriptor_b00998f1336963e3, []int{2} } func (m *SayHelloRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -168,7 +168,7 @@ func (m *SayHelloResponse) Reset() { *m = SayHelloResponse{} } func (m *SayHelloResponse) String() string { return proto.CompactTextString(m) } func (*SayHelloResponse) ProtoMessage() {} func (*SayHelloResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{3} + return fileDescriptor_b00998f1336963e3, []int{3} } func (m *SayHelloResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -212,7 +212,7 @@ func (m *TestAnyRequest) Reset() { *m = TestAnyRequest{} } func (m *TestAnyRequest) String() string { return proto.CompactTextString(m) } func (*TestAnyRequest) ProtoMessage() {} func (*TestAnyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{4} + return fileDescriptor_b00998f1336963e3, []int{4} } func (m *TestAnyRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -256,7 +256,7 @@ func (m *TestAnyResponse) Reset() { *m = TestAnyResponse{} } func (m *TestAnyResponse) String() string { return proto.CompactTextString(m) } func (*TestAnyResponse) ProtoMessage() {} func (*TestAnyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5c6ac9b241082464, []int{5} + return fileDescriptor_b00998f1336963e3, []int{5} } func (m *TestAnyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -293,41 +293,41 @@ func (m *TestAnyResponse) GetHasAnimal() *HasAnimal { } func init() { - proto.RegisterType((*EchoRequest)(nil), "testdata.EchoRequest") - proto.RegisterType((*EchoResponse)(nil), "testdata.EchoResponse") - proto.RegisterType((*SayHelloRequest)(nil), "testdata.SayHelloRequest") - proto.RegisterType((*SayHelloResponse)(nil), "testdata.SayHelloResponse") - proto.RegisterType((*TestAnyRequest)(nil), "testdata.TestAnyRequest") - proto.RegisterType((*TestAnyResponse)(nil), "testdata.TestAnyResponse") -} - -func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } - -var fileDescriptor_5c6ac9b241082464 = []byte{ - // 359 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4f, 0xc2, 0x30, - 0x14, 0xc7, 0x59, 0x82, 0x02, 0x0f, 0x03, 0xa6, 0xfe, 0x08, 0xf4, 0xb0, 0x98, 0x25, 0x46, 0x2e, - 0x76, 0x09, 0xc4, 0xab, 0x09, 0x26, 0x24, 0x5c, 0x45, 0x4f, 0x5e, 0x4c, 0x81, 0xba, 0x2d, 0x6e, - 0x2d, 0xd0, 0xee, 0xb0, 0xff, 0xc2, 0x7f, 0xc9, 0x9b, 0x47, 0x8e, 0x1e, 0x0d, 0xfc, 0x23, 0x66, - 0x5b, 0xbb, 0x09, 0x21, 0x9e, 0xda, 0xd7, 0x7e, 0xde, 0xe7, 0xe5, 0x7d, 0xa1, 0xb9, 0x8c, 0xd9, - 0x2a, 0x21, 0x8b, 0x95, 0x50, 0x02, 0xd5, 0x15, 0x93, 0x6a, 0x4e, 0x15, 0xc5, 0x5d, 0x4f, 0x08, - 0x2f, 0x64, 0x6e, 0xf6, 0x3e, 0x8d, 0xdf, 0x5c, 0xca, 0x35, 0x84, 0x5b, 0x06, 0xca, 0x6b, 0xe7, - 0x06, 0x9a, 0xa3, 0x99, 0x2f, 0x26, 0x6c, 0x19, 0x33, 0xa9, 0x50, 0x07, 0x6a, 0x11, 0x93, 0x92, - 0x7a, 0xac, 0x63, 0x5d, 0x59, 0xbd, 0xc6, 0xc4, 0x94, 0x4e, 0x0f, 0x4e, 0x72, 0x50, 0x2e, 0x04, - 0x97, 0xec, 0x1f, 0xf2, 0x1a, 0xda, 0x4f, 0x34, 0x19, 0xb3, 0x30, 0x2c, 0xb4, 0x08, 0xaa, 0x9c, - 0x46, 0x86, 0xcc, 0xee, 0x0e, 0x81, 0xd3, 0x12, 0xd3, 0x52, 0x0c, 0x75, 0x6f, 0xc5, 0x98, 0x0a, - 0xb8, 0xa7, 0xd9, 0xa2, 0x76, 0x46, 0xd0, 0x7a, 0x66, 0x52, 0x0d, 0x79, 0x62, 0xac, 0x03, 0x00, - 0xca, 0x93, 0x57, 0xca, 0x83, 0x88, 0x86, 0x19, 0xdf, 0xec, 0x9f, 0x93, 0x7c, 0x77, 0x62, 0x76, - 0x27, 0x69, 0x43, 0x83, 0xf2, 0x64, 0x98, 0x61, 0xce, 0x08, 0xda, 0x85, 0x46, 0x4f, 0xed, 0x03, - 0xf8, 0x54, 0xee, 0x7a, 0xce, 0x48, 0x11, 0xd4, 0x98, 0xca, 0xbc, 0x77, 0xd2, 0xf0, 0xcd, 0xb5, - 0xff, 0x69, 0xc1, 0xd1, 0x63, 0x1a, 0x3e, 0xba, 0x83, 0x6a, 0x1a, 0x0c, 0xba, 0x28, 0x3b, 0xfe, - 0x24, 0x8a, 0x2f, 0xf7, 0x9f, 0xf5, 0xd0, 0x21, 0xd4, 0xcd, 0xfa, 0xa8, 0x5b, 0x32, 0x7b, 0xc9, - 0x61, 0x7c, 0xe8, 0x4b, 0x2b, 0xee, 0xa1, 0xa6, 0x57, 0x41, 0x9d, 0x12, 0xdb, 0x0d, 0x09, 0x77, - 0x0f, 0xfc, 0xe4, 0xfd, 0x0f, 0xe3, 0xaf, 0x8d, 0x6d, 0xad, 0x37, 0xb6, 0xf5, 0xb3, 0xb1, 0xad, - 0x8f, 0xad, 0x5d, 0x59, 0x6f, 0xed, 0xca, 0xf7, 0xd6, 0xae, 0xbc, 0x10, 0x2f, 0x50, 0x7e, 0x3c, - 0x25, 0x33, 0x11, 0xb9, 0x33, 0x21, 0x23, 0x21, 0xf5, 0x71, 0x2b, 0xe7, 0xef, 0x6e, 0x2a, 0x8c, - 0x55, 0x10, 0xba, 0xc6, 0x3c, 0x3d, 0xce, 0xd2, 0x1e, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe8, - 0xb4, 0x42, 0x4e, 0x90, 0x02, 0x00, 0x00, + proto.RegisterType((*EchoRequest)(nil), "testpb.EchoRequest") + proto.RegisterType((*EchoResponse)(nil), "testpb.EchoResponse") + proto.RegisterType((*SayHelloRequest)(nil), "testpb.SayHelloRequest") + proto.RegisterType((*SayHelloResponse)(nil), "testpb.SayHelloResponse") + proto.RegisterType((*TestAnyRequest)(nil), "testpb.TestAnyRequest") + proto.RegisterType((*TestAnyResponse)(nil), "testpb.TestAnyResponse") +} + +func init() { proto.RegisterFile("testpb/query.proto", fileDescriptor_b00998f1336963e3) } + +var fileDescriptor_b00998f1336963e3 = []byte{ + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4f, 0x4f, 0xc2, 0x30, + 0x18, 0xc6, 0x59, 0x82, 0xfc, 0x79, 0x31, 0xa2, 0x15, 0x05, 0x77, 0x58, 0xcc, 0x12, 0x23, 0x17, + 0x3b, 0x85, 0x9b, 0x89, 0x07, 0x34, 0x24, 0x5c, 0x45, 0x4f, 0x5e, 0x4c, 0x07, 0x75, 0x5b, 0xdc, + 0x5a, 0xa0, 0xdd, 0x61, 0xdf, 0xc2, 0x2f, 0xe3, 0x77, 0xf0, 0xc8, 0xd1, 0xa3, 0x81, 0x2f, 0x62, + 0xb6, 0xb5, 0x53, 0x24, 0xf1, 0xd4, 0xf6, 0xe9, 0xef, 0x79, 0x9a, 0x3e, 0x79, 0x01, 0x49, 0x2a, + 0xe4, 0xcc, 0x75, 0xe6, 0x31, 0x5d, 0x24, 0x78, 0xb6, 0xe0, 0x92, 0xa3, 0x4a, 0xae, 0x99, 0x27, + 0x1e, 0xe7, 0x5e, 0x48, 0x9d, 0x4c, 0x75, 0xe3, 0x17, 0x87, 0x30, 0x85, 0x98, 0x47, 0xca, 0x96, + 0x2e, 0x53, 0x22, 0x49, 0x2e, 0xdb, 0xe7, 0xd0, 0x18, 0x4e, 0x7c, 0x3e, 0xa6, 0xf3, 0x98, 0x0a, + 0x89, 0x3a, 0x50, 0x8d, 0xa8, 0x10, 0xc4, 0xa3, 0x1d, 0xe3, 0xd4, 0xe8, 0xd6, 0xc7, 0xfa, 0x68, + 0x77, 0x61, 0x37, 0x07, 0xc5, 0x8c, 0x33, 0x41, 0xff, 0x21, 0xcf, 0xa0, 0xf9, 0x40, 0x92, 0x11, + 0x0d, 0xc3, 0x22, 0x16, 0x41, 0x99, 0x91, 0x48, 0x93, 0xd9, 0xde, 0xc6, 0xb0, 0xff, 0x83, 0xa9, + 0x50, 0x13, 0x6a, 0xde, 0x82, 0x52, 0x19, 0x30, 0x4f, 0xb1, 0xc5, 0xd9, 0x1e, 0xc2, 0xde, 0x23, + 0x15, 0x72, 0xc0, 0x12, 0x9d, 0xda, 0x07, 0x20, 0x2c, 0x79, 0x26, 0x2c, 0x88, 0x48, 0x98, 0xf1, + 0x8d, 0x5e, 0x0b, 0xe7, 0x15, 0x60, 0x5d, 0x01, 0x4e, 0x0d, 0x75, 0xc2, 0x92, 0x41, 0x86, 0xd9, + 0x77, 0xd0, 0x2c, 0x62, 0xd4, 0xab, 0x97, 0x00, 0x3e, 0x11, 0x9b, 0x39, 0x07, 0x38, 0xef, 0x0b, + 0x8f, 0x88, 0xc8, 0x9d, 0xe3, 0xba, 0xaf, 0xb7, 0xbd, 0x77, 0x03, 0x76, 0xee, 0xd3, 0xfe, 0xd1, + 0x15, 0x94, 0xd3, 0x5a, 0xd0, 0xa1, 0xe6, 0x7f, 0xb5, 0x69, 0xb6, 0x36, 0x45, 0xf5, 0xdc, 0x0d, + 0xd4, 0xf4, 0xc7, 0x51, 0x5b, 0x13, 0x7f, 0x1a, 0x33, 0x3b, 0xdb, 0x17, 0xca, 0x7e, 0x0d, 0x55, + 0xf5, 0x01, 0x74, 0xac, 0xa1, 0xcd, 0x62, 0xcc, 0xf6, 0x96, 0x9e, 0x7b, 0x6f, 0x47, 0x1f, 0x2b, + 0xcb, 0x58, 0xae, 0x2c, 0xe3, 0x6b, 0x65, 0x19, 0x6f, 0x6b, 0xab, 0xb4, 0x5c, 0x5b, 0xa5, 0xcf, + 0xb5, 0x55, 0x7a, 0xc2, 0x5e, 0x20, 0xfd, 0xd8, 0xc5, 0x13, 0x1e, 0x39, 0x13, 0x2e, 0x22, 0x2e, + 0xd4, 0x72, 0x21, 0xa6, 0xaf, 0xd9, 0xd0, 0xc4, 0x32, 0x08, 0x8b, 0xe9, 0x71, 0x2b, 0x59, 0xbf, + 0xfd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x8d, 0x9a, 0xee, 0x8e, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -357,7 +357,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Echo(ctx context.Context, in *EchoRequest, opts ...grpc.CallOption) (*EchoResponse, error) { out := new(EchoResponse) - err := c.cc.Invoke(ctx, "/testdata.Query/Echo", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.Query/Echo", in, out, opts...) if err != nil { return nil, err } @@ -366,7 +366,7 @@ func (c *queryClient) Echo(ctx context.Context, in *EchoRequest, opts ...grpc.Ca func (c *queryClient) SayHello(ctx context.Context, in *SayHelloRequest, opts ...grpc.CallOption) (*SayHelloResponse, error) { out := new(SayHelloResponse) - err := c.cc.Invoke(ctx, "/testdata.Query/SayHello", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.Query/SayHello", in, out, opts...) if err != nil { return nil, err } @@ -375,7 +375,7 @@ func (c *queryClient) SayHello(ctx context.Context, in *SayHelloRequest, opts .. func (c *queryClient) TestAny(ctx context.Context, in *TestAnyRequest, opts ...grpc.CallOption) (*TestAnyResponse, error) { out := new(TestAnyResponse) - err := c.cc.Invoke(ctx, "/testdata.Query/TestAny", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.Query/TestAny", in, out, opts...) if err != nil { return nil, err } @@ -417,7 +417,7 @@ func _Query_Echo_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Query/Echo", + FullMethod: "/testpb.Query/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Echo(ctx, req.(*EchoRequest)) @@ -435,7 +435,7 @@ func _Query_SayHello_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Query/SayHello", + FullMethod: "/testpb.Query/SayHello", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).SayHello(ctx, req.(*SayHelloRequest)) @@ -453,7 +453,7 @@ func _Query_TestAny_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Query/TestAny", + FullMethod: "/testpb.Query/TestAny", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).TestAny(ctx, req.(*TestAnyRequest)) @@ -462,7 +462,7 @@ func _Query_TestAny_Handler(srv interface{}, ctx context.Context, dec func(inter } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Query", + ServiceName: "testpb.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -479,7 +479,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "query.proto", + Metadata: "testpb/query.proto", } func (m *EchoRequest) Marshal() (dAtA []byte, err error) { diff --git a/testutil/testdata/testdata.pb.go b/testutil/testdata/testdata.pb.go index b84568c40d..3db89888b0 100644 --- a/testutil/testdata/testdata.pb.go +++ b/testutil/testdata/testdata.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: testdata.proto +// source: testpb/testdata.proto package testdata @@ -33,7 +33,7 @@ func (m *Dog) Reset() { *m = Dog{} } func (m *Dog) String() string { return proto.CompactTextString(m) } func (*Dog) ProtoMessage() {} func (*Dog) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{0} + return fileDescriptor_bc244d00904a39a7, []int{0} } func (m *Dog) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,7 +85,7 @@ func (m *Cat) Reset() { *m = Cat{} } func (m *Cat) String() string { return proto.CompactTextString(m) } func (*Cat) ProtoMessage() {} func (*Cat) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{1} + return fileDescriptor_bc244d00904a39a7, []int{1} } func (m *Cat) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -137,7 +137,7 @@ func (m *Bird) Reset() { *m = Bird{} } func (m *Bird) String() string { return proto.CompactTextString(m) } func (*Bird) ProtoMessage() {} func (*Bird) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{2} + return fileDescriptor_bc244d00904a39a7, []int{2} } func (m *Bird) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,7 +189,7 @@ func (m *HasAnimal) Reset() { *m = HasAnimal{} } func (m *HasAnimal) String() string { return proto.CompactTextString(m) } func (*HasAnimal) ProtoMessage() {} func (*HasAnimal) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{3} + return fileDescriptor_bc244d00904a39a7, []int{3} } func (m *HasAnimal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -240,7 +240,7 @@ func (m *HasHasAnimal) Reset() { *m = HasHasAnimal{} } func (m *HasHasAnimal) String() string { return proto.CompactTextString(m) } func (*HasHasAnimal) ProtoMessage() {} func (*HasHasAnimal) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{4} + return fileDescriptor_bc244d00904a39a7, []int{4} } func (m *HasHasAnimal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -284,7 +284,7 @@ func (m *HasHasHasAnimal) Reset() { *m = HasHasHasAnimal{} } func (m *HasHasHasAnimal) String() string { return proto.CompactTextString(m) } func (*HasHasHasAnimal) ProtoMessage() {} func (*HasHasHasAnimal) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{5} + return fileDescriptor_bc244d00904a39a7, []int{5} } func (m *HasHasHasAnimal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -331,7 +331,7 @@ func (m *BadMultiSignature) Reset() { *m = BadMultiSignature{} } func (m *BadMultiSignature) String() string { return proto.CompactTextString(m) } func (*BadMultiSignature) ProtoMessage() {} func (*BadMultiSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{6} + return fileDescriptor_bc244d00904a39a7, []int{6} } func (m *BadMultiSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -385,7 +385,7 @@ func (m *TableModel) Reset() { *m = TableModel{} } func (m *TableModel) String() string { return proto.CompactTextString(m) } func (*TableModel) ProtoMessage() {} func (*TableModel) Descriptor() ([]byte, []int) { - return fileDescriptor_40c4782d007dfce9, []int{7} + return fileDescriptor_bc244d00904a39a7, []int{7} } func (m *TableModel) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -443,48 +443,48 @@ func (m *TableModel) GetMetadata() []byte { } func init() { - proto.RegisterType((*Dog)(nil), "testdata.Dog") - proto.RegisterType((*Cat)(nil), "testdata.Cat") - proto.RegisterType((*Bird)(nil), "testdata.Bird") - proto.RegisterType((*HasAnimal)(nil), "testdata.HasAnimal") - proto.RegisterType((*HasHasAnimal)(nil), "testdata.HasHasAnimal") - proto.RegisterType((*HasHasHasAnimal)(nil), "testdata.HasHasHasAnimal") - proto.RegisterType((*BadMultiSignature)(nil), "testdata.BadMultiSignature") - proto.RegisterType((*TableModel)(nil), "testdata.TableModel") -} - -func init() { proto.RegisterFile("testdata.proto", fileDescriptor_40c4782d007dfce9) } - -var fileDescriptor_40c4782d007dfce9 = []byte{ - // 443 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6e, 0xd3, 0x30, - 0x1c, 0xc6, 0xeb, 0x26, 0x2d, 0xeb, 0x9f, 0xa8, 0x13, 0x56, 0x85, 0x42, 0x0f, 0x61, 0xca, 0x85, - 0x1e, 0x58, 0x22, 0x31, 0xc1, 0x61, 0xb7, 0x75, 0x08, 0x7a, 0xe9, 0x25, 0x70, 0xe2, 0x32, 0x39, - 0xb1, 0x97, 0x5a, 0x73, 0xe2, 0x29, 0x76, 0xd0, 0xc6, 0x53, 0xf0, 0x0a, 0xbc, 0x0d, 0xc7, 0x1e, - 0x39, 0xa2, 0xf6, 0x45, 0x90, 0x9d, 0x78, 0xdb, 0x81, 0x43, 0x4f, 0xf9, 0xbe, 0xcf, 0xfe, 0x7d, - 0x89, 0x9d, 0x3f, 0x4c, 0x35, 0x53, 0x9a, 0x12, 0x4d, 0x92, 0xdb, 0x46, 0x6a, 0x89, 0x8f, 0x9c, - 0x9f, 0xcf, 0x4a, 0x59, 0x4a, 0x1b, 0xa6, 0x46, 0x75, 0xeb, 0xf3, 0x57, 0xa5, 0x94, 0xa5, 0x60, - 0xa9, 0x75, 0x79, 0x7b, 0x9d, 0x92, 0xfa, 0xbe, 0x5b, 0x8a, 0x4f, 0xc1, 0xfb, 0x28, 0x4b, 0x8c, - 0xc1, 0x57, 0xfc, 0x07, 0x0b, 0xd1, 0x09, 0x5a, 0x4c, 0x32, 0xab, 0x4d, 0x56, 0x93, 0x8a, 0x85, - 0xc3, 0x2e, 0x33, 0x3a, 0x7e, 0x0f, 0xde, 0x25, 0xd1, 0x38, 0x84, 0x67, 0x95, 0xac, 0xf9, 0x0d, - 0x6b, 0x7a, 0xc2, 0x59, 0x3c, 0x83, 0x91, 0xe0, 0xdf, 0x99, 0xb2, 0xd4, 0x28, 0xeb, 0x4c, 0xfc, - 0x01, 0xfc, 0x25, 0x6f, 0xa8, 0xe1, 0xd4, 0x2d, 0x2b, 0x38, 0x53, 0x8e, 0xeb, 0xad, 0xe1, 0x0a, - 0x29, 0x64, 0xe3, 0x38, 0x6b, 0xe2, 0xcf, 0x30, 0x59, 0x11, 0x75, 0x51, 0xf3, 0x8a, 0x08, 0xfc, - 0x16, 0xc6, 0xc4, 0x2a, 0xcb, 0x3e, 0x7f, 0x37, 0x4b, 0xba, 0x63, 0x25, 0xee, 0x58, 0xc9, 0x45, - 0x7d, 0x9f, 0xf5, 0x7b, 0x70, 0x00, 0xe8, 0xce, 0x96, 0x79, 0x19, 0xba, 0x8b, 0x2f, 0x21, 0x58, - 0x11, 0xf5, 0xd8, 0x75, 0x06, 0xb0, 0x21, 0xea, 0xea, 0x80, 0xbe, 0xc9, 0xc6, 0x41, 0xf1, 0x1a, - 0x8e, 0xbb, 0x92, 0xc7, 0x9e, 0x73, 0x98, 0x9a, 0x9e, 0x03, 0xbb, 0x82, 0xcd, 0x13, 0x36, 0xce, - 0xe1, 0xc5, 0x92, 0xd0, 0x75, 0x2b, 0x34, 0xff, 0xc2, 0xcb, 0x9a, 0xe8, 0xb6, 0x61, 0x38, 0x02, - 0x50, 0xce, 0x98, 0x4b, 0xf2, 0x16, 0x41, 0xf6, 0x24, 0xc1, 0x6f, 0xe0, 0xb8, 0x22, 0x82, 0x17, - 0x5c, 0xb6, 0xea, 0xea, 0x9a, 0x33, 0x41, 0xc3, 0xd1, 0x09, 0x5a, 0x04, 0xd9, 0xf4, 0x21, 0xfe, - 0x64, 0xd2, 0x73, 0x7f, 0xfb, 0xeb, 0x35, 0x8a, 0x29, 0xc0, 0x57, 0x92, 0x0b, 0xb6, 0x96, 0x94, - 0x09, 0x3c, 0x85, 0x21, 0xa7, 0xf6, 0x0b, 0xfd, 0x6c, 0xc8, 0xe9, 0xff, 0xfe, 0x30, 0x7e, 0x09, - 0xe3, 0xba, 0xad, 0x72, 0xd6, 0x84, 0x9e, 0xdd, 0xd7, 0x3b, 0x3c, 0x87, 0xa3, 0x8a, 0x69, 0x62, - 0xa6, 0x2c, 0xf4, 0xed, 0x1b, 0x1f, 0xfc, 0x72, 0xf5, 0x7b, 0x17, 0xa1, 0xed, 0x2e, 0x42, 0x7f, - 0x77, 0x11, 0xfa, 0xb9, 0x8f, 0x06, 0xdb, 0x7d, 0x34, 0xf8, 0xb3, 0x8f, 0x06, 0xdf, 0x92, 0x92, - 0xeb, 0x4d, 0x9b, 0x27, 0x85, 0xac, 0xd2, 0x42, 0xaa, 0x4a, 0xaa, 0xfe, 0x71, 0xaa, 0xe8, 0x4d, - 0x6a, 0xc6, 0xb6, 0xd5, 0x5c, 0xa4, 0x6e, 0x7e, 0xf3, 0xb1, 0xbd, 0xaf, 0xb3, 0x7f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xbd, 0x48, 0xf9, 0x24, 0xe2, 0x02, 0x00, 0x00, + proto.RegisterType((*Dog)(nil), "testpb.Dog") + proto.RegisterType((*Cat)(nil), "testpb.Cat") + proto.RegisterType((*Bird)(nil), "testpb.Bird") + proto.RegisterType((*HasAnimal)(nil), "testpb.HasAnimal") + proto.RegisterType((*HasHasAnimal)(nil), "testpb.HasHasAnimal") + proto.RegisterType((*HasHasHasAnimal)(nil), "testpb.HasHasHasAnimal") + proto.RegisterType((*BadMultiSignature)(nil), "testpb.BadMultiSignature") + proto.RegisterType((*TableModel)(nil), "testpb.TableModel") +} + +func init() { proto.RegisterFile("testpb/testdata.proto", fileDescriptor_bc244d00904a39a7) } + +var fileDescriptor_bc244d00904a39a7 = []byte{ + // 446 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x8e, 0xd3, 0x30, + 0x18, 0xc7, 0xeb, 0x26, 0x2d, 0xf4, 0x23, 0xea, 0x09, 0xab, 0xa0, 0xd0, 0x21, 0x9c, 0xb2, 0xd0, + 0x81, 0x4b, 0x24, 0x4e, 0x30, 0xdc, 0x76, 0x3d, 0x04, 0x5d, 0xba, 0x04, 0x26, 0x96, 0x93, 0x13, + 0xfb, 0x12, 0xeb, 0x9c, 0xb8, 0x8a, 0x1d, 0x74, 0xc7, 0x53, 0xf0, 0x0a, 0xbc, 0x0d, 0x63, 0x47, + 0x46, 0xd4, 0xbe, 0x08, 0xb2, 0x93, 0xf4, 0x6e, 0x60, 0xe8, 0xe4, 0xef, 0xff, 0xb7, 0x7f, 0xff, + 0xc4, 0x9f, 0x3f, 0x78, 0xa1, 0x99, 0xd2, 0x9b, 0x34, 0x36, 0x0b, 0x25, 0x9a, 0x44, 0x9b, 0x5a, + 0x6a, 0x89, 0xc7, 0xad, 0x3d, 0x9f, 0xe5, 0x32, 0x97, 0xd6, 0x8a, 0x4d, 0xd5, 0xee, 0xce, 0x5f, + 0xe5, 0x52, 0xe6, 0x82, 0xc5, 0x56, 0xa5, 0xcd, 0x4d, 0x4c, 0xaa, 0xfb, 0x76, 0x2b, 0x3c, 0x03, + 0xe7, 0xa3, 0xcc, 0x31, 0x06, 0x57, 0xf1, 0x1f, 0xcc, 0x47, 0xa7, 0x68, 0x31, 0x49, 0x6c, 0x6d, + 0xbc, 0x8a, 0x94, 0xcc, 0x1f, 0xb6, 0x9e, 0xa9, 0xc3, 0xf7, 0xe0, 0x5c, 0x11, 0x8d, 0x7d, 0x78, + 0x52, 0xca, 0x8a, 0xdf, 0xb2, 0xba, 0x23, 0x7a, 0x89, 0x67, 0x30, 0x12, 0xfc, 0x3b, 0x53, 0x96, + 0x1a, 0x25, 0xad, 0x08, 0x3f, 0x80, 0xbb, 0xe4, 0x35, 0x35, 0x9c, 0xda, 0xb0, 0x8c, 0x33, 0xd5, + 0x73, 0x9d, 0x34, 0x5c, 0x26, 0x85, 0xac, 0x7b, 0xce, 0x8a, 0xf0, 0x33, 0x4c, 0x56, 0x44, 0x5d, + 0x56, 0xbc, 0x24, 0x02, 0xbf, 0x85, 0x31, 0xb1, 0x95, 0x65, 0x9f, 0xbd, 0x9b, 0x45, 0xed, 0xb5, + 0xa2, 0xfe, 0x5a, 0xd1, 0x65, 0x75, 0x9f, 0x74, 0x67, 0xb0, 0x07, 0xe8, 0xce, 0x86, 0x39, 0x09, + 0xba, 0x0b, 0xaf, 0xc0, 0x5b, 0x11, 0xf5, 0x90, 0x75, 0x0e, 0x50, 0x10, 0x75, 0x7d, 0x44, 0xde, + 0xa4, 0xe8, 0xa1, 0x70, 0x0d, 0x27, 0x6d, 0xc8, 0x43, 0xce, 0x05, 0x4c, 0x4d, 0xce, 0x91, 0x59, + 0x5e, 0xf1, 0x88, 0x0d, 0x53, 0x78, 0xbe, 0x24, 0x74, 0xdd, 0x08, 0xcd, 0xbf, 0xf0, 0xbc, 0x22, + 0xba, 0xa9, 0x19, 0x0e, 0x00, 0x54, 0x2f, 0x4c, 0x93, 0x9c, 0x85, 0x97, 0x3c, 0x72, 0xf0, 0x1b, + 0x38, 0x29, 0x89, 0xe0, 0x19, 0x97, 0x8d, 0xba, 0xbe, 0xe1, 0x4c, 0x50, 0x7f, 0x74, 0x8a, 0x16, + 0x5e, 0x32, 0x3d, 0xd8, 0x9f, 0x8c, 0x7b, 0xe1, 0x6e, 0x7f, 0xbd, 0x46, 0x21, 0x05, 0xf8, 0x4a, + 0x52, 0xc1, 0xd6, 0x92, 0x32, 0x81, 0xa7, 0x30, 0xe4, 0xd4, 0xfe, 0xa1, 0x9b, 0x0c, 0x39, 0xfd, + 0xdf, 0x0b, 0xe3, 0x97, 0x30, 0xae, 0x9a, 0x32, 0x65, 0xb5, 0xef, 0xd8, 0x73, 0x9d, 0xc2, 0x73, + 0x78, 0x5a, 0x32, 0x4d, 0xcc, 0xcc, 0xf9, 0xae, 0xfd, 0xe2, 0x41, 0x2f, 0x57, 0xbf, 0x77, 0x01, + 0xda, 0xee, 0x02, 0xf4, 0x77, 0x17, 0xa0, 0x9f, 0xfb, 0x60, 0xb0, 0xdd, 0x07, 0x83, 0x3f, 0xfb, + 0x60, 0xf0, 0x2d, 0xca, 0xb9, 0x2e, 0x9a, 0x34, 0xca, 0x64, 0x19, 0x67, 0x52, 0x95, 0x52, 0x75, + 0xcb, 0x99, 0xa2, 0xb7, 0x76, 0x88, 0x1b, 0xcd, 0xc5, 0x61, 0x9a, 0xd3, 0xb1, 0xed, 0xd7, 0xf9, + 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x55, 0xc2, 0xe7, 0xe7, 0x02, 0x00, 0x00, } func (m *Dog) Marshal() (dAtA []byte, err error) { diff --git a/testutil/testdata_pulsar/query.go b/testutil/testdata/testpb/pulsar_query.go similarity index 96% rename from testutil/testdata_pulsar/query.go rename to testutil/testdata/testpb/pulsar_query.go index 7103798a22..6fde587d7a 100644 --- a/testutil/testdata_pulsar/query.go +++ b/testutil/testdata/testpb/pulsar_query.go @@ -1,4 +1,4 @@ -package testdata_pulsar +package testpb import ( "context" diff --git a/testutil/testdata/query.proto b/testutil/testdata/testpb/query.proto similarity index 89% rename from testutil/testdata/query.proto rename to testutil/testdata/testpb/query.proto index 3a60acaad1..287d734e39 100644 --- a/testutil/testdata/query.proto +++ b/testutil/testdata/testpb/query.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package testdata; +package testpb; import "google/protobuf/any.proto"; -import "testdata.proto"; +import "testpb/testdata.proto"; option go_package = "github.com/cosmos/cosmos-sdk/testutil/testdata"; @@ -35,5 +35,5 @@ message TestAnyRequest { } message TestAnyResponse { - testdata.HasAnimal has_animal = 1; + testpb.HasAnimal has_animal = 1; } diff --git a/testutil/testdata_pulsar/query.pulsar.go b/testutil/testdata/testpb/query.pulsar.go similarity index 86% rename from testutil/testdata_pulsar/query.pulsar.go rename to testutil/testdata/testpb/query.pulsar.go index d5e6660a9b..9b2a04bab5 100644 --- a/testutil/testdata_pulsar/query.pulsar.go +++ b/testutil/testdata/testpb/query.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package testdata_pulsar +package testpb import ( fmt "fmt" @@ -19,8 +19,8 @@ var ( ) func init() { - file_query_proto_init() - md_EchoRequest = File_query_proto.Messages().ByName("EchoRequest") + file_testpb_query_proto_init() + md_EchoRequest = File_testpb_query_proto.Messages().ByName("EchoRequest") fd_EchoRequest_message = md_EchoRequest.Fields().ByName("message") } @@ -33,7 +33,7 @@ func (x *EchoRequest) ProtoReflect() protoreflect.Message { } func (x *EchoRequest) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[0] + mi := &file_testpb_query_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -110,13 +110,13 @@ func (x *fastReflection_EchoRequest) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_EchoRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.EchoRequest.message": + case "testpb.EchoRequest.message": return x.Message != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", fd.FullName())) } } @@ -128,13 +128,13 @@ func (x *fastReflection_EchoRequest) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.EchoRequest.message": + case "testpb.EchoRequest.message": x.Message = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", fd.FullName())) } } @@ -146,14 +146,14 @@ func (x *fastReflection_EchoRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EchoRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.EchoRequest.message": + case "testpb.EchoRequest.message": value := x.Message return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", descriptor.FullName())) } } @@ -169,13 +169,13 @@ func (x *fastReflection_EchoRequest) Get(descriptor protoreflect.FieldDescriptor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.EchoRequest.message": + case "testpb.EchoRequest.message": x.Message = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", fd.FullName())) } } @@ -191,13 +191,13 @@ func (x *fastReflection_EchoRequest) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.EchoRequest.message": - panic(fmt.Errorf("field message of message testdata.EchoRequest is not mutable")) + case "testpb.EchoRequest.message": + panic(fmt.Errorf("field message of message testpb.EchoRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", fd.FullName())) } } @@ -206,13 +206,13 @@ func (x *fastReflection_EchoRequest) Mutable(fd protoreflect.FieldDescriptor) pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EchoRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.EchoRequest.message": + case "testpb.EchoRequest.message": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoRequest")) } - panic(fmt.Errorf("message testdata.EchoRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoRequest does not contain field %s", fd.FullName())) } } @@ -222,7 +222,7 @@ func (x *fastReflection_EchoRequest) NewField(fd protoreflect.FieldDescriptor) p func (x *fastReflection_EchoRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.EchoRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.EchoRequest", d.FullName())) } panic("unreachable") } @@ -439,8 +439,8 @@ var ( ) func init() { - file_query_proto_init() - md_EchoResponse = File_query_proto.Messages().ByName("EchoResponse") + file_testpb_query_proto_init() + md_EchoResponse = File_testpb_query_proto.Messages().ByName("EchoResponse") fd_EchoResponse_message = md_EchoResponse.Fields().ByName("message") } @@ -453,7 +453,7 @@ func (x *EchoResponse) ProtoReflect() protoreflect.Message { } func (x *EchoResponse) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[1] + mi := &file_testpb_query_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -530,13 +530,13 @@ func (x *fastReflection_EchoResponse) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_EchoResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.EchoResponse.message": + case "testpb.EchoResponse.message": return x.Message != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", fd.FullName())) } } @@ -548,13 +548,13 @@ func (x *fastReflection_EchoResponse) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.EchoResponse.message": + case "testpb.EchoResponse.message": x.Message = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", fd.FullName())) } } @@ -566,14 +566,14 @@ func (x *fastReflection_EchoResponse) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_EchoResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.EchoResponse.message": + case "testpb.EchoResponse.message": value := x.Message return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", descriptor.FullName())) } } @@ -589,13 +589,13 @@ func (x *fastReflection_EchoResponse) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.EchoResponse.message": + case "testpb.EchoResponse.message": x.Message = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", fd.FullName())) } } @@ -611,13 +611,13 @@ func (x *fastReflection_EchoResponse) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_EchoResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.EchoResponse.message": - panic(fmt.Errorf("field message of message testdata.EchoResponse is not mutable")) + case "testpb.EchoResponse.message": + panic(fmt.Errorf("field message of message testpb.EchoResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", fd.FullName())) } } @@ -626,13 +626,13 @@ func (x *fastReflection_EchoResponse) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_EchoResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.EchoResponse.message": + case "testpb.EchoResponse.message": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.EchoResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.EchoResponse")) } - panic(fmt.Errorf("message testdata.EchoResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.EchoResponse does not contain field %s", fd.FullName())) } } @@ -642,7 +642,7 @@ func (x *fastReflection_EchoResponse) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_EchoResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.EchoResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.EchoResponse", d.FullName())) } panic("unreachable") } @@ -859,8 +859,8 @@ var ( ) func init() { - file_query_proto_init() - md_SayHelloRequest = File_query_proto.Messages().ByName("SayHelloRequest") + file_testpb_query_proto_init() + md_SayHelloRequest = File_testpb_query_proto.Messages().ByName("SayHelloRequest") fd_SayHelloRequest_name = md_SayHelloRequest.Fields().ByName("name") } @@ -873,7 +873,7 @@ func (x *SayHelloRequest) ProtoReflect() protoreflect.Message { } func (x *SayHelloRequest) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[2] + mi := &file_testpb_query_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -950,13 +950,13 @@ func (x *fastReflection_SayHelloRequest) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_SayHelloRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.SayHelloRequest.name": + case "testpb.SayHelloRequest.name": return x.Name != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", fd.FullName())) } } @@ -968,13 +968,13 @@ func (x *fastReflection_SayHelloRequest) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.SayHelloRequest.name": + case "testpb.SayHelloRequest.name": x.Name = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", fd.FullName())) } } @@ -986,14 +986,14 @@ func (x *fastReflection_SayHelloRequest) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_SayHelloRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.SayHelloRequest.name": + case "testpb.SayHelloRequest.name": value := x.Name return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", descriptor.FullName())) } } @@ -1009,13 +1009,13 @@ func (x *fastReflection_SayHelloRequest) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.SayHelloRequest.name": + case "testpb.SayHelloRequest.name": x.Name = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", fd.FullName())) } } @@ -1031,13 +1031,13 @@ func (x *fastReflection_SayHelloRequest) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.SayHelloRequest.name": - panic(fmt.Errorf("field name of message testdata.SayHelloRequest is not mutable")) + case "testpb.SayHelloRequest.name": + panic(fmt.Errorf("field name of message testpb.SayHelloRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", fd.FullName())) } } @@ -1046,13 +1046,13 @@ func (x *fastReflection_SayHelloRequest) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_SayHelloRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.SayHelloRequest.name": + case "testpb.SayHelloRequest.name": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloRequest")) } - panic(fmt.Errorf("message testdata.SayHelloRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloRequest does not contain field %s", fd.FullName())) } } @@ -1062,7 +1062,7 @@ func (x *fastReflection_SayHelloRequest) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_SayHelloRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.SayHelloRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.SayHelloRequest", d.FullName())) } panic("unreachable") } @@ -1279,8 +1279,8 @@ var ( ) func init() { - file_query_proto_init() - md_SayHelloResponse = File_query_proto.Messages().ByName("SayHelloResponse") + file_testpb_query_proto_init() + md_SayHelloResponse = File_testpb_query_proto.Messages().ByName("SayHelloResponse") fd_SayHelloResponse_greeting = md_SayHelloResponse.Fields().ByName("greeting") } @@ -1293,7 +1293,7 @@ func (x *SayHelloResponse) ProtoReflect() protoreflect.Message { } func (x *SayHelloResponse) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[3] + mi := &file_testpb_query_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1370,13 +1370,13 @@ func (x *fastReflection_SayHelloResponse) Range(f func(protoreflect.FieldDescrip // a repeated field is populated if it is non-empty. func (x *fastReflection_SayHelloResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.SayHelloResponse.greeting": + case "testpb.SayHelloResponse.greeting": return x.Greeting != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", fd.FullName())) } } @@ -1388,13 +1388,13 @@ func (x *fastReflection_SayHelloResponse) Has(fd protoreflect.FieldDescriptor) b // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.SayHelloResponse.greeting": + case "testpb.SayHelloResponse.greeting": x.Greeting = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", fd.FullName())) } } @@ -1406,14 +1406,14 @@ func (x *fastReflection_SayHelloResponse) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_SayHelloResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.SayHelloResponse.greeting": + case "testpb.SayHelloResponse.greeting": value := x.Greeting return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", descriptor.FullName())) } } @@ -1429,13 +1429,13 @@ func (x *fastReflection_SayHelloResponse) Get(descriptor protoreflect.FieldDescr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.SayHelloResponse.greeting": + case "testpb.SayHelloResponse.greeting": x.Greeting = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", fd.FullName())) } } @@ -1451,13 +1451,13 @@ func (x *fastReflection_SayHelloResponse) Set(fd protoreflect.FieldDescriptor, v // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_SayHelloResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.SayHelloResponse.greeting": - panic(fmt.Errorf("field greeting of message testdata.SayHelloResponse is not mutable")) + case "testpb.SayHelloResponse.greeting": + panic(fmt.Errorf("field greeting of message testpb.SayHelloResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", fd.FullName())) } } @@ -1466,13 +1466,13 @@ func (x *fastReflection_SayHelloResponse) Mutable(fd protoreflect.FieldDescripto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_SayHelloResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.SayHelloResponse.greeting": + case "testpb.SayHelloResponse.greeting": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.SayHelloResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.SayHelloResponse")) } - panic(fmt.Errorf("message testdata.SayHelloResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.SayHelloResponse does not contain field %s", fd.FullName())) } } @@ -1482,7 +1482,7 @@ func (x *fastReflection_SayHelloResponse) NewField(fd protoreflect.FieldDescript func (x *fastReflection_SayHelloResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.SayHelloResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.SayHelloResponse", d.FullName())) } panic("unreachable") } @@ -1699,8 +1699,8 @@ var ( ) func init() { - file_query_proto_init() - md_TestAnyRequest = File_query_proto.Messages().ByName("TestAnyRequest") + file_testpb_query_proto_init() + md_TestAnyRequest = File_testpb_query_proto.Messages().ByName("TestAnyRequest") fd_TestAnyRequest_any_animal = md_TestAnyRequest.Fields().ByName("any_animal") } @@ -1713,7 +1713,7 @@ func (x *TestAnyRequest) ProtoReflect() protoreflect.Message { } func (x *TestAnyRequest) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[4] + mi := &file_testpb_query_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1790,13 +1790,13 @@ func (x *fastReflection_TestAnyRequest) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_TestAnyRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": return x.AnyAnimal != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", fd.FullName())) } } @@ -1808,13 +1808,13 @@ func (x *fastReflection_TestAnyRequest) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": x.AnyAnimal = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", fd.FullName())) } } @@ -1826,14 +1826,14 @@ func (x *fastReflection_TestAnyRequest) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestAnyRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": value := x.AnyAnimal return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", descriptor.FullName())) } } @@ -1849,13 +1849,13 @@ func (x *fastReflection_TestAnyRequest) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": x.AnyAnimal = value.Message().Interface().(*anypb.Any) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", fd.FullName())) } } @@ -1871,16 +1871,16 @@ func (x *fastReflection_TestAnyRequest) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": if x.AnyAnimal == nil { x.AnyAnimal = new(anypb.Any) } return protoreflect.ValueOfMessage(x.AnyAnimal.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", fd.FullName())) } } @@ -1889,14 +1889,14 @@ func (x *fastReflection_TestAnyRequest) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestAnyRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestAnyRequest.any_animal": + case "testpb.TestAnyRequest.any_animal": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyRequest")) } - panic(fmt.Errorf("message testdata.TestAnyRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyRequest does not contain field %s", fd.FullName())) } } @@ -1906,7 +1906,7 @@ func (x *fastReflection_TestAnyRequest) NewField(fd protoreflect.FieldDescriptor func (x *fastReflection_TestAnyRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestAnyRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestAnyRequest", d.FullName())) } panic("unreachable") } @@ -2134,8 +2134,8 @@ var ( ) func init() { - file_query_proto_init() - md_TestAnyResponse = File_query_proto.Messages().ByName("TestAnyResponse") + file_testpb_query_proto_init() + md_TestAnyResponse = File_testpb_query_proto.Messages().ByName("TestAnyResponse") fd_TestAnyResponse_has_animal = md_TestAnyResponse.Fields().ByName("has_animal") } @@ -2148,7 +2148,7 @@ func (x *TestAnyResponse) ProtoReflect() protoreflect.Message { } func (x *TestAnyResponse) slowProtoReflect() protoreflect.Message { - mi := &file_query_proto_msgTypes[5] + mi := &file_testpb_query_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2225,13 +2225,13 @@ func (x *fastReflection_TestAnyResponse) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_TestAnyResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": return x.HasAnimal != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", fd.FullName())) } } @@ -2243,13 +2243,13 @@ func (x *fastReflection_TestAnyResponse) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": x.HasAnimal = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", fd.FullName())) } } @@ -2261,14 +2261,14 @@ func (x *fastReflection_TestAnyResponse) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestAnyResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": value := x.HasAnimal return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", descriptor.FullName())) } } @@ -2284,13 +2284,13 @@ func (x *fastReflection_TestAnyResponse) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": x.HasAnimal = value.Message().Interface().(*HasAnimal) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", fd.FullName())) } } @@ -2306,16 +2306,16 @@ func (x *fastReflection_TestAnyResponse) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestAnyResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": if x.HasAnimal == nil { x.HasAnimal = new(HasAnimal) } return protoreflect.ValueOfMessage(x.HasAnimal.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", fd.FullName())) } } @@ -2324,14 +2324,14 @@ func (x *fastReflection_TestAnyResponse) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestAnyResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestAnyResponse.has_animal": + case "testpb.TestAnyResponse.has_animal": m := new(HasAnimal) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestAnyResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestAnyResponse")) } - panic(fmt.Errorf("message testdata.TestAnyResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestAnyResponse does not contain field %s", fd.FullName())) } } @@ -2341,7 +2341,7 @@ func (x *fastReflection_TestAnyResponse) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_TestAnyResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestAnyResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestAnyResponse", d.FullName())) } panic("unreachable") } @@ -2567,7 +2567,7 @@ func (x *fastReflection_TestAnyResponse) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: query.proto +// source: testpb/query.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -2587,7 +2587,7 @@ type EchoRequest struct { func (x *EchoRequest) Reset() { *x = EchoRequest{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[0] + mi := &file_testpb_query_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2601,7 +2601,7 @@ func (*EchoRequest) ProtoMessage() {} // Deprecated: Use EchoRequest.ProtoReflect.Descriptor instead. func (*EchoRequest) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{0} + return file_testpb_query_proto_rawDescGZIP(), []int{0} } func (x *EchoRequest) GetMessage() string { @@ -2622,7 +2622,7 @@ type EchoResponse struct { func (x *EchoResponse) Reset() { *x = EchoResponse{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[1] + mi := &file_testpb_query_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2636,7 +2636,7 @@ func (*EchoResponse) ProtoMessage() {} // Deprecated: Use EchoResponse.ProtoReflect.Descriptor instead. func (*EchoResponse) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{1} + return file_testpb_query_proto_rawDescGZIP(), []int{1} } func (x *EchoResponse) GetMessage() string { @@ -2657,7 +2657,7 @@ type SayHelloRequest struct { func (x *SayHelloRequest) Reset() { *x = SayHelloRequest{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[2] + mi := &file_testpb_query_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2671,7 +2671,7 @@ func (*SayHelloRequest) ProtoMessage() {} // Deprecated: Use SayHelloRequest.ProtoReflect.Descriptor instead. func (*SayHelloRequest) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{2} + return file_testpb_query_proto_rawDescGZIP(), []int{2} } func (x *SayHelloRequest) GetName() string { @@ -2692,7 +2692,7 @@ type SayHelloResponse struct { func (x *SayHelloResponse) Reset() { *x = SayHelloResponse{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[3] + mi := &file_testpb_query_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2706,7 +2706,7 @@ func (*SayHelloResponse) ProtoMessage() {} // Deprecated: Use SayHelloResponse.ProtoReflect.Descriptor instead. func (*SayHelloResponse) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{3} + return file_testpb_query_proto_rawDescGZIP(), []int{3} } func (x *SayHelloResponse) GetGreeting() string { @@ -2727,7 +2727,7 @@ type TestAnyRequest struct { func (x *TestAnyRequest) Reset() { *x = TestAnyRequest{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[4] + mi := &file_testpb_query_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2741,7 +2741,7 @@ func (*TestAnyRequest) ProtoMessage() {} // Deprecated: Use TestAnyRequest.ProtoReflect.Descriptor instead. func (*TestAnyRequest) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{4} + return file_testpb_query_proto_rawDescGZIP(), []int{4} } func (x *TestAnyRequest) GetAnyAnimal() *anypb.Any { @@ -2762,7 +2762,7 @@ type TestAnyResponse struct { func (x *TestAnyResponse) Reset() { *x = TestAnyResponse{} if protoimpl.UnsafeEnabled { - mi := &file_query_proto_msgTypes[5] + mi := &file_testpb_query_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2776,7 +2776,7 @@ func (*TestAnyResponse) ProtoMessage() {} // Deprecated: Use TestAnyResponse.ProtoReflect.Descriptor instead. func (*TestAnyResponse) Descriptor() ([]byte, []int) { - return file_query_proto_rawDescGZIP(), []int{5} + return file_testpb_query_proto_rawDescGZIP(), []int{5} } func (x *TestAnyResponse) GetHasAnimal() *HasAnimal { @@ -2786,89 +2786,89 @@ func (x *TestAnyResponse) GetHasAnimal() *HasAnimal { return nil } -var File_query_proto protoreflect.FileDescriptor - -var file_query_proto_rawDesc = []byte{ - 0x0a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x74, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x0e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x0b, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x28, 0x0a, 0x0c, 0x45, - 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, - 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x2e, 0x0a, 0x10, +var File_testpb_query_proto protoreflect.FileDescriptor + +var file_testpb_query_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x1a, 0x19, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, + 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, + 0x0a, 0x0b, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, + 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x28, 0x0a, 0x0c, 0x45, 0x63, 0x68, 0x6f, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x2e, 0x0a, 0x10, 0x53, 0x61, 0x79, 0x48, + 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x67, 0x72, 0x65, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x67, 0x72, 0x65, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x45, 0x0a, 0x0e, 0x54, 0x65, 0x73, 0x74, + 0x41, 0x6e, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x0a, 0x61, 0x6e, + 0x79, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x61, 0x6e, 0x79, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x22, + 0x43, 0x0a, 0x0f, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x30, 0x0a, 0x0a, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x52, 0x09, 0x68, 0x61, 0x73, 0x41, 0x6e, + 0x69, 0x6d, 0x61, 0x6c, 0x32, 0xb5, 0x01, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x31, + 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x3d, 0x0a, 0x08, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x12, 0x17, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x72, 0x65, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x67, 0x72, 0x65, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x45, 0x0a, 0x0e, - 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x33, - 0x0a, 0x0a, 0x61, 0x6e, 0x79, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x61, 0x6e, 0x79, 0x41, 0x6e, 0x69, - 0x6d, 0x61, 0x6c, 0x22, 0x45, 0x0a, 0x0f, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x0a, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, - 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x52, - 0x09, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x32, 0xc1, 0x01, 0x0a, 0x05, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x12, 0x35, 0x0a, 0x04, 0x45, 0x63, 0x68, 0x6f, 0x12, 0x15, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x63, 0x68, 0x6f, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x45, - 0x63, 0x68, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x08, 0x53, - 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x12, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, - 0x74, 0x61, 0x2e, 0x53, 0x61, 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x53, 0x61, - 0x79, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3e, - 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x12, 0x18, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, - 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x91, - 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x42, - 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, - 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, - 0x6c, 0x73, 0x61, 0x72, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x08, 0x54, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0xca, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0xe2, 0x02, 0x14, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5c, 0x47, 0x50, 0x42, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, - 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x3a, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x12, 0x16, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, + 0x74, 0x41, 0x6e, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x8e, 0x01, 0x0a, + 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x42, 0x0a, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, + 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, 0x61, 0x72, + 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x06, + 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xe2, + 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_query_proto_rawDescOnce sync.Once - file_query_proto_rawDescData = file_query_proto_rawDesc + file_testpb_query_proto_rawDescOnce sync.Once + file_testpb_query_proto_rawDescData = file_testpb_query_proto_rawDesc ) -func file_query_proto_rawDescGZIP() []byte { - file_query_proto_rawDescOnce.Do(func() { - file_query_proto_rawDescData = protoimpl.X.CompressGZIP(file_query_proto_rawDescData) +func file_testpb_query_proto_rawDescGZIP() []byte { + file_testpb_query_proto_rawDescOnce.Do(func() { + file_testpb_query_proto_rawDescData = protoimpl.X.CompressGZIP(file_testpb_query_proto_rawDescData) }) - return file_query_proto_rawDescData + return file_testpb_query_proto_rawDescData } -var file_query_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_query_proto_goTypes = []interface{}{ - (*EchoRequest)(nil), // 0: testdata.EchoRequest - (*EchoResponse)(nil), // 1: testdata.EchoResponse - (*SayHelloRequest)(nil), // 2: testdata.SayHelloRequest - (*SayHelloResponse)(nil), // 3: testdata.SayHelloResponse - (*TestAnyRequest)(nil), // 4: testdata.TestAnyRequest - (*TestAnyResponse)(nil), // 5: testdata.TestAnyResponse +var file_testpb_query_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_testpb_query_proto_goTypes = []interface{}{ + (*EchoRequest)(nil), // 0: testpb.EchoRequest + (*EchoResponse)(nil), // 1: testpb.EchoResponse + (*SayHelloRequest)(nil), // 2: testpb.SayHelloRequest + (*SayHelloResponse)(nil), // 3: testpb.SayHelloResponse + (*TestAnyRequest)(nil), // 4: testpb.TestAnyRequest + (*TestAnyResponse)(nil), // 5: testpb.TestAnyResponse (*anypb.Any)(nil), // 6: google.protobuf.Any - (*HasAnimal)(nil), // 7: testdata.HasAnimal -} -var file_query_proto_depIdxs = []int32{ - 6, // 0: testdata.TestAnyRequest.any_animal:type_name -> google.protobuf.Any - 7, // 1: testdata.TestAnyResponse.has_animal:type_name -> testdata.HasAnimal - 0, // 2: testdata.Query.Echo:input_type -> testdata.EchoRequest - 2, // 3: testdata.Query.SayHello:input_type -> testdata.SayHelloRequest - 4, // 4: testdata.Query.TestAny:input_type -> testdata.TestAnyRequest - 1, // 5: testdata.Query.Echo:output_type -> testdata.EchoResponse - 3, // 6: testdata.Query.SayHello:output_type -> testdata.SayHelloResponse - 5, // 7: testdata.Query.TestAny:output_type -> testdata.TestAnyResponse + (*HasAnimal)(nil), // 7: testpb.HasAnimal +} +var file_testpb_query_proto_depIdxs = []int32{ + 6, // 0: testpb.TestAnyRequest.any_animal:type_name -> google.protobuf.Any + 7, // 1: testpb.TestAnyResponse.has_animal:type_name -> testpb.HasAnimal + 0, // 2: testpb.Query.Echo:input_type -> testpb.EchoRequest + 2, // 3: testpb.Query.SayHello:input_type -> testpb.SayHelloRequest + 4, // 4: testpb.Query.TestAny:input_type -> testpb.TestAnyRequest + 1, // 5: testpb.Query.Echo:output_type -> testpb.EchoResponse + 3, // 6: testpb.Query.SayHello:output_type -> testpb.SayHelloResponse + 5, // 7: testpb.Query.TestAny:output_type -> testpb.TestAnyResponse 5, // [5:8] is the sub-list for method output_type 2, // [2:5] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name @@ -2876,14 +2876,14 @@ var file_query_proto_depIdxs = []int32{ 0, // [0:2] is the sub-list for field type_name } -func init() { file_query_proto_init() } -func file_query_proto_init() { - if File_query_proto != nil { +func init() { file_testpb_query_proto_init() } +func file_testpb_query_proto_init() { + if File_testpb_query_proto != nil { return } - file_testdata_proto_init() + file_testpb_testdata_proto_init() if !protoimpl.UnsafeEnabled { - file_query_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EchoRequest); i { case 0: return &v.state @@ -2895,7 +2895,7 @@ func file_query_proto_init() { return nil } } - file_query_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*EchoResponse); i { case 0: return &v.state @@ -2907,7 +2907,7 @@ func file_query_proto_init() { return nil } } - file_query_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SayHelloRequest); i { case 0: return &v.state @@ -2919,7 +2919,7 @@ func file_query_proto_init() { return nil } } - file_query_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SayHelloResponse); i { case 0: return &v.state @@ -2931,7 +2931,7 @@ func file_query_proto_init() { return nil } } - file_query_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestAnyRequest); i { case 0: return &v.state @@ -2943,7 +2943,7 @@ func file_query_proto_init() { return nil } } - file_query_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_testpb_query_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestAnyResponse); i { case 0: return &v.state @@ -2960,18 +2960,18 @@ func file_query_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_query_proto_rawDesc, + RawDescriptor: file_testpb_query_proto_rawDesc, NumEnums: 0, NumMessages: 6, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_query_proto_goTypes, - DependencyIndexes: file_query_proto_depIdxs, - MessageInfos: file_query_proto_msgTypes, + GoTypes: file_testpb_query_proto_goTypes, + DependencyIndexes: file_testpb_query_proto_depIdxs, + MessageInfos: file_testpb_query_proto_msgTypes, }.Build() - File_query_proto = out.File - file_query_proto_rawDesc = nil - file_query_proto_goTypes = nil - file_query_proto_depIdxs = nil + File_testpb_query_proto = out.File + file_testpb_query_proto_rawDesc = nil + file_testpb_query_proto_goTypes = nil + file_testpb_query_proto_depIdxs = nil } diff --git a/testutil/testdata_pulsar/query_grpc.pb.go b/testutil/testdata/testpb/query_grpc.pb.go similarity index 95% rename from testutil/testdata_pulsar/query_grpc.pb.go rename to testutil/testdata/testpb/query_grpc.pb.go index b8e49c966f..565a93499d 100644 --- a/testutil/testdata_pulsar/query_grpc.pb.go +++ b/testutil/testdata/testpb/query_grpc.pb.go @@ -2,9 +2,9 @@ // versions: // - protoc-gen-go-grpc v1.3.0 // - protoc (unknown) -// source: query.proto +// source: testpb/query.proto -package testdata_pulsar +package testpb import ( context "context" @@ -19,9 +19,9 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - Query_Echo_FullMethodName = "/testdata.Query/Echo" - Query_SayHello_FullMethodName = "/testdata.Query/SayHello" - Query_TestAny_FullMethodName = "/testdata.Query/TestAny" + Query_Echo_FullMethodName = "/testpb.Query/Echo" + Query_SayHello_FullMethodName = "/testpb.Query/SayHello" + Query_TestAny_FullMethodName = "/testpb.Query/TestAny" ) // QueryClient is the client API for Query service. @@ -162,7 +162,7 @@ func _Query_TestAny_Handler(srv interface{}, ctx context.Context, dec func(inter // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) var Query_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Query", + ServiceName: "testpb.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -179,5 +179,5 @@ var Query_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "query.proto", + Metadata: "testpb/query.proto", } diff --git a/testutil/testdata/testdata.proto b/testutil/testdata/testpb/testdata.proto similarity index 98% rename from testutil/testdata/testdata.proto rename to testutil/testdata/testpb/testdata.proto index 22503ef61d..b40f486278 100644 --- a/testutil/testdata/testdata.proto +++ b/testutil/testdata/testpb/testdata.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package testdata; +package testpb; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; diff --git a/testutil/testdata_pulsar/testdata.pulsar.go b/testutil/testdata/testpb/testdata.pulsar.go similarity index 87% rename from testutil/testdata_pulsar/testdata.pulsar.go rename to testutil/testdata/testpb/testdata.pulsar.go index 616f68032c..8802ea9cd3 100644 --- a/testutil/testdata_pulsar/testdata.pulsar.go +++ b/testutil/testdata/testpb/testdata.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package testdata_pulsar +package testpb import ( fmt "fmt" @@ -21,8 +21,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_Dog = File_testdata_proto.Messages().ByName("Dog") + file_testpb_testdata_proto_init() + md_Dog = File_testpb_testdata_proto.Messages().ByName("Dog") fd_Dog_size = md_Dog.Fields().ByName("size") fd_Dog_name = md_Dog.Fields().ByName("name") } @@ -36,7 +36,7 @@ func (x *Dog) ProtoReflect() protoreflect.Message { } func (x *Dog) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[0] + mi := &file_testpb_testdata_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -119,15 +119,15 @@ func (x *fastReflection_Dog) Range(f func(protoreflect.FieldDescriptor, protoref // a repeated field is populated if it is non-empty. func (x *fastReflection_Dog) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Dog.size": + case "testpb.Dog.size": return x.Size != "" - case "testdata.Dog.name": + case "testpb.Dog.name": return x.Name != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", fd.FullName())) } } @@ -139,15 +139,15 @@ func (x *fastReflection_Dog) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Dog) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Dog.size": + case "testpb.Dog.size": x.Size = "" - case "testdata.Dog.name": + case "testpb.Dog.name": x.Name = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", fd.FullName())) } } @@ -159,17 +159,17 @@ func (x *fastReflection_Dog) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Dog) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Dog.size": + case "testpb.Dog.size": value := x.Size return protoreflect.ValueOfString(value) - case "testdata.Dog.name": + case "testpb.Dog.name": value := x.Name return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", descriptor.FullName())) } } @@ -185,15 +185,15 @@ func (x *fastReflection_Dog) Get(descriptor protoreflect.FieldDescriptor) protor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Dog) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Dog.size": + case "testpb.Dog.size": x.Size = value.Interface().(string) - case "testdata.Dog.name": + case "testpb.Dog.name": x.Name = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", fd.FullName())) } } @@ -209,15 +209,15 @@ func (x *fastReflection_Dog) Set(fd protoreflect.FieldDescriptor, value protoref // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Dog) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Dog.size": - panic(fmt.Errorf("field size of message testdata.Dog is not mutable")) - case "testdata.Dog.name": - panic(fmt.Errorf("field name of message testdata.Dog is not mutable")) + case "testpb.Dog.size": + panic(fmt.Errorf("field size of message testpb.Dog is not mutable")) + case "testpb.Dog.name": + panic(fmt.Errorf("field name of message testpb.Dog is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", fd.FullName())) } } @@ -226,15 +226,15 @@ func (x *fastReflection_Dog) Mutable(fd protoreflect.FieldDescriptor) protorefle // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Dog) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Dog.size": + case "testpb.Dog.size": return protoreflect.ValueOfString("") - case "testdata.Dog.name": + case "testpb.Dog.name": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Dog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Dog")) } - panic(fmt.Errorf("message testdata.Dog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Dog does not contain field %s", fd.FullName())) } } @@ -244,7 +244,7 @@ func (x *fastReflection_Dog) NewField(fd protoreflect.FieldDescriptor) protorefl func (x *fastReflection_Dog) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Dog", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Dog", d.FullName())) } panic("unreachable") } @@ -505,8 +505,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_Cat = File_testdata_proto.Messages().ByName("Cat") + file_testpb_testdata_proto_init() + md_Cat = File_testpb_testdata_proto.Messages().ByName("Cat") fd_Cat_moniker = md_Cat.Fields().ByName("moniker") fd_Cat_lives = md_Cat.Fields().ByName("lives") } @@ -520,7 +520,7 @@ func (x *Cat) ProtoReflect() protoreflect.Message { } func (x *Cat) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[1] + mi := &file_testpb_testdata_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -603,15 +603,15 @@ func (x *fastReflection_Cat) Range(f func(protoreflect.FieldDescriptor, protoref // a repeated field is populated if it is non-empty. func (x *fastReflection_Cat) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Cat.moniker": + case "testpb.Cat.moniker": return x.Moniker != "" - case "testdata.Cat.lives": + case "testpb.Cat.lives": return x.Lives != int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", fd.FullName())) } } @@ -623,15 +623,15 @@ func (x *fastReflection_Cat) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Cat) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Cat.moniker": + case "testpb.Cat.moniker": x.Moniker = "" - case "testdata.Cat.lives": + case "testpb.Cat.lives": x.Lives = int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", fd.FullName())) } } @@ -643,17 +643,17 @@ func (x *fastReflection_Cat) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Cat) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Cat.moniker": + case "testpb.Cat.moniker": value := x.Moniker return protoreflect.ValueOfString(value) - case "testdata.Cat.lives": + case "testpb.Cat.lives": value := x.Lives return protoreflect.ValueOfInt32(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", descriptor.FullName())) } } @@ -669,15 +669,15 @@ func (x *fastReflection_Cat) Get(descriptor protoreflect.FieldDescriptor) protor // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Cat) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Cat.moniker": + case "testpb.Cat.moniker": x.Moniker = value.Interface().(string) - case "testdata.Cat.lives": + case "testpb.Cat.lives": x.Lives = int32(value.Int()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", fd.FullName())) } } @@ -693,15 +693,15 @@ func (x *fastReflection_Cat) Set(fd protoreflect.FieldDescriptor, value protoref // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Cat) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Cat.moniker": - panic(fmt.Errorf("field moniker of message testdata.Cat is not mutable")) - case "testdata.Cat.lives": - panic(fmt.Errorf("field lives of message testdata.Cat is not mutable")) + case "testpb.Cat.moniker": + panic(fmt.Errorf("field moniker of message testpb.Cat is not mutable")) + case "testpb.Cat.lives": + panic(fmt.Errorf("field lives of message testpb.Cat is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", fd.FullName())) } } @@ -710,15 +710,15 @@ func (x *fastReflection_Cat) Mutable(fd protoreflect.FieldDescriptor) protorefle // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Cat) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Cat.moniker": + case "testpb.Cat.moniker": return protoreflect.ValueOfString("") - case "testdata.Cat.lives": + case "testpb.Cat.lives": return protoreflect.ValueOfInt32(int32(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Cat")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Cat")) } - panic(fmt.Errorf("message testdata.Cat does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Cat does not contain field %s", fd.FullName())) } } @@ -728,7 +728,7 @@ func (x *fastReflection_Cat) NewField(fd protoreflect.FieldDescriptor) protorefl func (x *fastReflection_Cat) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Cat", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Cat", d.FullName())) } panic("unreachable") } @@ -973,8 +973,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_Bird = File_testdata_proto.Messages().ByName("Bird") + file_testpb_testdata_proto_init() + md_Bird = File_testpb_testdata_proto.Messages().ByName("Bird") fd_Bird_species = md_Bird.Fields().ByName("species") fd_Bird_color = md_Bird.Fields().ByName("color") } @@ -988,7 +988,7 @@ func (x *Bird) ProtoReflect() protoreflect.Message { } func (x *Bird) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[2] + mi := &file_testpb_testdata_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1071,15 +1071,15 @@ func (x *fastReflection_Bird) Range(f func(protoreflect.FieldDescriptor, protore // a repeated field is populated if it is non-empty. func (x *fastReflection_Bird) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Bird.species": + case "testpb.Bird.species": return x.Species != "" - case "testdata.Bird.color": + case "testpb.Bird.color": return x.Color != int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", fd.FullName())) } } @@ -1091,15 +1091,15 @@ func (x *fastReflection_Bird) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Bird) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Bird.species": + case "testpb.Bird.species": x.Species = "" - case "testdata.Bird.color": + case "testpb.Bird.color": x.Color = int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", fd.FullName())) } } @@ -1111,17 +1111,17 @@ func (x *fastReflection_Bird) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Bird) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Bird.species": + case "testpb.Bird.species": value := x.Species return protoreflect.ValueOfString(value) - case "testdata.Bird.color": + case "testpb.Bird.color": value := x.Color return protoreflect.ValueOfInt32(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", descriptor.FullName())) } } @@ -1137,15 +1137,15 @@ func (x *fastReflection_Bird) Get(descriptor protoreflect.FieldDescriptor) proto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Bird) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Bird.species": + case "testpb.Bird.species": x.Species = value.Interface().(string) - case "testdata.Bird.color": + case "testpb.Bird.color": x.Color = int32(value.Int()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", fd.FullName())) } } @@ -1161,15 +1161,15 @@ func (x *fastReflection_Bird) Set(fd protoreflect.FieldDescriptor, value protore // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Bird) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Bird.species": - panic(fmt.Errorf("field species of message testdata.Bird is not mutable")) - case "testdata.Bird.color": - panic(fmt.Errorf("field color of message testdata.Bird is not mutable")) + case "testpb.Bird.species": + panic(fmt.Errorf("field species of message testpb.Bird is not mutable")) + case "testpb.Bird.color": + panic(fmt.Errorf("field color of message testpb.Bird is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", fd.FullName())) } } @@ -1178,15 +1178,15 @@ func (x *fastReflection_Bird) Mutable(fd protoreflect.FieldDescriptor) protorefl // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Bird) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Bird.species": + case "testpb.Bird.species": return protoreflect.ValueOfString("") - case "testdata.Bird.color": + case "testpb.Bird.color": return protoreflect.ValueOfInt32(int32(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Bird")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Bird")) } - panic(fmt.Errorf("message testdata.Bird does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Bird does not contain field %s", fd.FullName())) } } @@ -1196,7 +1196,7 @@ func (x *fastReflection_Bird) NewField(fd protoreflect.FieldDescriptor) protoref func (x *fastReflection_Bird) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Bird", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Bird", d.FullName())) } panic("unreachable") } @@ -1441,8 +1441,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_HasAnimal = File_testdata_proto.Messages().ByName("HasAnimal") + file_testpb_testdata_proto_init() + md_HasAnimal = File_testpb_testdata_proto.Messages().ByName("HasAnimal") fd_HasAnimal_animal = md_HasAnimal.Fields().ByName("animal") fd_HasAnimal_x = md_HasAnimal.Fields().ByName("x") } @@ -1456,7 +1456,7 @@ func (x *HasAnimal) ProtoReflect() protoreflect.Message { } func (x *HasAnimal) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[3] + mi := &file_testpb_testdata_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1539,15 +1539,15 @@ func (x *fastReflection_HasAnimal) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_HasAnimal) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": return x.Animal != nil - case "testdata.HasAnimal.x": + case "testpb.HasAnimal.x": return x.X != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", fd.FullName())) } } @@ -1559,15 +1559,15 @@ func (x *fastReflection_HasAnimal) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasAnimal) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": x.Animal = nil - case "testdata.HasAnimal.x": + case "testpb.HasAnimal.x": x.X = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", fd.FullName())) } } @@ -1579,17 +1579,17 @@ func (x *fastReflection_HasAnimal) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_HasAnimal) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": value := x.Animal return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.HasAnimal.x": + case "testpb.HasAnimal.x": value := x.X return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", descriptor.FullName())) } } @@ -1605,15 +1605,15 @@ func (x *fastReflection_HasAnimal) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasAnimal) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": x.Animal = value.Message().Interface().(*anypb.Any) - case "testdata.HasAnimal.x": + case "testpb.HasAnimal.x": x.X = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", fd.FullName())) } } @@ -1629,18 +1629,18 @@ func (x *fastReflection_HasAnimal) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasAnimal) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": if x.Animal == nil { x.Animal = new(anypb.Any) } return protoreflect.ValueOfMessage(x.Animal.ProtoReflect()) - case "testdata.HasAnimal.x": - panic(fmt.Errorf("field x of message testdata.HasAnimal is not mutable")) + case "testpb.HasAnimal.x": + panic(fmt.Errorf("field x of message testpb.HasAnimal is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", fd.FullName())) } } @@ -1649,16 +1649,16 @@ func (x *fastReflection_HasAnimal) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_HasAnimal) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasAnimal.animal": + case "testpb.HasAnimal.animal": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.HasAnimal.x": + case "testpb.HasAnimal.x": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasAnimal")) } - panic(fmt.Errorf("message testdata.HasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasAnimal does not contain field %s", fd.FullName())) } } @@ -1668,7 +1668,7 @@ func (x *fastReflection_HasAnimal) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_HasAnimal) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.HasAnimal", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.HasAnimal", d.FullName())) } panic("unreachable") } @@ -1923,8 +1923,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_HasHasAnimal = File_testdata_proto.Messages().ByName("HasHasAnimal") + file_testpb_testdata_proto_init() + md_HasHasAnimal = File_testpb_testdata_proto.Messages().ByName("HasHasAnimal") fd_HasHasAnimal_has_animal = md_HasHasAnimal.Fields().ByName("has_animal") } @@ -1937,7 +1937,7 @@ func (x *HasHasAnimal) ProtoReflect() protoreflect.Message { } func (x *HasHasAnimal) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[4] + mi := &file_testpb_testdata_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2014,13 +2014,13 @@ func (x *fastReflection_HasHasAnimal) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_HasHasAnimal) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": return x.HasAnimal != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2032,13 +2032,13 @@ func (x *fastReflection_HasHasAnimal) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasAnimal) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": x.HasAnimal = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2050,14 +2050,14 @@ func (x *fastReflection_HasHasAnimal) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_HasHasAnimal) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": value := x.HasAnimal return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", descriptor.FullName())) } } @@ -2073,13 +2073,13 @@ func (x *fastReflection_HasHasAnimal) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasAnimal) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": x.HasAnimal = value.Message().Interface().(*anypb.Any) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2095,16 +2095,16 @@ func (x *fastReflection_HasHasAnimal) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasAnimal) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": if x.HasAnimal == nil { x.HasAnimal = new(anypb.Any) } return protoreflect.ValueOfMessage(x.HasAnimal.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2113,14 +2113,14 @@ func (x *fastReflection_HasHasAnimal) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_HasHasAnimal) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasHasAnimal.has_animal": + case "testpb.HasHasAnimal.has_animal": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2130,7 +2130,7 @@ func (x *fastReflection_HasHasAnimal) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_HasHasAnimal) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.HasHasAnimal", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.HasHasAnimal", d.FullName())) } panic("unreachable") } @@ -2358,8 +2358,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_HasHasHasAnimal = File_testdata_proto.Messages().ByName("HasHasHasAnimal") + file_testpb_testdata_proto_init() + md_HasHasHasAnimal = File_testpb_testdata_proto.Messages().ByName("HasHasHasAnimal") fd_HasHasHasAnimal_has_has_animal = md_HasHasHasAnimal.Fields().ByName("has_has_animal") } @@ -2372,7 +2372,7 @@ func (x *HasHasHasAnimal) ProtoReflect() protoreflect.Message { } func (x *HasHasHasAnimal) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[5] + mi := &file_testpb_testdata_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2449,13 +2449,13 @@ func (x *fastReflection_HasHasHasAnimal) Range(f func(protoreflect.FieldDescript // a repeated field is populated if it is non-empty. func (x *fastReflection_HasHasHasAnimal) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": return x.HasHasAnimal != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2467,13 +2467,13 @@ func (x *fastReflection_HasHasHasAnimal) Has(fd protoreflect.FieldDescriptor) bo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasHasAnimal) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": x.HasHasAnimal = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2485,14 +2485,14 @@ func (x *fastReflection_HasHasHasAnimal) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_HasHasHasAnimal) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": value := x.HasHasAnimal return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", descriptor.FullName())) } } @@ -2508,13 +2508,13 @@ func (x *fastReflection_HasHasHasAnimal) Get(descriptor protoreflect.FieldDescri // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasHasAnimal) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": x.HasHasAnimal = value.Message().Interface().(*anypb.Any) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2530,16 +2530,16 @@ func (x *fastReflection_HasHasHasAnimal) Set(fd protoreflect.FieldDescriptor, va // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_HasHasHasAnimal) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": if x.HasHasAnimal == nil { x.HasHasAnimal = new(anypb.Any) } return protoreflect.ValueOfMessage(x.HasHasAnimal.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2548,14 +2548,14 @@ func (x *fastReflection_HasHasHasAnimal) Mutable(fd protoreflect.FieldDescriptor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_HasHasHasAnimal) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.HasHasHasAnimal.has_has_animal": + case "testpb.HasHasHasAnimal.has_has_animal": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.HasHasHasAnimal")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.HasHasHasAnimal")) } - panic(fmt.Errorf("message testdata.HasHasHasAnimal does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.HasHasHasAnimal does not contain field %s", fd.FullName())) } } @@ -2565,7 +2565,7 @@ func (x *fastReflection_HasHasHasAnimal) NewField(fd protoreflect.FieldDescripto func (x *fastReflection_HasHasHasAnimal) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.HasHasHasAnimal", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.HasHasHasAnimal", d.FullName())) } panic("unreachable") } @@ -2840,8 +2840,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_BadMultiSignature = File_testdata_proto.Messages().ByName("BadMultiSignature") + file_testpb_testdata_proto_init() + md_BadMultiSignature = File_testpb_testdata_proto.Messages().ByName("BadMultiSignature") fd_BadMultiSignature_signatures = md_BadMultiSignature.Fields().ByName("signatures") fd_BadMultiSignature_malicious_field = md_BadMultiSignature.Fields().ByName("malicious_field") } @@ -2855,7 +2855,7 @@ func (x *BadMultiSignature) ProtoReflect() protoreflect.Message { } func (x *BadMultiSignature) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[6] + mi := &file_testpb_testdata_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2938,15 +2938,15 @@ func (x *fastReflection_BadMultiSignature) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_BadMultiSignature) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": return len(x.Signatures) != 0 - case "testdata.BadMultiSignature.malicious_field": + case "testpb.BadMultiSignature.malicious_field": return len(x.MaliciousField) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", fd.FullName())) } } @@ -2958,15 +2958,15 @@ func (x *fastReflection_BadMultiSignature) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BadMultiSignature) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": x.Signatures = nil - case "testdata.BadMultiSignature.malicious_field": + case "testpb.BadMultiSignature.malicious_field": x.MaliciousField = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", fd.FullName())) } } @@ -2978,20 +2978,20 @@ func (x *fastReflection_BadMultiSignature) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_BadMultiSignature) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": if len(x.Signatures) == 0 { return protoreflect.ValueOfList(&_BadMultiSignature_1_list{}) } listValue := &_BadMultiSignature_1_list{list: &x.Signatures} return protoreflect.ValueOfList(listValue) - case "testdata.BadMultiSignature.malicious_field": + case "testpb.BadMultiSignature.malicious_field": value := x.MaliciousField return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", descriptor.FullName())) } } @@ -3007,17 +3007,17 @@ func (x *fastReflection_BadMultiSignature) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BadMultiSignature) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": lv := value.List() clv := lv.(*_BadMultiSignature_1_list) x.Signatures = *clv.list - case "testdata.BadMultiSignature.malicious_field": + case "testpb.BadMultiSignature.malicious_field": x.MaliciousField = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", fd.FullName())) } } @@ -3033,19 +3033,19 @@ func (x *fastReflection_BadMultiSignature) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_BadMultiSignature) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": if x.Signatures == nil { x.Signatures = [][]byte{} } value := &_BadMultiSignature_1_list{list: &x.Signatures} return protoreflect.ValueOfList(value) - case "testdata.BadMultiSignature.malicious_field": - panic(fmt.Errorf("field malicious_field of message testdata.BadMultiSignature is not mutable")) + case "testpb.BadMultiSignature.malicious_field": + panic(fmt.Errorf("field malicious_field of message testpb.BadMultiSignature is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", fd.FullName())) } } @@ -3054,16 +3054,16 @@ func (x *fastReflection_BadMultiSignature) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_BadMultiSignature) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.BadMultiSignature.signatures": + case "testpb.BadMultiSignature.signatures": list := [][]byte{} return protoreflect.ValueOfList(&_BadMultiSignature_1_list{list: &list}) - case "testdata.BadMultiSignature.malicious_field": + case "testpb.BadMultiSignature.malicious_field": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.BadMultiSignature")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.BadMultiSignature")) } - panic(fmt.Errorf("message testdata.BadMultiSignature does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.BadMultiSignature does not contain field %s", fd.FullName())) } } @@ -3073,7 +3073,7 @@ func (x *fastReflection_BadMultiSignature) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_BadMultiSignature) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.BadMultiSignature", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.BadMultiSignature", d.FullName())) } panic("unreachable") } @@ -3342,8 +3342,8 @@ var ( ) func init() { - file_testdata_proto_init() - md_TableModel = File_testdata_proto.Messages().ByName("TableModel") + file_testpb_testdata_proto_init() + md_TableModel = File_testpb_testdata_proto.Messages().ByName("TableModel") fd_TableModel_id = md_TableModel.Fields().ByName("id") fd_TableModel_name = md_TableModel.Fields().ByName("name") fd_TableModel_number = md_TableModel.Fields().ByName("number") @@ -3359,7 +3359,7 @@ func (x *TableModel) ProtoReflect() protoreflect.Message { } func (x *TableModel) slowProtoReflect() protoreflect.Message { - mi := &file_testdata_proto_msgTypes[7] + mi := &file_testpb_testdata_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3454,19 +3454,19 @@ func (x *fastReflection_TableModel) Range(f func(protoreflect.FieldDescriptor, p // a repeated field is populated if it is non-empty. func (x *fastReflection_TableModel) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TableModel.id": + case "testpb.TableModel.id": return x.Id != uint64(0) - case "testdata.TableModel.name": + case "testpb.TableModel.name": return x.Name != "" - case "testdata.TableModel.number": + case "testpb.TableModel.number": return x.Number != uint64(0) - case "testdata.TableModel.metadata": + case "testpb.TableModel.metadata": return len(x.Metadata) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", fd.FullName())) } } @@ -3478,19 +3478,19 @@ func (x *fastReflection_TableModel) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TableModel) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TableModel.id": + case "testpb.TableModel.id": x.Id = uint64(0) - case "testdata.TableModel.name": + case "testpb.TableModel.name": x.Name = "" - case "testdata.TableModel.number": + case "testpb.TableModel.number": x.Number = uint64(0) - case "testdata.TableModel.metadata": + case "testpb.TableModel.metadata": x.Metadata = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", fd.FullName())) } } @@ -3502,23 +3502,23 @@ func (x *fastReflection_TableModel) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TableModel) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TableModel.id": + case "testpb.TableModel.id": value := x.Id return protoreflect.ValueOfUint64(value) - case "testdata.TableModel.name": + case "testpb.TableModel.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.TableModel.number": + case "testpb.TableModel.number": value := x.Number return protoreflect.ValueOfUint64(value) - case "testdata.TableModel.metadata": + case "testpb.TableModel.metadata": value := x.Metadata return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", descriptor.FullName())) } } @@ -3534,19 +3534,19 @@ func (x *fastReflection_TableModel) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TableModel) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TableModel.id": + case "testpb.TableModel.id": x.Id = value.Uint() - case "testdata.TableModel.name": + case "testpb.TableModel.name": x.Name = value.Interface().(string) - case "testdata.TableModel.number": + case "testpb.TableModel.number": x.Number = value.Uint() - case "testdata.TableModel.metadata": + case "testpb.TableModel.metadata": x.Metadata = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", fd.FullName())) } } @@ -3562,19 +3562,19 @@ func (x *fastReflection_TableModel) Set(fd protoreflect.FieldDescriptor, value p // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TableModel) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TableModel.id": - panic(fmt.Errorf("field id of message testdata.TableModel is not mutable")) - case "testdata.TableModel.name": - panic(fmt.Errorf("field name of message testdata.TableModel is not mutable")) - case "testdata.TableModel.number": - panic(fmt.Errorf("field number of message testdata.TableModel is not mutable")) - case "testdata.TableModel.metadata": - panic(fmt.Errorf("field metadata of message testdata.TableModel is not mutable")) + case "testpb.TableModel.id": + panic(fmt.Errorf("field id of message testpb.TableModel is not mutable")) + case "testpb.TableModel.name": + panic(fmt.Errorf("field name of message testpb.TableModel is not mutable")) + case "testpb.TableModel.number": + panic(fmt.Errorf("field number of message testpb.TableModel is not mutable")) + case "testpb.TableModel.metadata": + panic(fmt.Errorf("field metadata of message testpb.TableModel is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", fd.FullName())) } } @@ -3583,19 +3583,19 @@ func (x *fastReflection_TableModel) Mutable(fd protoreflect.FieldDescriptor) pro // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TableModel) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TableModel.id": + case "testpb.TableModel.id": return protoreflect.ValueOfUint64(uint64(0)) - case "testdata.TableModel.name": + case "testpb.TableModel.name": return protoreflect.ValueOfString("") - case "testdata.TableModel.number": + case "testpb.TableModel.number": return protoreflect.ValueOfUint64(uint64(0)) - case "testdata.TableModel.metadata": + case "testpb.TableModel.metadata": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TableModel")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TableModel")) } - panic(fmt.Errorf("message testdata.TableModel does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TableModel does not contain field %s", fd.FullName())) } } @@ -3605,7 +3605,7 @@ func (x *fastReflection_TableModel) NewField(fd protoreflect.FieldDescriptor) pr func (x *fastReflection_TableModel) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TableModel", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TableModel", d.FullName())) } panic("unreachable") } @@ -3919,7 +3919,7 @@ func (x *fastReflection_TableModel) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: testdata.proto +// source: testpb/testdata.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -3940,7 +3940,7 @@ type Dog struct { func (x *Dog) Reset() { *x = Dog{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[0] + mi := &file_testpb_testdata_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3954,7 +3954,7 @@ func (*Dog) ProtoMessage() {} // Deprecated: Use Dog.ProtoReflect.Descriptor instead. func (*Dog) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{0} + return file_testpb_testdata_proto_rawDescGZIP(), []int{0} } func (x *Dog) GetSize() string { @@ -3983,7 +3983,7 @@ type Cat struct { func (x *Cat) Reset() { *x = Cat{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[1] + mi := &file_testpb_testdata_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3997,7 +3997,7 @@ func (*Cat) ProtoMessage() {} // Deprecated: Use Cat.ProtoReflect.Descriptor instead. func (*Cat) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{1} + return file_testpb_testdata_proto_rawDescGZIP(), []int{1} } func (x *Cat) GetMoniker() string { @@ -4026,7 +4026,7 @@ type Bird struct { func (x *Bird) Reset() { *x = Bird{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[2] + mi := &file_testpb_testdata_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4040,7 +4040,7 @@ func (*Bird) ProtoMessage() {} // Deprecated: Use Bird.ProtoReflect.Descriptor instead. func (*Bird) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{2} + return file_testpb_testdata_proto_rawDescGZIP(), []int{2} } func (x *Bird) GetSpecies() string { @@ -4069,7 +4069,7 @@ type HasAnimal struct { func (x *HasAnimal) Reset() { *x = HasAnimal{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[3] + mi := &file_testpb_testdata_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4083,7 +4083,7 @@ func (*HasAnimal) ProtoMessage() {} // Deprecated: Use HasAnimal.ProtoReflect.Descriptor instead. func (*HasAnimal) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{3} + return file_testpb_testdata_proto_rawDescGZIP(), []int{3} } func (x *HasAnimal) GetAnimal() *anypb.Any { @@ -4111,7 +4111,7 @@ type HasHasAnimal struct { func (x *HasHasAnimal) Reset() { *x = HasHasAnimal{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[4] + mi := &file_testpb_testdata_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4125,7 +4125,7 @@ func (*HasHasAnimal) ProtoMessage() {} // Deprecated: Use HasHasAnimal.ProtoReflect.Descriptor instead. func (*HasHasAnimal) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{4} + return file_testpb_testdata_proto_rawDescGZIP(), []int{4} } func (x *HasHasAnimal) GetHasAnimal() *anypb.Any { @@ -4146,7 +4146,7 @@ type HasHasHasAnimal struct { func (x *HasHasHasAnimal) Reset() { *x = HasHasHasAnimal{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[5] + mi := &file_testpb_testdata_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4160,7 +4160,7 @@ func (*HasHasHasAnimal) ProtoMessage() {} // Deprecated: Use HasHasHasAnimal.ProtoReflect.Descriptor instead. func (*HasHasHasAnimal) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{5} + return file_testpb_testdata_proto_rawDescGZIP(), []int{5} } func (x *HasHasHasAnimal) GetHasHasAnimal() *anypb.Any { @@ -4183,7 +4183,7 @@ type BadMultiSignature struct { func (x *BadMultiSignature) Reset() { *x = BadMultiSignature{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[6] + mi := &file_testpb_testdata_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4197,7 +4197,7 @@ func (*BadMultiSignature) ProtoMessage() {} // Deprecated: Use BadMultiSignature.ProtoReflect.Descriptor instead. func (*BadMultiSignature) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{6} + return file_testpb_testdata_proto_rawDescGZIP(), []int{6} } func (x *BadMultiSignature) GetSignatures() [][]byte { @@ -4228,7 +4228,7 @@ type TableModel struct { func (x *TableModel) Reset() { *x = TableModel{} if protoimpl.UnsafeEnabled { - mi := &file_testdata_proto_msgTypes[7] + mi := &file_testpb_testdata_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4242,7 +4242,7 @@ func (*TableModel) ProtoMessage() {} // Deprecated: Use TableModel.ProtoReflect.Descriptor instead. func (*TableModel) Descriptor() ([]byte, []int) { - return file_testdata_proto_rawDescGZIP(), []int{7} + return file_testpb_testdata_proto_rawDescGZIP(), []int{7} } func (x *TableModel) GetId() uint64 { @@ -4273,90 +4273,91 @@ func (x *TableModel) GetMetadata() []byte { return nil } -var File_testdata_proto protoreflect.FileDescriptor - -var file_testdata_proto_rawDesc = []byte{ - 0x0a, 0x0e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x12, 0x08, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 0x0a, 0x03, 0x44, - 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x35, 0x0a, 0x03, 0x43, 0x61, - 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6c, - 0x69, 0x76, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x69, 0x76, 0x65, - 0x73, 0x22, 0x36, 0x0a, 0x04, 0x42, 0x69, 0x72, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x70, 0x65, - 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x70, 0x65, 0x63, - 0x69, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x47, 0x0a, 0x09, 0x48, 0x61, 0x73, - 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x06, 0x61, 0x6e, - 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x01, 0x78, 0x22, 0x43, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, - 0x61, 0x6c, 0x12, 0x33, 0x0a, 0x0a, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x09, 0x68, 0x61, - 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x22, 0x4d, 0x0a, 0x0f, 0x48, 0x61, 0x73, 0x48, 0x61, - 0x73, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x3a, 0x0a, 0x0e, 0x68, 0x61, - 0x73, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0c, 0x68, 0x61, 0x73, 0x48, 0x61, 0x73, - 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x22, 0x62, 0x0a, 0x11, 0x42, 0x61, 0x64, 0x4d, 0x75, 0x6c, - 0x74, 0x69, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, - 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x6d, - 0x61, 0x6c, 0x69, 0x63, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6d, 0x61, 0x6c, 0x69, 0x63, 0x69, 0x6f, 0x75, 0x73, 0x46, - 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x04, 0xd0, 0xa1, 0x1f, 0x01, 0x22, 0x64, 0x0a, 0x0a, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, - 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x6e, 0x75, - 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x42, 0x94, 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x42, 0x0d, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, - 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, - 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, 0x61, 0x72, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, - 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0xca, 0x02, 0x08, 0x54, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0xe2, 0x02, 0x14, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x54, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_testpb_testdata_proto protoreflect.FileDescriptor + +var file_testpb_testdata_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, + 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x1a, + 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x2d, 0x0a, 0x03, 0x44, 0x6f, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x35, 0x0a, 0x03, 0x43, 0x61, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x6f, 0x6e, 0x69, 0x6b, 0x65, 0x72, + 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x76, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x6c, 0x69, 0x76, 0x65, 0x73, 0x22, 0x36, 0x0a, 0x04, 0x42, 0x69, 0x72, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x70, 0x65, 0x63, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x73, 0x70, 0x65, 0x63, 0x69, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x22, 0x47, + 0x0a, 0x09, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x2c, 0x0a, 0x06, 0x61, + 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x06, 0x61, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x22, 0x43, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x48, 0x61, + 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, 0x33, 0x0a, 0x0a, 0x68, 0x61, 0x73, 0x5f, 0x61, + 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x09, 0x68, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x22, 0x4d, 0x0a, 0x0f, + 0x48, 0x61, 0x73, 0x48, 0x61, 0x73, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x12, + 0x3a, 0x0a, 0x0e, 0x68, 0x61, 0x73, 0x5f, 0x68, 0x61, 0x73, 0x5f, 0x61, 0x6e, 0x69, 0x6d, 0x61, + 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0c, 0x68, + 0x61, 0x73, 0x48, 0x61, 0x73, 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x6c, 0x22, 0x62, 0x0a, 0x11, 0x42, + 0x61, 0x64, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x12, 0x27, 0x0a, 0x0f, 0x6d, 0x61, 0x6c, 0x69, 0x63, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x66, 0x69, + 0x65, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6d, 0x61, 0x6c, 0x69, 0x63, + 0x69, 0x6f, 0x75, 0x73, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x04, 0xd0, 0xa1, 0x1f, 0x01, 0x22, + 0x64, 0x0a, 0x0a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x91, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x42, 0x0d, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, + 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, + 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, 0x61, 0x72, 0x2f, 0x74, 0x65, 0x73, + 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, + 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xe2, 0x02, 0x12, 0x54, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( - file_testdata_proto_rawDescOnce sync.Once - file_testdata_proto_rawDescData = file_testdata_proto_rawDesc + file_testpb_testdata_proto_rawDescOnce sync.Once + file_testpb_testdata_proto_rawDescData = file_testpb_testdata_proto_rawDesc ) -func file_testdata_proto_rawDescGZIP() []byte { - file_testdata_proto_rawDescOnce.Do(func() { - file_testdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_testdata_proto_rawDescData) +func file_testpb_testdata_proto_rawDescGZIP() []byte { + file_testpb_testdata_proto_rawDescOnce.Do(func() { + file_testpb_testdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_testpb_testdata_proto_rawDescData) }) - return file_testdata_proto_rawDescData -} - -var file_testdata_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_testdata_proto_goTypes = []interface{}{ - (*Dog)(nil), // 0: testdata.Dog - (*Cat)(nil), // 1: testdata.Cat - (*Bird)(nil), // 2: testdata.Bird - (*HasAnimal)(nil), // 3: testdata.HasAnimal - (*HasHasAnimal)(nil), // 4: testdata.HasHasAnimal - (*HasHasHasAnimal)(nil), // 5: testdata.HasHasHasAnimal - (*BadMultiSignature)(nil), // 6: testdata.BadMultiSignature - (*TableModel)(nil), // 7: testdata.TableModel + return file_testpb_testdata_proto_rawDescData +} + +var file_testpb_testdata_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_testpb_testdata_proto_goTypes = []interface{}{ + (*Dog)(nil), // 0: testpb.Dog + (*Cat)(nil), // 1: testpb.Cat + (*Bird)(nil), // 2: testpb.Bird + (*HasAnimal)(nil), // 3: testpb.HasAnimal + (*HasHasAnimal)(nil), // 4: testpb.HasHasAnimal + (*HasHasHasAnimal)(nil), // 5: testpb.HasHasHasAnimal + (*BadMultiSignature)(nil), // 6: testpb.BadMultiSignature + (*TableModel)(nil), // 7: testpb.TableModel (*anypb.Any)(nil), // 8: google.protobuf.Any } -var file_testdata_proto_depIdxs = []int32{ - 8, // 0: testdata.HasAnimal.animal:type_name -> google.protobuf.Any - 8, // 1: testdata.HasHasAnimal.has_animal:type_name -> google.protobuf.Any - 8, // 2: testdata.HasHasHasAnimal.has_has_animal:type_name -> google.protobuf.Any +var file_testpb_testdata_proto_depIdxs = []int32{ + 8, // 0: testpb.HasAnimal.animal:type_name -> google.protobuf.Any + 8, // 1: testpb.HasHasAnimal.has_animal:type_name -> google.protobuf.Any + 8, // 2: testpb.HasHasHasAnimal.has_has_animal:type_name -> google.protobuf.Any 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -4364,13 +4365,13 @@ var file_testdata_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -func init() { file_testdata_proto_init() } -func file_testdata_proto_init() { - if File_testdata_proto != nil { +func init() { file_testpb_testdata_proto_init() } +func file_testpb_testdata_proto_init() { + if File_testpb_testdata_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_testdata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Dog); i { case 0: return &v.state @@ -4382,7 +4383,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Cat); i { case 0: return &v.state @@ -4394,7 +4395,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Bird); i { case 0: return &v.state @@ -4406,7 +4407,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HasAnimal); i { case 0: return &v.state @@ -4418,7 +4419,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HasHasAnimal); i { case 0: return &v.state @@ -4430,7 +4431,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HasHasHasAnimal); i { case 0: return &v.state @@ -4442,7 +4443,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BadMultiSignature); i { case 0: return &v.state @@ -4454,7 +4455,7 @@ func file_testdata_proto_init() { return nil } } - file_testdata_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_testpb_testdata_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TableModel); i { case 0: return &v.state @@ -4471,18 +4472,18 @@ func file_testdata_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_testdata_proto_rawDesc, + RawDescriptor: file_testpb_testdata_proto_rawDesc, NumEnums: 0, NumMessages: 8, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_testdata_proto_goTypes, - DependencyIndexes: file_testdata_proto_depIdxs, - MessageInfos: file_testdata_proto_msgTypes, + GoTypes: file_testpb_testdata_proto_goTypes, + DependencyIndexes: file_testpb_testdata_proto_depIdxs, + MessageInfos: file_testpb_testdata_proto_msgTypes, }.Build() - File_testdata_proto = out.File - file_testdata_proto_rawDesc = nil - file_testdata_proto_goTypes = nil - file_testdata_proto_depIdxs = nil + File_testpb_testdata_proto = out.File + file_testpb_testdata_proto_rawDesc = nil + file_testpb_testdata_proto_goTypes = nil + file_testpb_testdata_proto_depIdxs = nil } diff --git a/testutil/testdata/tx.proto b/testutil/testdata/testpb/tx.proto similarity index 89% rename from testutil/testdata/tx.proto rename to testutil/testdata/testpb/tx.proto index eaeb9580e5..2e57056945 100644 --- a/testutil/testdata/tx.proto +++ b/testutil/testdata/testpb/tx.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package testdata; +package testpb; import "gogoproto/gogo.proto"; -import "testdata.proto"; +import "testpb/testdata.proto"; option go_package = "github.com/cosmos/cosmos-sdk/testutil/testdata"; @@ -13,7 +13,7 @@ service Msg { } message MsgCreateDog { - testdata.Dog dog = 1; + testpb.Dog dog = 1; } message MsgCreateDogResponse { diff --git a/testutil/testdata_pulsar/tx.pulsar.go b/testutil/testdata/testpb/tx.pulsar.go similarity index 85% rename from testutil/testdata_pulsar/tx.pulsar.go rename to testutil/testdata/testpb/tx.pulsar.go index 1f171f9bd9..e423bb6000 100644 --- a/testutil/testdata_pulsar/tx.pulsar.go +++ b/testutil/testdata/testpb/tx.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package testdata_pulsar +package testpb import ( fmt "fmt" @@ -19,8 +19,8 @@ var ( ) func init() { - file_tx_proto_init() - md_MsgCreateDog = File_tx_proto.Messages().ByName("MsgCreateDog") + file_testpb_tx_proto_init() + md_MsgCreateDog = File_testpb_tx_proto.Messages().ByName("MsgCreateDog") fd_MsgCreateDog_dog = md_MsgCreateDog.Fields().ByName("dog") } @@ -33,7 +33,7 @@ func (x *MsgCreateDog) ProtoReflect() protoreflect.Message { } func (x *MsgCreateDog) slowProtoReflect() protoreflect.Message { - mi := &file_tx_proto_msgTypes[0] + mi := &file_testpb_tx_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -110,13 +110,13 @@ func (x *fastReflection_MsgCreateDog) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgCreateDog) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": return x.Dog != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", fd.FullName())) } } @@ -128,13 +128,13 @@ func (x *fastReflection_MsgCreateDog) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDog) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": x.Dog = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", fd.FullName())) } } @@ -146,14 +146,14 @@ func (x *fastReflection_MsgCreateDog) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgCreateDog) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": value := x.Dog return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", descriptor.FullName())) } } @@ -169,13 +169,13 @@ func (x *fastReflection_MsgCreateDog) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDog) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": x.Dog = value.Message().Interface().(*Dog) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", fd.FullName())) } } @@ -191,16 +191,16 @@ func (x *fastReflection_MsgCreateDog) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDog) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": if x.Dog == nil { x.Dog = new(Dog) } return protoreflect.ValueOfMessage(x.Dog.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", fd.FullName())) } } @@ -209,14 +209,14 @@ func (x *fastReflection_MsgCreateDog) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgCreateDog) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.MsgCreateDog.dog": + case "testpb.MsgCreateDog.dog": m := new(Dog) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDog")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDog")) } - panic(fmt.Errorf("message testdata.MsgCreateDog does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDog does not contain field %s", fd.FullName())) } } @@ -226,7 +226,7 @@ func (x *fastReflection_MsgCreateDog) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_MsgCreateDog) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.MsgCreateDog", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.MsgCreateDog", d.FullName())) } panic("unreachable") } @@ -454,8 +454,8 @@ var ( ) func init() { - file_tx_proto_init() - md_MsgCreateDogResponse = File_tx_proto.Messages().ByName("MsgCreateDogResponse") + file_testpb_tx_proto_init() + md_MsgCreateDogResponse = File_testpb_tx_proto.Messages().ByName("MsgCreateDogResponse") fd_MsgCreateDogResponse_name = md_MsgCreateDogResponse.Fields().ByName("name") } @@ -468,7 +468,7 @@ func (x *MsgCreateDogResponse) ProtoReflect() protoreflect.Message { } func (x *MsgCreateDogResponse) slowProtoReflect() protoreflect.Message { - mi := &file_tx_proto_msgTypes[1] + mi := &file_testpb_tx_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -545,13 +545,13 @@ func (x *fastReflection_MsgCreateDogResponse) Range(f func(protoreflect.FieldDes // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgCreateDogResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.MsgCreateDogResponse.name": + case "testpb.MsgCreateDogResponse.name": return x.Name != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", fd.FullName())) } } @@ -563,13 +563,13 @@ func (x *fastReflection_MsgCreateDogResponse) Has(fd protoreflect.FieldDescripto // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDogResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.MsgCreateDogResponse.name": + case "testpb.MsgCreateDogResponse.name": x.Name = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", fd.FullName())) } } @@ -581,14 +581,14 @@ func (x *fastReflection_MsgCreateDogResponse) Clear(fd protoreflect.FieldDescrip // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgCreateDogResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.MsgCreateDogResponse.name": + case "testpb.MsgCreateDogResponse.name": value := x.Name return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", descriptor.FullName())) } } @@ -604,13 +604,13 @@ func (x *fastReflection_MsgCreateDogResponse) Get(descriptor protoreflect.FieldD // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDogResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.MsgCreateDogResponse.name": + case "testpb.MsgCreateDogResponse.name": x.Name = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", fd.FullName())) } } @@ -626,13 +626,13 @@ func (x *fastReflection_MsgCreateDogResponse) Set(fd protoreflect.FieldDescripto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCreateDogResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.MsgCreateDogResponse.name": - panic(fmt.Errorf("field name of message testdata.MsgCreateDogResponse is not mutable")) + case "testpb.MsgCreateDogResponse.name": + panic(fmt.Errorf("field name of message testpb.MsgCreateDogResponse is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", fd.FullName())) } } @@ -641,13 +641,13 @@ func (x *fastReflection_MsgCreateDogResponse) Mutable(fd protoreflect.FieldDescr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgCreateDogResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.MsgCreateDogResponse.name": + case "testpb.MsgCreateDogResponse.name": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.MsgCreateDogResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.MsgCreateDogResponse")) } - panic(fmt.Errorf("message testdata.MsgCreateDogResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.MsgCreateDogResponse does not contain field %s", fd.FullName())) } } @@ -657,7 +657,7 @@ func (x *fastReflection_MsgCreateDogResponse) NewField(fd protoreflect.FieldDesc func (x *fastReflection_MsgCreateDogResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.MsgCreateDogResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.MsgCreateDogResponse", d.FullName())) } panic("unreachable") } @@ -920,8 +920,8 @@ var ( ) func init() { - file_tx_proto_init() - md_TestMsg = File_tx_proto.Messages().ByName("TestMsg") + file_testpb_tx_proto_init() + md_TestMsg = File_testpb_tx_proto.Messages().ByName("TestMsg") fd_TestMsg_signers = md_TestMsg.Fields().ByName("signers") } @@ -934,7 +934,7 @@ func (x *TestMsg) ProtoReflect() protoreflect.Message { } func (x *TestMsg) slowProtoReflect() protoreflect.Message { - mi := &file_tx_proto_msgTypes[2] + mi := &file_testpb_tx_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1011,13 +1011,13 @@ func (x *fastReflection_TestMsg) Range(f func(protoreflect.FieldDescriptor, prot // a repeated field is populated if it is non-empty. func (x *fastReflection_TestMsg) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": return len(x.Signers) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", fd.FullName())) } } @@ -1029,13 +1029,13 @@ func (x *fastReflection_TestMsg) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestMsg) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": x.Signers = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", fd.FullName())) } } @@ -1047,7 +1047,7 @@ func (x *fastReflection_TestMsg) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestMsg) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": if len(x.Signers) == 0 { return protoreflect.ValueOfList(&_TestMsg_1_list{}) } @@ -1055,9 +1055,9 @@ func (x *fastReflection_TestMsg) Get(descriptor protoreflect.FieldDescriptor) pr return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", descriptor.FullName())) } } @@ -1073,15 +1073,15 @@ func (x *fastReflection_TestMsg) Get(descriptor protoreflect.FieldDescriptor) pr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestMsg) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": lv := value.List() clv := lv.(*_TestMsg_1_list) x.Signers = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", fd.FullName())) } } @@ -1097,7 +1097,7 @@ func (x *fastReflection_TestMsg) Set(fd protoreflect.FieldDescriptor, value prot // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestMsg) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": if x.Signers == nil { x.Signers = []string{} } @@ -1105,9 +1105,9 @@ func (x *fastReflection_TestMsg) Mutable(fd protoreflect.FieldDescriptor) protor return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", fd.FullName())) } } @@ -1116,14 +1116,14 @@ func (x *fastReflection_TestMsg) Mutable(fd protoreflect.FieldDescriptor) protor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestMsg) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestMsg.signers": + case "testpb.TestMsg.signers": list := []string{} return protoreflect.ValueOfList(&_TestMsg_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestMsg")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestMsg")) } - panic(fmt.Errorf("message testdata.TestMsg does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestMsg does not contain field %s", fd.FullName())) } } @@ -1133,7 +1133,7 @@ func (x *fastReflection_TestMsg) NewField(fd protoreflect.FieldDescriptor) proto func (x *fastReflection_TestMsg) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestMsg", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestMsg", d.FullName())) } panic("unreachable") } @@ -1352,7 +1352,7 @@ func (x *fastReflection_TestMsg) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: tx.proto +// source: testpb/tx.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -1372,7 +1372,7 @@ type MsgCreateDog struct { func (x *MsgCreateDog) Reset() { *x = MsgCreateDog{} if protoimpl.UnsafeEnabled { - mi := &file_tx_proto_msgTypes[0] + mi := &file_testpb_tx_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1386,7 +1386,7 @@ func (*MsgCreateDog) ProtoMessage() {} // Deprecated: Use MsgCreateDog.ProtoReflect.Descriptor instead. func (*MsgCreateDog) Descriptor() ([]byte, []int) { - return file_tx_proto_rawDescGZIP(), []int{0} + return file_testpb_tx_proto_rawDescGZIP(), []int{0} } func (x *MsgCreateDog) GetDog() *Dog { @@ -1407,7 +1407,7 @@ type MsgCreateDogResponse struct { func (x *MsgCreateDogResponse) Reset() { *x = MsgCreateDogResponse{} if protoimpl.UnsafeEnabled { - mi := &file_tx_proto_msgTypes[1] + mi := &file_testpb_tx_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1421,7 +1421,7 @@ func (*MsgCreateDogResponse) ProtoMessage() {} // Deprecated: Use MsgCreateDogResponse.ProtoReflect.Descriptor instead. func (*MsgCreateDogResponse) Descriptor() ([]byte, []int) { - return file_tx_proto_rawDescGZIP(), []int{1} + return file_testpb_tx_proto_rawDescGZIP(), []int{1} } func (x *MsgCreateDogResponse) GetName() string { @@ -1444,7 +1444,7 @@ type TestMsg struct { func (x *TestMsg) Reset() { *x = TestMsg{} if protoimpl.UnsafeEnabled { - mi := &file_tx_proto_msgTypes[2] + mi := &file_testpb_tx_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1458,7 +1458,7 @@ func (*TestMsg) ProtoMessage() {} // Deprecated: Use TestMsg.ProtoReflect.Descriptor instead. func (*TestMsg) Descriptor() ([]byte, []int) { - return file_tx_proto_rawDescGZIP(), []int{2} + return file_testpb_tx_proto_rawDescGZIP(), []int{2} } func (x *TestMsg) GetSigners() []string { @@ -1468,61 +1468,61 @@ func (x *TestMsg) GetSigners() []string { return nil } -var File_tx_proto protoreflect.FileDescriptor - -var file_tx_proto_rawDesc = []byte{ - 0x0a, 0x08, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0e, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2f, 0x0a, 0x0c, 0x4d, 0x73, - 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x12, 0x1f, 0x0a, 0x03, 0x64, 0x6f, - 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, - 0x74, 0x61, 0x2e, 0x44, 0x6f, 0x67, 0x52, 0x03, 0x64, 0x6f, 0x67, 0x22, 0x2a, 0x0a, 0x14, 0x4d, - 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x29, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x4d, - 0x73, 0x67, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x3a, 0x04, 0x88, 0xa0, - 0x1f, 0x00, 0x32, 0x4a, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x43, 0x0a, 0x09, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x12, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x1a, 0x1e, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x8e, - 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x42, - 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, - 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, - 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, 0x61, - 0x72, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, - 0x74, 0x61, 0xca, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0xe2, 0x02, 0x14, - 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_testpb_tx_proto protoreflect.FileDescriptor + +var file_testpb_tx_proto_rawDesc = []byte{ + 0x0a, 0x0f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x12, 0x06, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x15, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x12, 0x1d, 0x0a, 0x03, 0x64, 0x6f, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x44, 0x6f, 0x67, + 0x52, 0x03, 0x64, 0x6f, 0x67, 0x22, 0x2a, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x44, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x29, 0x0a, 0x07, 0x54, 0x65, 0x73, 0x74, 0x4d, 0x73, 0x67, 0x12, 0x18, 0x0a, 0x07, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, + 0x69, 0x67, 0x6e, 0x65, 0x72, 0x73, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, 0x32, 0x46, 0x0a, 0x03, + 0x4d, 0x73, 0x67, 0x12, 0x3f, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, + 0x12, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x1a, 0x1c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x8b, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x70, 0x62, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, + 0x74, 0x75, 0x74, 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, + 0x75, 0x6c, 0x73, 0x61, 0x72, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, + 0x58, 0x58, 0xaa, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, + 0x73, 0x74, 0x70, 0x62, 0xe2, 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_tx_proto_rawDescOnce sync.Once - file_tx_proto_rawDescData = file_tx_proto_rawDesc + file_testpb_tx_proto_rawDescOnce sync.Once + file_testpb_tx_proto_rawDescData = file_testpb_tx_proto_rawDesc ) -func file_tx_proto_rawDescGZIP() []byte { - file_tx_proto_rawDescOnce.Do(func() { - file_tx_proto_rawDescData = protoimpl.X.CompressGZIP(file_tx_proto_rawDescData) +func file_testpb_tx_proto_rawDescGZIP() []byte { + file_testpb_tx_proto_rawDescOnce.Do(func() { + file_testpb_tx_proto_rawDescData = protoimpl.X.CompressGZIP(file_testpb_tx_proto_rawDescData) }) - return file_tx_proto_rawDescData + return file_testpb_tx_proto_rawDescData } -var file_tx_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_tx_proto_goTypes = []interface{}{ - (*MsgCreateDog)(nil), // 0: testdata.MsgCreateDog - (*MsgCreateDogResponse)(nil), // 1: testdata.MsgCreateDogResponse - (*TestMsg)(nil), // 2: testdata.TestMsg - (*Dog)(nil), // 3: testdata.Dog +var file_testpb_tx_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_testpb_tx_proto_goTypes = []interface{}{ + (*MsgCreateDog)(nil), // 0: testpb.MsgCreateDog + (*MsgCreateDogResponse)(nil), // 1: testpb.MsgCreateDogResponse + (*TestMsg)(nil), // 2: testpb.TestMsg + (*Dog)(nil), // 3: testpb.Dog } -var file_tx_proto_depIdxs = []int32{ - 3, // 0: testdata.MsgCreateDog.dog:type_name -> testdata.Dog - 0, // 1: testdata.Msg.CreateDog:input_type -> testdata.MsgCreateDog - 1, // 2: testdata.Msg.CreateDog:output_type -> testdata.MsgCreateDogResponse +var file_testpb_tx_proto_depIdxs = []int32{ + 3, // 0: testpb.MsgCreateDog.dog:type_name -> testpb.Dog + 0, // 1: testpb.Msg.CreateDog:input_type -> testpb.MsgCreateDog + 1, // 2: testpb.Msg.CreateDog:output_type -> testpb.MsgCreateDogResponse 2, // [2:3] is the sub-list for method output_type 1, // [1:2] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -1530,14 +1530,14 @@ var file_tx_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_tx_proto_init() } -func file_tx_proto_init() { - if File_tx_proto != nil { +func init() { file_testpb_tx_proto_init() } +func file_testpb_tx_proto_init() { + if File_testpb_tx_proto != nil { return } - file_testdata_proto_init() + file_testpb_testdata_proto_init() if !protoimpl.UnsafeEnabled { - file_tx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_testpb_tx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MsgCreateDog); i { case 0: return &v.state @@ -1549,7 +1549,7 @@ func file_tx_proto_init() { return nil } } - file_tx_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_testpb_tx_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MsgCreateDogResponse); i { case 0: return &v.state @@ -1561,7 +1561,7 @@ func file_tx_proto_init() { return nil } } - file_tx_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_testpb_tx_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestMsg); i { case 0: return &v.state @@ -1578,18 +1578,18 @@ func file_tx_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tx_proto_rawDesc, + RawDescriptor: file_testpb_tx_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_tx_proto_goTypes, - DependencyIndexes: file_tx_proto_depIdxs, - MessageInfos: file_tx_proto_msgTypes, + GoTypes: file_testpb_tx_proto_goTypes, + DependencyIndexes: file_testpb_tx_proto_depIdxs, + MessageInfos: file_testpb_tx_proto_msgTypes, }.Build() - File_tx_proto = out.File - file_tx_proto_rawDesc = nil - file_tx_proto_goTypes = nil - file_tx_proto_depIdxs = nil + File_testpb_tx_proto = out.File + file_testpb_tx_proto_rawDesc = nil + file_testpb_tx_proto_goTypes = nil + file_testpb_tx_proto_depIdxs = nil } diff --git a/testutil/testdata_pulsar/tx_grpc.pb.go b/testutil/testdata/testpb/tx_grpc.pb.go similarity index 95% rename from testutil/testdata_pulsar/tx_grpc.pb.go rename to testutil/testdata/testpb/tx_grpc.pb.go index 3555aeb28e..3971c84d77 100644 --- a/testutil/testdata_pulsar/tx_grpc.pb.go +++ b/testutil/testdata/testpb/tx_grpc.pb.go @@ -2,9 +2,9 @@ // versions: // - protoc-gen-go-grpc v1.3.0 // - protoc (unknown) -// source: tx.proto +// source: testpb/tx.proto -package testdata_pulsar +package testpb import ( context "context" @@ -19,7 +19,7 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - Msg_CreateDog_FullMethodName = "/testdata.Msg/CreateDog" + Msg_CreateDog_FullMethodName = "/testpb.Msg/CreateDog" ) // MsgClient is the client API for Msg service. @@ -96,7 +96,7 @@ func _Msg_CreateDog_Handler(srv interface{}, ctx context.Context, dec func(inter // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) var Msg_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Msg", + ServiceName: "testpb.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -105,5 +105,5 @@ var Msg_ServiceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tx.proto", + Metadata: "testpb/tx.proto", } diff --git a/testutil/testdata/unknonwnproto.proto b/testutil/testdata/testpb/unknonwnproto.proto similarity index 99% rename from testutil/testdata/unknonwnproto.proto rename to testutil/testdata/testpb/unknonwnproto.proto index 7bf1ce6bba..ac91b9e2a6 100644 --- a/testutil/testdata/unknonwnproto.proto +++ b/testutil/testdata/testpb/unknonwnproto.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package testdata; +package testpb; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; diff --git a/testutil/testdata_pulsar/unknonwnproto.pulsar.go b/testutil/testdata/testpb/unknonwnproto.pulsar.go similarity index 86% rename from testutil/testdata_pulsar/unknonwnproto.pulsar.go rename to testutil/testdata/testpb/unknonwnproto.pulsar.go index 9ef41ed607..84dbe6fbdb 100644 --- a/testutil/testdata_pulsar/unknonwnproto.pulsar.go +++ b/testutil/testdata/testpb/unknonwnproto.pulsar.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go-pulsar. DO NOT EDIT. -package testdata_pulsar +package testpb import ( v1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1" @@ -27,8 +27,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Customer1 = File_unknonwnproto_proto.Messages().ByName("Customer1") + file_testpb_unknonwnproto_proto_init() + md_Customer1 = File_testpb_unknonwnproto_proto.Messages().ByName("Customer1") fd_Customer1_id = md_Customer1.Fields().ByName("id") fd_Customer1_name = md_Customer1.Fields().ByName("name") fd_Customer1_subscription_fee = md_Customer1.Fields().ByName("subscription_fee") @@ -44,7 +44,7 @@ func (x *Customer1) ProtoReflect() protoreflect.Message { } func (x *Customer1) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[0] + mi := &file_testpb_unknonwnproto_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -139,19 +139,19 @@ func (x *fastReflection_Customer1) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_Customer1) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Customer1.id": + case "testpb.Customer1.id": return x.Id != int32(0) - case "testdata.Customer1.name": + case "testpb.Customer1.name": return x.Name != "" - case "testdata.Customer1.subscription_fee": + case "testpb.Customer1.subscription_fee": return x.SubscriptionFee != float32(0) || math.Signbit(float64(x.SubscriptionFee)) - case "testdata.Customer1.payment": + case "testpb.Customer1.payment": return x.Payment != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", fd.FullName())) } } @@ -163,19 +163,19 @@ func (x *fastReflection_Customer1) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer1) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Customer1.id": + case "testpb.Customer1.id": x.Id = int32(0) - case "testdata.Customer1.name": + case "testpb.Customer1.name": x.Name = "" - case "testdata.Customer1.subscription_fee": + case "testpb.Customer1.subscription_fee": x.SubscriptionFee = float32(0) - case "testdata.Customer1.payment": + case "testpb.Customer1.payment": x.Payment = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", fd.FullName())) } } @@ -187,23 +187,23 @@ func (x *fastReflection_Customer1) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Customer1) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Customer1.id": + case "testpb.Customer1.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Customer1.name": + case "testpb.Customer1.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Customer1.subscription_fee": + case "testpb.Customer1.subscription_fee": value := x.SubscriptionFee return protoreflect.ValueOfFloat32(value) - case "testdata.Customer1.payment": + case "testpb.Customer1.payment": value := x.Payment return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", descriptor.FullName())) } } @@ -219,19 +219,19 @@ func (x *fastReflection_Customer1) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer1) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Customer1.id": + case "testpb.Customer1.id": x.Id = int32(value.Int()) - case "testdata.Customer1.name": + case "testpb.Customer1.name": x.Name = value.Interface().(string) - case "testdata.Customer1.subscription_fee": + case "testpb.Customer1.subscription_fee": x.SubscriptionFee = float32(value.Float()) - case "testdata.Customer1.payment": + case "testpb.Customer1.payment": x.Payment = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", fd.FullName())) } } @@ -247,19 +247,19 @@ func (x *fastReflection_Customer1) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer1) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer1.id": - panic(fmt.Errorf("field id of message testdata.Customer1 is not mutable")) - case "testdata.Customer1.name": - panic(fmt.Errorf("field name of message testdata.Customer1 is not mutable")) - case "testdata.Customer1.subscription_fee": - panic(fmt.Errorf("field subscription_fee of message testdata.Customer1 is not mutable")) - case "testdata.Customer1.payment": - panic(fmt.Errorf("field payment of message testdata.Customer1 is not mutable")) + case "testpb.Customer1.id": + panic(fmt.Errorf("field id of message testpb.Customer1 is not mutable")) + case "testpb.Customer1.name": + panic(fmt.Errorf("field name of message testpb.Customer1 is not mutable")) + case "testpb.Customer1.subscription_fee": + panic(fmt.Errorf("field subscription_fee of message testpb.Customer1 is not mutable")) + case "testpb.Customer1.payment": + panic(fmt.Errorf("field payment of message testpb.Customer1 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", fd.FullName())) } } @@ -268,19 +268,19 @@ func (x *fastReflection_Customer1) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Customer1) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer1.id": + case "testpb.Customer1.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Customer1.name": + case "testpb.Customer1.name": return protoreflect.ValueOfString("") - case "testdata.Customer1.subscription_fee": + case "testpb.Customer1.subscription_fee": return protoreflect.ValueOfFloat32(float32(0)) - case "testdata.Customer1.payment": + case "testpb.Customer1.payment": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer1")) } - panic(fmt.Errorf("message testdata.Customer1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer1 does not contain field %s", fd.FullName())) } } @@ -290,7 +290,7 @@ func (x *fastReflection_Customer1) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_Customer1) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Customer1", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Customer1", d.FullName())) } panic("unreachable") } @@ -603,8 +603,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Customer2 = File_unknonwnproto_proto.Messages().ByName("Customer2") + file_testpb_unknonwnproto_proto_init() + md_Customer2 = File_testpb_unknonwnproto_proto.Messages().ByName("Customer2") fd_Customer2_id = md_Customer2.Fields().ByName("id") fd_Customer2_industry = md_Customer2.Fields().ByName("industry") fd_Customer2_name = md_Customer2.Fields().ByName("name") @@ -623,7 +623,7 @@ func (x *Customer2) ProtoReflect() protoreflect.Message { } func (x *Customer2) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[1] + mi := &file_testpb_unknonwnproto_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -736,25 +736,25 @@ func (x *fastReflection_Customer2) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_Customer2) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Customer2.id": + case "testpb.Customer2.id": return x.Id != int32(0) - case "testdata.Customer2.industry": + case "testpb.Customer2.industry": return x.Industry != int32(0) - case "testdata.Customer2.name": + case "testpb.Customer2.name": return x.Name != "" - case "testdata.Customer2.fewer": + case "testpb.Customer2.fewer": return x.Fewer != float32(0) || math.Signbit(float64(x.Fewer)) - case "testdata.Customer2.reserved": + case "testpb.Customer2.reserved": return x.Reserved != int64(0) - case "testdata.Customer2.city": + case "testpb.Customer2.city": return x.City != 0 - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": return x.Miscellaneous != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", fd.FullName())) } } @@ -766,25 +766,25 @@ func (x *fastReflection_Customer2) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer2) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Customer2.id": + case "testpb.Customer2.id": x.Id = int32(0) - case "testdata.Customer2.industry": + case "testpb.Customer2.industry": x.Industry = int32(0) - case "testdata.Customer2.name": + case "testpb.Customer2.name": x.Name = "" - case "testdata.Customer2.fewer": + case "testpb.Customer2.fewer": x.Fewer = float32(0) - case "testdata.Customer2.reserved": + case "testpb.Customer2.reserved": x.Reserved = int64(0) - case "testdata.Customer2.city": + case "testpb.Customer2.city": x.City = 0 - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": x.Miscellaneous = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", fd.FullName())) } } @@ -796,32 +796,32 @@ func (x *fastReflection_Customer2) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Customer2) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Customer2.id": + case "testpb.Customer2.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Customer2.industry": + case "testpb.Customer2.industry": value := x.Industry return protoreflect.ValueOfInt32(value) - case "testdata.Customer2.name": + case "testpb.Customer2.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Customer2.fewer": + case "testpb.Customer2.fewer": value := x.Fewer return protoreflect.ValueOfFloat32(value) - case "testdata.Customer2.reserved": + case "testpb.Customer2.reserved": value := x.Reserved return protoreflect.ValueOfInt64(value) - case "testdata.Customer2.city": + case "testpb.Customer2.city": value := x.City return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": value := x.Miscellaneous return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", descriptor.FullName())) } } @@ -837,25 +837,25 @@ func (x *fastReflection_Customer2) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer2) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Customer2.id": + case "testpb.Customer2.id": x.Id = int32(value.Int()) - case "testdata.Customer2.industry": + case "testpb.Customer2.industry": x.Industry = int32(value.Int()) - case "testdata.Customer2.name": + case "testpb.Customer2.name": x.Name = value.Interface().(string) - case "testdata.Customer2.fewer": + case "testpb.Customer2.fewer": x.Fewer = float32(value.Float()) - case "testdata.Customer2.reserved": + case "testpb.Customer2.reserved": x.Reserved = value.Int() - case "testdata.Customer2.city": + case "testpb.Customer2.city": x.City = (Customer2_City)(value.Enum()) - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": x.Miscellaneous = value.Message().Interface().(*anypb.Any) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", fd.FullName())) } } @@ -871,28 +871,28 @@ func (x *fastReflection_Customer2) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer2) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": if x.Miscellaneous == nil { x.Miscellaneous = new(anypb.Any) } return protoreflect.ValueOfMessage(x.Miscellaneous.ProtoReflect()) - case "testdata.Customer2.id": - panic(fmt.Errorf("field id of message testdata.Customer2 is not mutable")) - case "testdata.Customer2.industry": - panic(fmt.Errorf("field industry of message testdata.Customer2 is not mutable")) - case "testdata.Customer2.name": - panic(fmt.Errorf("field name of message testdata.Customer2 is not mutable")) - case "testdata.Customer2.fewer": - panic(fmt.Errorf("field fewer of message testdata.Customer2 is not mutable")) - case "testdata.Customer2.reserved": - panic(fmt.Errorf("field reserved of message testdata.Customer2 is not mutable")) - case "testdata.Customer2.city": - panic(fmt.Errorf("field city of message testdata.Customer2 is not mutable")) + case "testpb.Customer2.id": + panic(fmt.Errorf("field id of message testpb.Customer2 is not mutable")) + case "testpb.Customer2.industry": + panic(fmt.Errorf("field industry of message testpb.Customer2 is not mutable")) + case "testpb.Customer2.name": + panic(fmt.Errorf("field name of message testpb.Customer2 is not mutable")) + case "testpb.Customer2.fewer": + panic(fmt.Errorf("field fewer of message testpb.Customer2 is not mutable")) + case "testpb.Customer2.reserved": + panic(fmt.Errorf("field reserved of message testpb.Customer2 is not mutable")) + case "testpb.Customer2.city": + panic(fmt.Errorf("field city of message testpb.Customer2 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", fd.FullName())) } } @@ -901,26 +901,26 @@ func (x *fastReflection_Customer2) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Customer2) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer2.id": + case "testpb.Customer2.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Customer2.industry": + case "testpb.Customer2.industry": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Customer2.name": + case "testpb.Customer2.name": return protoreflect.ValueOfString("") - case "testdata.Customer2.fewer": + case "testpb.Customer2.fewer": return protoreflect.ValueOfFloat32(float32(0)) - case "testdata.Customer2.reserved": + case "testpb.Customer2.reserved": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.Customer2.city": + case "testpb.Customer2.city": return protoreflect.ValueOfEnum(0) - case "testdata.Customer2.miscellaneous": + case "testpb.Customer2.miscellaneous": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer2")) } - panic(fmt.Errorf("message testdata.Customer2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer2 does not contain field %s", fd.FullName())) } } @@ -930,7 +930,7 @@ func (x *fastReflection_Customer2) NewField(fd protoreflect.FieldDescriptor) pro func (x *fastReflection_Customer2) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Customer2", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Customer2", d.FullName())) } panic("unreachable") } @@ -1332,8 +1332,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested4A = File_unknonwnproto_proto.Messages().ByName("Nested4A") + file_testpb_unknonwnproto_proto_init() + md_Nested4A = File_testpb_unknonwnproto_proto.Messages().ByName("Nested4A") fd_Nested4A_id = md_Nested4A.Fields().ByName("id") fd_Nested4A_name = md_Nested4A.Fields().ByName("name") } @@ -1347,7 +1347,7 @@ func (x *Nested4A) ProtoReflect() protoreflect.Message { } func (x *Nested4A) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[2] + mi := &file_testpb_unknonwnproto_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1430,15 +1430,15 @@ func (x *fastReflection_Nested4A) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested4A) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested4A.id": + case "testpb.Nested4A.id": return x.Id != int32(0) - case "testdata.Nested4A.name": + case "testpb.Nested4A.name": return x.Name != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", fd.FullName())) } } @@ -1450,15 +1450,15 @@ func (x *fastReflection_Nested4A) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4A) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested4A.id": + case "testpb.Nested4A.id": x.Id = int32(0) - case "testdata.Nested4A.name": + case "testpb.Nested4A.name": x.Name = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", fd.FullName())) } } @@ -1470,17 +1470,17 @@ func (x *fastReflection_Nested4A) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested4A) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested4A.id": + case "testpb.Nested4A.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested4A.name": + case "testpb.Nested4A.name": value := x.Name return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", descriptor.FullName())) } } @@ -1496,15 +1496,15 @@ func (x *fastReflection_Nested4A) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4A) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested4A.id": + case "testpb.Nested4A.id": x.Id = int32(value.Int()) - case "testdata.Nested4A.name": + case "testpb.Nested4A.name": x.Name = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", fd.FullName())) } } @@ -1520,15 +1520,15 @@ func (x *fastReflection_Nested4A) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4A) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested4A.id": - panic(fmt.Errorf("field id of message testdata.Nested4A is not mutable")) - case "testdata.Nested4A.name": - panic(fmt.Errorf("field name of message testdata.Nested4A is not mutable")) + case "testpb.Nested4A.id": + panic(fmt.Errorf("field id of message testpb.Nested4A is not mutable")) + case "testpb.Nested4A.name": + panic(fmt.Errorf("field name of message testpb.Nested4A is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", fd.FullName())) } } @@ -1537,15 +1537,15 @@ func (x *fastReflection_Nested4A) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested4A) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested4A.id": + case "testpb.Nested4A.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested4A.name": + case "testpb.Nested4A.name": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4A")) } - panic(fmt.Errorf("message testdata.Nested4A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4A does not contain field %s", fd.FullName())) } } @@ -1555,7 +1555,7 @@ func (x *fastReflection_Nested4A) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested4A) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested4A", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested4A", d.FullName())) } panic("unreachable") } @@ -1943,8 +1943,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested3A = File_unknonwnproto_proto.Messages().ByName("Nested3A") + file_testpb_unknonwnproto_proto_init() + md_Nested3A = File_testpb_unknonwnproto_proto.Messages().ByName("Nested3A") fd_Nested3A_id = md_Nested3A.Fields().ByName("id") fd_Nested3A_name = md_Nested3A.Fields().ByName("name") fd_Nested3A_a4 = md_Nested3A.Fields().ByName("a4") @@ -1960,7 +1960,7 @@ func (x *Nested3A) ProtoReflect() protoreflect.Message { } func (x *Nested3A) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[3] + mi := &file_testpb_unknonwnproto_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2055,19 +2055,19 @@ func (x *fastReflection_Nested3A) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested3A) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested3A.id": + case "testpb.Nested3A.id": return x.Id != int32(0) - case "testdata.Nested3A.name": + case "testpb.Nested3A.name": return x.Name != "" - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": return len(x.A4) != 0 - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": return len(x.Index) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", fd.FullName())) } } @@ -2079,19 +2079,19 @@ func (x *fastReflection_Nested3A) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3A) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested3A.id": + case "testpb.Nested3A.id": x.Id = int32(0) - case "testdata.Nested3A.name": + case "testpb.Nested3A.name": x.Name = "" - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": x.A4 = nil - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": x.Index = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", fd.FullName())) } } @@ -2103,19 +2103,19 @@ func (x *fastReflection_Nested3A) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested3A) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested3A.id": + case "testpb.Nested3A.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested3A.name": + case "testpb.Nested3A.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": if len(x.A4) == 0 { return protoreflect.ValueOfList(&_Nested3A_4_list{}) } listValue := &_Nested3A_4_list{list: &x.A4} return protoreflect.ValueOfList(listValue) - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": if len(x.Index) == 0 { return protoreflect.ValueOfMap(&_Nested3A_5_map{}) } @@ -2123,9 +2123,9 @@ func (x *fastReflection_Nested3A) Get(descriptor protoreflect.FieldDescriptor) p return protoreflect.ValueOfMap(mapValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", descriptor.FullName())) } } @@ -2141,23 +2141,23 @@ func (x *fastReflection_Nested3A) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3A) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested3A.id": + case "testpb.Nested3A.id": x.Id = int32(value.Int()) - case "testdata.Nested3A.name": + case "testpb.Nested3A.name": x.Name = value.Interface().(string) - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": lv := value.List() clv := lv.(*_Nested3A_4_list) x.A4 = *clv.list - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": mv := value.Map() cmv := mv.(*_Nested3A_5_map) x.Index = *cmv.m default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", fd.FullName())) } } @@ -2173,27 +2173,27 @@ func (x *fastReflection_Nested3A) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3A) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": if x.A4 == nil { x.A4 = []*Nested4A{} } value := &_Nested3A_4_list{list: &x.A4} return protoreflect.ValueOfList(value) - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": if x.Index == nil { x.Index = make(map[int64]*Nested4A) } value := &_Nested3A_5_map{m: &x.Index} return protoreflect.ValueOfMap(value) - case "testdata.Nested3A.id": - panic(fmt.Errorf("field id of message testdata.Nested3A is not mutable")) - case "testdata.Nested3A.name": - panic(fmt.Errorf("field name of message testdata.Nested3A is not mutable")) + case "testpb.Nested3A.id": + panic(fmt.Errorf("field id of message testpb.Nested3A is not mutable")) + case "testpb.Nested3A.name": + panic(fmt.Errorf("field name of message testpb.Nested3A is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", fd.FullName())) } } @@ -2202,21 +2202,21 @@ func (x *fastReflection_Nested3A) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested3A) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested3A.id": + case "testpb.Nested3A.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested3A.name": + case "testpb.Nested3A.name": return protoreflect.ValueOfString("") - case "testdata.Nested3A.a4": + case "testpb.Nested3A.a4": list := []*Nested4A{} return protoreflect.ValueOfList(&_Nested3A_4_list{list: &list}) - case "testdata.Nested3A.index": + case "testpb.Nested3A.index": m := make(map[int64]*Nested4A) return protoreflect.ValueOfMap(&_Nested3A_5_map{m: &m}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3A")) } - panic(fmt.Errorf("message testdata.Nested3A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3A does not contain field %s", fd.FullName())) } } @@ -2226,7 +2226,7 @@ func (x *fastReflection_Nested3A) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested3A) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested3A", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested3A", d.FullName())) } panic("unreachable") } @@ -2719,8 +2719,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested2A = File_unknonwnproto_proto.Messages().ByName("Nested2A") + file_testpb_unknonwnproto_proto_init() + md_Nested2A = File_testpb_unknonwnproto_proto.Messages().ByName("Nested2A") fd_Nested2A_id = md_Nested2A.Fields().ByName("id") fd_Nested2A_name = md_Nested2A.Fields().ByName("name") fd_Nested2A_nested = md_Nested2A.Fields().ByName("nested") @@ -2735,7 +2735,7 @@ func (x *Nested2A) ProtoReflect() protoreflect.Message { } func (x *Nested2A) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[4] + mi := &file_testpb_unknonwnproto_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2824,17 +2824,17 @@ func (x *fastReflection_Nested2A) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested2A) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested2A.id": + case "testpb.Nested2A.id": return x.Id != int32(0) - case "testdata.Nested2A.name": + case "testpb.Nested2A.name": return x.Name != "" - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": return x.Nested != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", fd.FullName())) } } @@ -2846,17 +2846,17 @@ func (x *fastReflection_Nested2A) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2A) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested2A.id": + case "testpb.Nested2A.id": x.Id = int32(0) - case "testdata.Nested2A.name": + case "testpb.Nested2A.name": x.Name = "" - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": x.Nested = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", fd.FullName())) } } @@ -2868,20 +2868,20 @@ func (x *fastReflection_Nested2A) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested2A) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested2A.id": + case "testpb.Nested2A.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested2A.name": + case "testpb.Nested2A.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": value := x.Nested return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", descriptor.FullName())) } } @@ -2897,17 +2897,17 @@ func (x *fastReflection_Nested2A) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2A) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested2A.id": + case "testpb.Nested2A.id": x.Id = int32(value.Int()) - case "testdata.Nested2A.name": + case "testpb.Nested2A.name": x.Name = value.Interface().(string) - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": x.Nested = value.Message().Interface().(*Nested3A) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", fd.FullName())) } } @@ -2923,20 +2923,20 @@ func (x *fastReflection_Nested2A) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2A) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": if x.Nested == nil { x.Nested = new(Nested3A) } return protoreflect.ValueOfMessage(x.Nested.ProtoReflect()) - case "testdata.Nested2A.id": - panic(fmt.Errorf("field id of message testdata.Nested2A is not mutable")) - case "testdata.Nested2A.name": - panic(fmt.Errorf("field name of message testdata.Nested2A is not mutable")) + case "testpb.Nested2A.id": + panic(fmt.Errorf("field id of message testpb.Nested2A is not mutable")) + case "testpb.Nested2A.name": + panic(fmt.Errorf("field name of message testpb.Nested2A is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", fd.FullName())) } } @@ -2945,18 +2945,18 @@ func (x *fastReflection_Nested2A) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested2A) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested2A.id": + case "testpb.Nested2A.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested2A.name": + case "testpb.Nested2A.name": return protoreflect.ValueOfString("") - case "testdata.Nested2A.nested": + case "testpb.Nested2A.nested": m := new(Nested3A) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2A")) } - panic(fmt.Errorf("message testdata.Nested2A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2A does not contain field %s", fd.FullName())) } } @@ -2966,7 +2966,7 @@ func (x *fastReflection_Nested2A) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested2A) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested2A", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested2A", d.FullName())) } panic("unreachable") } @@ -3265,8 +3265,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested1A = File_unknonwnproto_proto.Messages().ByName("Nested1A") + file_testpb_unknonwnproto_proto_init() + md_Nested1A = File_testpb_unknonwnproto_proto.Messages().ByName("Nested1A") fd_Nested1A_id = md_Nested1A.Fields().ByName("id") fd_Nested1A_nested = md_Nested1A.Fields().ByName("nested") } @@ -3280,7 +3280,7 @@ func (x *Nested1A) ProtoReflect() protoreflect.Message { } func (x *Nested1A) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[5] + mi := &file_testpb_unknonwnproto_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3363,15 +3363,15 @@ func (x *fastReflection_Nested1A) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested1A) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested1A.id": + case "testpb.Nested1A.id": return x.Id != int32(0) - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": return x.Nested != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", fd.FullName())) } } @@ -3383,15 +3383,15 @@ func (x *fastReflection_Nested1A) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1A) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested1A.id": + case "testpb.Nested1A.id": x.Id = int32(0) - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": x.Nested = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", fd.FullName())) } } @@ -3403,17 +3403,17 @@ func (x *fastReflection_Nested1A) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested1A) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested1A.id": + case "testpb.Nested1A.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": value := x.Nested return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", descriptor.FullName())) } } @@ -3429,15 +3429,15 @@ func (x *fastReflection_Nested1A) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1A) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested1A.id": + case "testpb.Nested1A.id": x.Id = int32(value.Int()) - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": x.Nested = value.Message().Interface().(*Nested2A) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", fd.FullName())) } } @@ -3453,18 +3453,18 @@ func (x *fastReflection_Nested1A) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1A) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": if x.Nested == nil { x.Nested = new(Nested2A) } return protoreflect.ValueOfMessage(x.Nested.ProtoReflect()) - case "testdata.Nested1A.id": - panic(fmt.Errorf("field id of message testdata.Nested1A is not mutable")) + case "testpb.Nested1A.id": + panic(fmt.Errorf("field id of message testpb.Nested1A is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", fd.FullName())) } } @@ -3473,16 +3473,16 @@ func (x *fastReflection_Nested1A) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested1A) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested1A.id": + case "testpb.Nested1A.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested1A.nested": + case "testpb.Nested1A.nested": m := new(Nested2A) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1A")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1A")) } - panic(fmt.Errorf("message testdata.Nested1A does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1A does not contain field %s", fd.FullName())) } } @@ -3492,7 +3492,7 @@ func (x *fastReflection_Nested1A) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested1A) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested1A", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested1A", d.FullName())) } panic("unreachable") } @@ -3749,8 +3749,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested4B = File_unknonwnproto_proto.Messages().ByName("Nested4B") + file_testpb_unknonwnproto_proto_init() + md_Nested4B = File_testpb_unknonwnproto_proto.Messages().ByName("Nested4B") fd_Nested4B_id = md_Nested4B.Fields().ByName("id") fd_Nested4B_age = md_Nested4B.Fields().ByName("age") fd_Nested4B_name = md_Nested4B.Fields().ByName("name") @@ -3765,7 +3765,7 @@ func (x *Nested4B) ProtoReflect() protoreflect.Message { } func (x *Nested4B) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[6] + mi := &file_testpb_unknonwnproto_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3854,17 +3854,17 @@ func (x *fastReflection_Nested4B) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested4B) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested4B.id": + case "testpb.Nested4B.id": return x.Id != int32(0) - case "testdata.Nested4B.age": + case "testpb.Nested4B.age": return x.Age != int32(0) - case "testdata.Nested4B.name": + case "testpb.Nested4B.name": return x.Name != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", fd.FullName())) } } @@ -3876,17 +3876,17 @@ func (x *fastReflection_Nested4B) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4B) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested4B.id": + case "testpb.Nested4B.id": x.Id = int32(0) - case "testdata.Nested4B.age": + case "testpb.Nested4B.age": x.Age = int32(0) - case "testdata.Nested4B.name": + case "testpb.Nested4B.name": x.Name = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", fd.FullName())) } } @@ -3898,20 +3898,20 @@ func (x *fastReflection_Nested4B) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested4B) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested4B.id": + case "testpb.Nested4B.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested4B.age": + case "testpb.Nested4B.age": value := x.Age return protoreflect.ValueOfInt32(value) - case "testdata.Nested4B.name": + case "testpb.Nested4B.name": value := x.Name return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", descriptor.FullName())) } } @@ -3927,17 +3927,17 @@ func (x *fastReflection_Nested4B) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4B) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested4B.id": + case "testpb.Nested4B.id": x.Id = int32(value.Int()) - case "testdata.Nested4B.age": + case "testpb.Nested4B.age": x.Age = int32(value.Int()) - case "testdata.Nested4B.name": + case "testpb.Nested4B.name": x.Name = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", fd.FullName())) } } @@ -3953,17 +3953,17 @@ func (x *fastReflection_Nested4B) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested4B) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested4B.id": - panic(fmt.Errorf("field id of message testdata.Nested4B is not mutable")) - case "testdata.Nested4B.age": - panic(fmt.Errorf("field age of message testdata.Nested4B is not mutable")) - case "testdata.Nested4B.name": - panic(fmt.Errorf("field name of message testdata.Nested4B is not mutable")) + case "testpb.Nested4B.id": + panic(fmt.Errorf("field id of message testpb.Nested4B is not mutable")) + case "testpb.Nested4B.age": + panic(fmt.Errorf("field age of message testpb.Nested4B is not mutable")) + case "testpb.Nested4B.name": + panic(fmt.Errorf("field name of message testpb.Nested4B is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", fd.FullName())) } } @@ -3972,17 +3972,17 @@ func (x *fastReflection_Nested4B) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested4B) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested4B.id": + case "testpb.Nested4B.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested4B.age": + case "testpb.Nested4B.age": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested4B.name": + case "testpb.Nested4B.name": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested4B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested4B")) } - panic(fmt.Errorf("message testdata.Nested4B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested4B does not contain field %s", fd.FullName())) } } @@ -3992,7 +3992,7 @@ func (x *fastReflection_Nested4B) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested4B) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested4B", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested4B", d.FullName())) } panic("unreachable") } @@ -4317,8 +4317,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested3B = File_unknonwnproto_proto.Messages().ByName("Nested3B") + file_testpb_unknonwnproto_proto_init() + md_Nested3B = File_testpb_unknonwnproto_proto.Messages().ByName("Nested3B") fd_Nested3B_id = md_Nested3B.Fields().ByName("id") fd_Nested3B_age = md_Nested3B.Fields().ByName("age") fd_Nested3B_name = md_Nested3B.Fields().ByName("name") @@ -4334,7 +4334,7 @@ func (x *Nested3B) ProtoReflect() protoreflect.Message { } func (x *Nested3B) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[7] + mi := &file_testpb_unknonwnproto_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4429,19 +4429,19 @@ func (x *fastReflection_Nested3B) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested3B) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested3B.id": + case "testpb.Nested3B.id": return x.Id != int32(0) - case "testdata.Nested3B.age": + case "testpb.Nested3B.age": return x.Age != int32(0) - case "testdata.Nested3B.name": + case "testpb.Nested3B.name": return x.Name != "" - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": return len(x.B4) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", fd.FullName())) } } @@ -4453,19 +4453,19 @@ func (x *fastReflection_Nested3B) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3B) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested3B.id": + case "testpb.Nested3B.id": x.Id = int32(0) - case "testdata.Nested3B.age": + case "testpb.Nested3B.age": x.Age = int32(0) - case "testdata.Nested3B.name": + case "testpb.Nested3B.name": x.Name = "" - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": x.B4 = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", fd.FullName())) } } @@ -4477,16 +4477,16 @@ func (x *fastReflection_Nested3B) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested3B) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested3B.id": + case "testpb.Nested3B.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested3B.age": + case "testpb.Nested3B.age": value := x.Age return protoreflect.ValueOfInt32(value) - case "testdata.Nested3B.name": + case "testpb.Nested3B.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": if len(x.B4) == 0 { return protoreflect.ValueOfList(&_Nested3B_4_list{}) } @@ -4494,9 +4494,9 @@ func (x *fastReflection_Nested3B) Get(descriptor protoreflect.FieldDescriptor) p return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", descriptor.FullName())) } } @@ -4512,21 +4512,21 @@ func (x *fastReflection_Nested3B) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3B) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested3B.id": + case "testpb.Nested3B.id": x.Id = int32(value.Int()) - case "testdata.Nested3B.age": + case "testpb.Nested3B.age": x.Age = int32(value.Int()) - case "testdata.Nested3B.name": + case "testpb.Nested3B.name": x.Name = value.Interface().(string) - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": lv := value.List() clv := lv.(*_Nested3B_4_list) x.B4 = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", fd.FullName())) } } @@ -4542,23 +4542,23 @@ func (x *fastReflection_Nested3B) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested3B) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": if x.B4 == nil { x.B4 = []*Nested4B{} } value := &_Nested3B_4_list{list: &x.B4} return protoreflect.ValueOfList(value) - case "testdata.Nested3B.id": - panic(fmt.Errorf("field id of message testdata.Nested3B is not mutable")) - case "testdata.Nested3B.age": - panic(fmt.Errorf("field age of message testdata.Nested3B is not mutable")) - case "testdata.Nested3B.name": - panic(fmt.Errorf("field name of message testdata.Nested3B is not mutable")) + case "testpb.Nested3B.id": + panic(fmt.Errorf("field id of message testpb.Nested3B is not mutable")) + case "testpb.Nested3B.age": + panic(fmt.Errorf("field age of message testpb.Nested3B is not mutable")) + case "testpb.Nested3B.name": + panic(fmt.Errorf("field name of message testpb.Nested3B is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", fd.FullName())) } } @@ -4567,20 +4567,20 @@ func (x *fastReflection_Nested3B) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested3B) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested3B.id": + case "testpb.Nested3B.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested3B.age": + case "testpb.Nested3B.age": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested3B.name": + case "testpb.Nested3B.name": return protoreflect.ValueOfString("") - case "testdata.Nested3B.b4": + case "testpb.Nested3B.b4": list := []*Nested4B{} return protoreflect.ValueOfList(&_Nested3B_4_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested3B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested3B")) } - panic(fmt.Errorf("message testdata.Nested3B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested3B does not contain field %s", fd.FullName())) } } @@ -4590,7 +4590,7 @@ func (x *fastReflection_Nested3B) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested3B) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested3B", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested3B", d.FullName())) } panic("unreachable") } @@ -4920,8 +4920,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested2B = File_unknonwnproto_proto.Messages().ByName("Nested2B") + file_testpb_unknonwnproto_proto_init() + md_Nested2B = File_testpb_unknonwnproto_proto.Messages().ByName("Nested2B") fd_Nested2B_id = md_Nested2B.Fields().ByName("id") fd_Nested2B_fee = md_Nested2B.Fields().ByName("fee") fd_Nested2B_nested = md_Nested2B.Fields().ByName("nested") @@ -4937,7 +4937,7 @@ func (x *Nested2B) ProtoReflect() protoreflect.Message { } func (x *Nested2B) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[8] + mi := &file_testpb_unknonwnproto_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5032,19 +5032,19 @@ func (x *fastReflection_Nested2B) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested2B) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested2B.id": + case "testpb.Nested2B.id": return x.Id != int32(0) - case "testdata.Nested2B.fee": + case "testpb.Nested2B.fee": return x.Fee != float64(0) || math.Signbit(x.Fee) - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": return x.Nested != nil - case "testdata.Nested2B.route": + case "testpb.Nested2B.route": return x.Route != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", fd.FullName())) } } @@ -5056,19 +5056,19 @@ func (x *fastReflection_Nested2B) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2B) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested2B.id": + case "testpb.Nested2B.id": x.Id = int32(0) - case "testdata.Nested2B.fee": + case "testpb.Nested2B.fee": x.Fee = float64(0) - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": x.Nested = nil - case "testdata.Nested2B.route": + case "testpb.Nested2B.route": x.Route = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", fd.FullName())) } } @@ -5080,23 +5080,23 @@ func (x *fastReflection_Nested2B) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested2B) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested2B.id": + case "testpb.Nested2B.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested2B.fee": + case "testpb.Nested2B.fee": value := x.Fee return protoreflect.ValueOfFloat64(value) - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": value := x.Nested return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.Nested2B.route": + case "testpb.Nested2B.route": value := x.Route return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", descriptor.FullName())) } } @@ -5112,19 +5112,19 @@ func (x *fastReflection_Nested2B) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2B) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested2B.id": + case "testpb.Nested2B.id": x.Id = int32(value.Int()) - case "testdata.Nested2B.fee": + case "testpb.Nested2B.fee": x.Fee = value.Float() - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": x.Nested = value.Message().Interface().(*Nested3B) - case "testdata.Nested2B.route": + case "testpb.Nested2B.route": x.Route = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", fd.FullName())) } } @@ -5140,22 +5140,22 @@ func (x *fastReflection_Nested2B) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested2B) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": if x.Nested == nil { x.Nested = new(Nested3B) } return protoreflect.ValueOfMessage(x.Nested.ProtoReflect()) - case "testdata.Nested2B.id": - panic(fmt.Errorf("field id of message testdata.Nested2B is not mutable")) - case "testdata.Nested2B.fee": - panic(fmt.Errorf("field fee of message testdata.Nested2B is not mutable")) - case "testdata.Nested2B.route": - panic(fmt.Errorf("field route of message testdata.Nested2B is not mutable")) + case "testpb.Nested2B.id": + panic(fmt.Errorf("field id of message testpb.Nested2B is not mutable")) + case "testpb.Nested2B.fee": + panic(fmt.Errorf("field fee of message testpb.Nested2B is not mutable")) + case "testpb.Nested2B.route": + panic(fmt.Errorf("field route of message testpb.Nested2B is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", fd.FullName())) } } @@ -5164,20 +5164,20 @@ func (x *fastReflection_Nested2B) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested2B) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested2B.id": + case "testpb.Nested2B.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested2B.fee": + case "testpb.Nested2B.fee": return protoreflect.ValueOfFloat64(float64(0)) - case "testdata.Nested2B.nested": + case "testpb.Nested2B.nested": m := new(Nested3B) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.Nested2B.route": + case "testpb.Nested2B.route": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested2B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested2B")) } - panic(fmt.Errorf("message testdata.Nested2B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested2B does not contain field %s", fd.FullName())) } } @@ -5187,7 +5187,7 @@ func (x *fastReflection_Nested2B) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested2B) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested2B", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested2B", d.FullName())) } panic("unreachable") } @@ -5507,8 +5507,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Nested1B = File_unknonwnproto_proto.Messages().ByName("Nested1B") + file_testpb_unknonwnproto_proto_init() + md_Nested1B = File_testpb_unknonwnproto_proto.Messages().ByName("Nested1B") fd_Nested1B_id = md_Nested1B.Fields().ByName("id") fd_Nested1B_nested = md_Nested1B.Fields().ByName("nested") fd_Nested1B_age = md_Nested1B.Fields().ByName("age") @@ -5523,7 +5523,7 @@ func (x *Nested1B) ProtoReflect() protoreflect.Message { } func (x *Nested1B) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[9] + mi := &file_testpb_unknonwnproto_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5612,17 +5612,17 @@ func (x *fastReflection_Nested1B) Range(f func(protoreflect.FieldDescriptor, pro // a repeated field is populated if it is non-empty. func (x *fastReflection_Nested1B) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Nested1B.id": + case "testpb.Nested1B.id": return x.Id != int32(0) - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": return x.Nested != nil - case "testdata.Nested1B.age": + case "testpb.Nested1B.age": return x.Age != int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", fd.FullName())) } } @@ -5634,17 +5634,17 @@ func (x *fastReflection_Nested1B) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1B) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Nested1B.id": + case "testpb.Nested1B.id": x.Id = int32(0) - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": x.Nested = nil - case "testdata.Nested1B.age": + case "testpb.Nested1B.age": x.Age = int32(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", fd.FullName())) } } @@ -5656,20 +5656,20 @@ func (x *fastReflection_Nested1B) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Nested1B) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Nested1B.id": + case "testpb.Nested1B.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": value := x.Nested return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.Nested1B.age": + case "testpb.Nested1B.age": value := x.Age return protoreflect.ValueOfInt32(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", descriptor.FullName())) } } @@ -5685,17 +5685,17 @@ func (x *fastReflection_Nested1B) Get(descriptor protoreflect.FieldDescriptor) p // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1B) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Nested1B.id": + case "testpb.Nested1B.id": x.Id = int32(value.Int()) - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": x.Nested = value.Message().Interface().(*Nested2B) - case "testdata.Nested1B.age": + case "testpb.Nested1B.age": x.Age = int32(value.Int()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", fd.FullName())) } } @@ -5711,20 +5711,20 @@ func (x *fastReflection_Nested1B) Set(fd protoreflect.FieldDescriptor, value pro // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Nested1B) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": if x.Nested == nil { x.Nested = new(Nested2B) } return protoreflect.ValueOfMessage(x.Nested.ProtoReflect()) - case "testdata.Nested1B.id": - panic(fmt.Errorf("field id of message testdata.Nested1B is not mutable")) - case "testdata.Nested1B.age": - panic(fmt.Errorf("field age of message testdata.Nested1B is not mutable")) + case "testpb.Nested1B.id": + panic(fmt.Errorf("field id of message testpb.Nested1B is not mutable")) + case "testpb.Nested1B.age": + panic(fmt.Errorf("field age of message testpb.Nested1B is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", fd.FullName())) } } @@ -5733,18 +5733,18 @@ func (x *fastReflection_Nested1B) Mutable(fd protoreflect.FieldDescriptor) proto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Nested1B) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Nested1B.id": + case "testpb.Nested1B.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Nested1B.nested": + case "testpb.Nested1B.nested": m := new(Nested2B) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.Nested1B.age": + case "testpb.Nested1B.age": return protoreflect.ValueOfInt32(int32(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Nested1B")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Nested1B")) } - panic(fmt.Errorf("message testdata.Nested1B does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Nested1B does not contain field %s", fd.FullName())) } } @@ -5754,7 +5754,7 @@ func (x *fastReflection_Nested1B) NewField(fd protoreflect.FieldDescriptor) prot func (x *fastReflection_Nested1B) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Nested1B", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Nested1B", d.FullName())) } panic("unreachable") } @@ -6043,8 +6043,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_Customer3 = File_unknonwnproto_proto.Messages().ByName("Customer3") + file_testpb_unknonwnproto_proto_init() + md_Customer3 = File_testpb_unknonwnproto_proto.Messages().ByName("Customer3") fd_Customer3_id = md_Customer3.Fields().ByName("id") fd_Customer3_name = md_Customer3.Fields().ByName("name") fd_Customer3_sf = md_Customer3.Fields().ByName("sf") @@ -6064,7 +6064,7 @@ func (x *Customer3) ProtoReflect() protoreflect.Message { } func (x *Customer3) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[10] + mi := &file_testpb_unknonwnproto_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -6187,17 +6187,17 @@ func (x *fastReflection_Customer3) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_Customer3) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.Customer3.id": + case "testpb.Customer3.id": return x.Id != int32(0) - case "testdata.Customer3.name": + case "testpb.Customer3.name": return x.Name != "" - case "testdata.Customer3.sf": + case "testpb.Customer3.sf": return x.Sf != float32(0) || math.Signbit(float64(x.Sf)) - case "testdata.Customer3.surcharge": + case "testpb.Customer3.surcharge": return x.Surcharge != float32(0) || math.Signbit(float64(x.Surcharge)) - case "testdata.Customer3.destination": + case "testpb.Customer3.destination": return x.Destination != "" - case "testdata.Customer3.credit_card_no": + case "testpb.Customer3.credit_card_no": if x.Payment == nil { return false } else if _, ok := x.Payment.(*Customer3_CreditCardNo); ok { @@ -6205,7 +6205,7 @@ func (x *fastReflection_Customer3) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "testdata.Customer3.cheque_no": + case "testpb.Customer3.cheque_no": if x.Payment == nil { return false } else if _, ok := x.Payment.(*Customer3_ChequeNo); ok { @@ -6213,13 +6213,13 @@ func (x *fastReflection_Customer3) Has(fd protoreflect.FieldDescriptor) bool { } else { return false } - case "testdata.Customer3.original": + case "testpb.Customer3.original": return x.Original != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", fd.FullName())) } } @@ -6231,27 +6231,27 @@ func (x *fastReflection_Customer3) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer3) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.Customer3.id": + case "testpb.Customer3.id": x.Id = int32(0) - case "testdata.Customer3.name": + case "testpb.Customer3.name": x.Name = "" - case "testdata.Customer3.sf": + case "testpb.Customer3.sf": x.Sf = float32(0) - case "testdata.Customer3.surcharge": + case "testpb.Customer3.surcharge": x.Surcharge = float32(0) - case "testdata.Customer3.destination": + case "testpb.Customer3.destination": x.Destination = "" - case "testdata.Customer3.credit_card_no": + case "testpb.Customer3.credit_card_no": x.Payment = nil - case "testdata.Customer3.cheque_no": + case "testpb.Customer3.cheque_no": x.Payment = nil - case "testdata.Customer3.original": + case "testpb.Customer3.original": x.Original = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", fd.FullName())) } } @@ -6263,22 +6263,22 @@ func (x *fastReflection_Customer3) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Customer3) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.Customer3.id": + case "testpb.Customer3.id": value := x.Id return protoreflect.ValueOfInt32(value) - case "testdata.Customer3.name": + case "testpb.Customer3.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.Customer3.sf": + case "testpb.Customer3.sf": value := x.Sf return protoreflect.ValueOfFloat32(value) - case "testdata.Customer3.surcharge": + case "testpb.Customer3.surcharge": value := x.Surcharge return protoreflect.ValueOfFloat32(value) - case "testdata.Customer3.destination": + case "testpb.Customer3.destination": value := x.Destination return protoreflect.ValueOfString(value) - case "testdata.Customer3.credit_card_no": + case "testpb.Customer3.credit_card_no": if x.Payment == nil { return protoreflect.ValueOfString("") } else if v, ok := x.Payment.(*Customer3_CreditCardNo); ok { @@ -6286,7 +6286,7 @@ func (x *fastReflection_Customer3) Get(descriptor protoreflect.FieldDescriptor) } else { return protoreflect.ValueOfString("") } - case "testdata.Customer3.cheque_no": + case "testpb.Customer3.cheque_no": if x.Payment == nil { return protoreflect.ValueOfString("") } else if v, ok := x.Payment.(*Customer3_ChequeNo); ok { @@ -6294,14 +6294,14 @@ func (x *fastReflection_Customer3) Get(descriptor protoreflect.FieldDescriptor) } else { return protoreflect.ValueOfString("") } - case "testdata.Customer3.original": + case "testpb.Customer3.original": value := x.Original return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", descriptor.FullName())) } } @@ -6317,29 +6317,29 @@ func (x *fastReflection_Customer3) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer3) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.Customer3.id": + case "testpb.Customer3.id": x.Id = int32(value.Int()) - case "testdata.Customer3.name": + case "testpb.Customer3.name": x.Name = value.Interface().(string) - case "testdata.Customer3.sf": + case "testpb.Customer3.sf": x.Sf = float32(value.Float()) - case "testdata.Customer3.surcharge": + case "testpb.Customer3.surcharge": x.Surcharge = float32(value.Float()) - case "testdata.Customer3.destination": + case "testpb.Customer3.destination": x.Destination = value.Interface().(string) - case "testdata.Customer3.credit_card_no": + case "testpb.Customer3.credit_card_no": cv := value.Interface().(string) x.Payment = &Customer3_CreditCardNo{CreditCardNo: cv} - case "testdata.Customer3.cheque_no": + case "testpb.Customer3.cheque_no": cv := value.Interface().(string) x.Payment = &Customer3_ChequeNo{ChequeNo: cv} - case "testdata.Customer3.original": + case "testpb.Customer3.original": x.Original = value.Message().Interface().(*Customer1) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", fd.FullName())) } } @@ -6355,30 +6355,30 @@ func (x *fastReflection_Customer3) Set(fd protoreflect.FieldDescriptor, value pr // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Customer3) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer3.original": + case "testpb.Customer3.original": if x.Original == nil { x.Original = new(Customer1) } return protoreflect.ValueOfMessage(x.Original.ProtoReflect()) - case "testdata.Customer3.id": - panic(fmt.Errorf("field id of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.name": - panic(fmt.Errorf("field name of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.sf": - panic(fmt.Errorf("field sf of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.surcharge": - panic(fmt.Errorf("field surcharge of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.destination": - panic(fmt.Errorf("field destination of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.credit_card_no": - panic(fmt.Errorf("field credit_card_no of message testdata.Customer3 is not mutable")) - case "testdata.Customer3.cheque_no": - panic(fmt.Errorf("field cheque_no of message testdata.Customer3 is not mutable")) + case "testpb.Customer3.id": + panic(fmt.Errorf("field id of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.name": + panic(fmt.Errorf("field name of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.sf": + panic(fmt.Errorf("field sf of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.surcharge": + panic(fmt.Errorf("field surcharge of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.destination": + panic(fmt.Errorf("field destination of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.credit_card_no": + panic(fmt.Errorf("field credit_card_no of message testpb.Customer3 is not mutable")) + case "testpb.Customer3.cheque_no": + panic(fmt.Errorf("field cheque_no of message testpb.Customer3 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", fd.FullName())) } } @@ -6387,28 +6387,28 @@ func (x *fastReflection_Customer3) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Customer3) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.Customer3.id": + case "testpb.Customer3.id": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.Customer3.name": + case "testpb.Customer3.name": return protoreflect.ValueOfString("") - case "testdata.Customer3.sf": + case "testpb.Customer3.sf": return protoreflect.ValueOfFloat32(float32(0)) - case "testdata.Customer3.surcharge": + case "testpb.Customer3.surcharge": return protoreflect.ValueOfFloat32(float32(0)) - case "testdata.Customer3.destination": + case "testpb.Customer3.destination": return protoreflect.ValueOfString("") - case "testdata.Customer3.credit_card_no": + case "testpb.Customer3.credit_card_no": return protoreflect.ValueOfString("") - case "testdata.Customer3.cheque_no": + case "testpb.Customer3.cheque_no": return protoreflect.ValueOfString("") - case "testdata.Customer3.original": + case "testpb.Customer3.original": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.Customer3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.Customer3")) } - panic(fmt.Errorf("message testdata.Customer3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.Customer3 does not contain field %s", fd.FullName())) } } @@ -6417,7 +6417,7 @@ func (x *fastReflection_Customer3) NewField(fd protoreflect.FieldDescriptor) pro // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_Customer3) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.Customer3.payment": + case "testpb.Customer3.payment": if x.Payment == nil { return nil } @@ -6428,7 +6428,7 @@ func (x *fastReflection_Customer3) WhichOneof(d protoreflect.OneofDescriptor) pr return x.Descriptor().Fields().ByName("cheque_no") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.Customer3", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.Customer3", d.FullName())) } panic("unreachable") } @@ -7063,8 +7063,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion1 = File_unknonwnproto_proto.Messages().ByName("TestVersion1") + file_testpb_unknonwnproto_proto_init() + md_TestVersion1 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion1") fd_TestVersion1_x = md_TestVersion1.Fields().ByName("x") fd_TestVersion1_a = md_TestVersion1.Fields().ByName("a") fd_TestVersion1_b = md_TestVersion1.Fields().ByName("b") @@ -7086,7 +7086,7 @@ func (x *TestVersion1) ProtoReflect() protoreflect.Message { } func (x *TestVersion1) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[11] + mi := &file_testpb_unknonwnproto_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -7221,17 +7221,17 @@ func (x *fastReflection_TestVersion1) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion1) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion1.x": + case "testpb.TestVersion1.x": return x.X != int64(0) - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": return x.A != nil - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": return x.B != nil - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": return len(x.C) != 0 - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": return len(x.D) != 0 - case "testdata.TestVersion1.e": + case "testpb.TestVersion1.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion1_E); ok { @@ -7239,7 +7239,7 @@ func (x *fastReflection_TestVersion1) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion1_F); ok { @@ -7247,17 +7247,17 @@ func (x *fastReflection_TestVersion1) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": return x.G != nil - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": return len(x.H) != 0 - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": return x.K != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", fd.FullName())) } } @@ -7269,31 +7269,31 @@ func (x *fastReflection_TestVersion1) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion1) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion1.x": + case "testpb.TestVersion1.x": x.X = int64(0) - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": x.A = nil - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": x.B = nil - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": x.C = nil - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": x.D = nil - case "testdata.TestVersion1.e": + case "testpb.TestVersion1.e": x.Sum = nil - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": x.Sum = nil - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": x.G = nil - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": x.H = nil - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": x.K = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", fd.FullName())) } } @@ -7305,28 +7305,28 @@ func (x *fastReflection_TestVersion1) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion1) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion1.x": + case "testpb.TestVersion1.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion1_4_list{}) } listValue := &_TestVersion1_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion1_5_list{}) } listValue := &_TestVersion1_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion1.e": + case "testpb.TestVersion1.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersion1_E); ok { @@ -7334,7 +7334,7 @@ func (x *fastReflection_TestVersion1) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersion1_F); ok { @@ -7342,23 +7342,23 @@ func (x *fastReflection_TestVersion1) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion1_9_list{}) } listValue := &_TestVersion1_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", descriptor.FullName())) } } @@ -7374,39 +7374,39 @@ func (x *fastReflection_TestVersion1) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion1) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion1.x": + case "testpb.TestVersion1.x": x.X = value.Int() - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": x.A = value.Message().Interface().(*TestVersion1) - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": x.B = value.Message().Interface().(*TestVersion1) - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": lv := value.List() clv := lv.(*_TestVersion1_4_list) x.C = *clv.list - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": lv := value.List() clv := lv.(*_TestVersion1_5_list) x.D = *clv.list - case "testdata.TestVersion1.e": + case "testpb.TestVersion1.e": cv := int32(value.Int()) x.Sum = &TestVersion1_E{E: cv} - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": cv := value.Message().Interface().(*TestVersion1) x.Sum = &TestVersion1_F{F: cv} - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": lv := value.List() clv := lv.(*_TestVersion1_9_list) x.H = *clv.list - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": x.K = value.Message().Interface().(*Customer1) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", fd.FullName())) } } @@ -7422,29 +7422,29 @@ func (x *fastReflection_TestVersion1) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion1) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": if x.A == nil { x.A = new(TestVersion1) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": if x.B == nil { x.B = new(TestVersion1) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": if x.C == nil { x.C = []*TestVersion1{} } value := &_TestVersion1_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": if x.D == nil { x.D = []*TestVersion1{} } value := &_TestVersion1_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": if x.Sum == nil { value := &TestVersion1{} oneofValue := &TestVersion1_F{F: value} @@ -7460,31 +7460,31 @@ func (x *fastReflection_TestVersion1) Mutable(fd protoreflect.FieldDescriptor) p x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion1_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion1.x": - panic(fmt.Errorf("field x of message testdata.TestVersion1 is not mutable")) - case "testdata.TestVersion1.e": - panic(fmt.Errorf("field e of message testdata.TestVersion1 is not mutable")) + case "testpb.TestVersion1.x": + panic(fmt.Errorf("field x of message testpb.TestVersion1 is not mutable")) + case "testpb.TestVersion1.e": + panic(fmt.Errorf("field e of message testpb.TestVersion1 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", fd.FullName())) } } @@ -7493,39 +7493,39 @@ func (x *fastReflection_TestVersion1) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion1) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion1.x": + case "testpb.TestVersion1.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion1.a": + case "testpb.TestVersion1.a": m := new(TestVersion1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion1.b": + case "testpb.TestVersion1.b": m := new(TestVersion1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion1.c": + case "testpb.TestVersion1.c": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion1_4_list{list: &list}) - case "testdata.TestVersion1.d": + case "testpb.TestVersion1.d": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion1_5_list{list: &list}) - case "testdata.TestVersion1.e": + case "testpb.TestVersion1.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersion1.f": + case "testpb.TestVersion1.f": value := &TestVersion1{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion1.g": + case "testpb.TestVersion1.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion1.h": + case "testpb.TestVersion1.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion1_9_list{list: &list}) - case "testdata.TestVersion1.k": + case "testpb.TestVersion1.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion1")) } - panic(fmt.Errorf("message testdata.TestVersion1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion1 does not contain field %s", fd.FullName())) } } @@ -7534,7 +7534,7 @@ func (x *fastReflection_TestVersion1) NewField(fd protoreflect.FieldDescriptor) // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion1) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion1.sum": + case "testpb.TestVersion1.sum": if x.Sum == nil { return nil } @@ -7545,7 +7545,7 @@ func (x *fastReflection_TestVersion1) WhichOneof(d protoreflect.OneofDescriptor) return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion1", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion1", d.FullName())) } panic("unreachable") } @@ -8380,8 +8380,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion2 = File_unknonwnproto_proto.Messages().ByName("TestVersion2") + file_testpb_unknonwnproto_proto_init() + md_TestVersion2 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion2") fd_TestVersion2_x = md_TestVersion2.Fields().ByName("x") fd_TestVersion2_a = md_TestVersion2.Fields().ByName("a") fd_TestVersion2_b = md_TestVersion2.Fields().ByName("b") @@ -8404,7 +8404,7 @@ func (x *TestVersion2) ProtoReflect() protoreflect.Message { } func (x *TestVersion2) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[12] + mi := &file_testpb_unknonwnproto_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -8545,17 +8545,17 @@ func (x *fastReflection_TestVersion2) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion2) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion2.x": + case "testpb.TestVersion2.x": return x.X != int64(0) - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": return x.A != nil - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": return x.B != nil - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": return len(x.C) != 0 - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": return len(x.D) != 0 - case "testdata.TestVersion2.e": + case "testpb.TestVersion2.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion2_E); ok { @@ -8563,7 +8563,7 @@ func (x *fastReflection_TestVersion2) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion2_F); ok { @@ -8571,19 +8571,19 @@ func (x *fastReflection_TestVersion2) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": return x.G != nil - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": return len(x.H) != 0 - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": return x.K != nil - case "testdata.TestVersion2.new_field": + case "testpb.TestVersion2.new_field": return x.NewField_ != uint64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", fd.FullName())) } } @@ -8595,33 +8595,33 @@ func (x *fastReflection_TestVersion2) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion2) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion2.x": + case "testpb.TestVersion2.x": x.X = int64(0) - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": x.A = nil - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": x.B = nil - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": x.C = nil - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": x.D = nil - case "testdata.TestVersion2.e": + case "testpb.TestVersion2.e": x.Sum = nil - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": x.Sum = nil - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": x.G = nil - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": x.H = nil - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": x.K = nil - case "testdata.TestVersion2.new_field": + case "testpb.TestVersion2.new_field": x.NewField_ = uint64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", fd.FullName())) } } @@ -8633,28 +8633,28 @@ func (x *fastReflection_TestVersion2) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion2) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion2.x": + case "testpb.TestVersion2.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion2_4_list{}) } listValue := &_TestVersion2_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion2_5_list{}) } listValue := &_TestVersion2_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion2.e": + case "testpb.TestVersion2.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersion2_E); ok { @@ -8662,7 +8662,7 @@ func (x *fastReflection_TestVersion2) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion2)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersion2_F); ok { @@ -8670,26 +8670,26 @@ func (x *fastReflection_TestVersion2) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfMessage((*TestVersion2)(nil).ProtoReflect()) } - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion2_9_list{}) } listValue := &_TestVersion2_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion2.new_field": + case "testpb.TestVersion2.new_field": value := x.NewField_ return protoreflect.ValueOfUint64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", descriptor.FullName())) } } @@ -8705,41 +8705,41 @@ func (x *fastReflection_TestVersion2) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion2) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion2.x": + case "testpb.TestVersion2.x": x.X = value.Int() - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": x.A = value.Message().Interface().(*TestVersion2) - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": x.B = value.Message().Interface().(*TestVersion2) - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": lv := value.List() clv := lv.(*_TestVersion2_4_list) x.C = *clv.list - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": lv := value.List() clv := lv.(*_TestVersion2_5_list) x.D = *clv.list - case "testdata.TestVersion2.e": + case "testpb.TestVersion2.e": cv := int32(value.Int()) x.Sum = &TestVersion2_E{E: cv} - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": cv := value.Message().Interface().(*TestVersion2) x.Sum = &TestVersion2_F{F: cv} - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": lv := value.List() clv := lv.(*_TestVersion2_9_list) x.H = *clv.list - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": x.K = value.Message().Interface().(*Customer1) - case "testdata.TestVersion2.new_field": + case "testpb.TestVersion2.new_field": x.NewField_ = value.Uint() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", fd.FullName())) } } @@ -8755,29 +8755,29 @@ func (x *fastReflection_TestVersion2) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion2) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": if x.A == nil { x.A = new(TestVersion2) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": if x.B == nil { x.B = new(TestVersion2) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": if x.C == nil { x.C = []*TestVersion2{} } value := &_TestVersion2_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": if x.D == nil { x.D = []*TestVersion2{} } value := &_TestVersion2_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": if x.Sum == nil { value := &TestVersion2{} oneofValue := &TestVersion2_F{F: value} @@ -8793,33 +8793,33 @@ func (x *fastReflection_TestVersion2) Mutable(fd protoreflect.FieldDescriptor) p x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion2_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion2.x": - panic(fmt.Errorf("field x of message testdata.TestVersion2 is not mutable")) - case "testdata.TestVersion2.e": - panic(fmt.Errorf("field e of message testdata.TestVersion2 is not mutable")) - case "testdata.TestVersion2.new_field": - panic(fmt.Errorf("field new_field of message testdata.TestVersion2 is not mutable")) + case "testpb.TestVersion2.x": + panic(fmt.Errorf("field x of message testpb.TestVersion2 is not mutable")) + case "testpb.TestVersion2.e": + panic(fmt.Errorf("field e of message testpb.TestVersion2 is not mutable")) + case "testpb.TestVersion2.new_field": + panic(fmt.Errorf("field new_field of message testpb.TestVersion2 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", fd.FullName())) } } @@ -8828,41 +8828,41 @@ func (x *fastReflection_TestVersion2) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion2) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion2.x": + case "testpb.TestVersion2.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion2.a": + case "testpb.TestVersion2.a": m := new(TestVersion2) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion2.b": + case "testpb.TestVersion2.b": m := new(TestVersion2) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion2.c": + case "testpb.TestVersion2.c": list := []*TestVersion2{} return protoreflect.ValueOfList(&_TestVersion2_4_list{list: &list}) - case "testdata.TestVersion2.d": + case "testpb.TestVersion2.d": list := []*TestVersion2{} return protoreflect.ValueOfList(&_TestVersion2_5_list{list: &list}) - case "testdata.TestVersion2.e": + case "testpb.TestVersion2.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersion2.f": + case "testpb.TestVersion2.f": value := &TestVersion2{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion2.g": + case "testpb.TestVersion2.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion2.h": + case "testpb.TestVersion2.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion2_9_list{list: &list}) - case "testdata.TestVersion2.k": + case "testpb.TestVersion2.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion2.new_field": + case "testpb.TestVersion2.new_field": return protoreflect.ValueOfUint64(uint64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion2")) } - panic(fmt.Errorf("message testdata.TestVersion2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion2 does not contain field %s", fd.FullName())) } } @@ -8871,7 +8871,7 @@ func (x *fastReflection_TestVersion2) NewField(fd protoreflect.FieldDescriptor) // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion2) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion2.sum": + case "testpb.TestVersion2.sum": if x.Sum == nil { return nil } @@ -8882,7 +8882,7 @@ func (x *fastReflection_TestVersion2) WhichOneof(d protoreflect.OneofDescriptor) return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion2", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion2", d.FullName())) } panic("unreachable") } @@ -9746,8 +9746,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3 = File_unknonwnproto_proto.Messages().ByName("TestVersion3") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3") fd_TestVersion3_x = md_TestVersion3.Fields().ByName("x") fd_TestVersion3_a = md_TestVersion3.Fields().ByName("a") fd_TestVersion3_b = md_TestVersion3.Fields().ByName("b") @@ -9770,7 +9770,7 @@ func (x *TestVersion3) ProtoReflect() protoreflect.Message { } func (x *TestVersion3) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[13] + mi := &file_testpb_unknonwnproto_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -9911,17 +9911,17 @@ func (x *fastReflection_TestVersion3) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3.x": + case "testpb.TestVersion3.x": return x.X != int64(0) - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": return x.A != nil - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": return x.B != nil - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": return len(x.C) != 0 - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": return len(x.D) != 0 - case "testdata.TestVersion3.e": + case "testpb.TestVersion3.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion3_E); ok { @@ -9929,7 +9929,7 @@ func (x *fastReflection_TestVersion3) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion3_F); ok { @@ -9937,19 +9937,19 @@ func (x *fastReflection_TestVersion3) Has(fd protoreflect.FieldDescriptor) bool } else { return false } - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": return x.G != nil - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": return len(x.H) != 0 - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": return x.K != nil - case "testdata.TestVersion3.non_critical_field": + case "testpb.TestVersion3.non_critical_field": return x.NonCriticalField != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", fd.FullName())) } } @@ -9961,33 +9961,33 @@ func (x *fastReflection_TestVersion3) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3.x": + case "testpb.TestVersion3.x": x.X = int64(0) - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": x.A = nil - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": x.B = nil - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": x.C = nil - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": x.D = nil - case "testdata.TestVersion3.e": + case "testpb.TestVersion3.e": x.Sum = nil - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": x.Sum = nil - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": x.G = nil - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": x.H = nil - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": x.K = nil - case "testdata.TestVersion3.non_critical_field": + case "testpb.TestVersion3.non_critical_field": x.NonCriticalField = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", fd.FullName())) } } @@ -9999,28 +9999,28 @@ func (x *fastReflection_TestVersion3) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3.x": + case "testpb.TestVersion3.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion3_4_list{}) } listValue := &_TestVersion3_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion3_5_list{}) } listValue := &_TestVersion3_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3.e": + case "testpb.TestVersion3.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersion3_E); ok { @@ -10028,7 +10028,7 @@ func (x *fastReflection_TestVersion3) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion3)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersion3_F); ok { @@ -10036,26 +10036,26 @@ func (x *fastReflection_TestVersion3) Get(descriptor protoreflect.FieldDescripto } else { return protoreflect.ValueOfMessage((*TestVersion3)(nil).ProtoReflect()) } - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion3_9_list{}) } listValue := &_TestVersion3_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3.non_critical_field": + case "testpb.TestVersion3.non_critical_field": value := x.NonCriticalField return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", descriptor.FullName())) } } @@ -10071,41 +10071,41 @@ func (x *fastReflection_TestVersion3) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3.x": + case "testpb.TestVersion3.x": x.X = value.Int() - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": x.A = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": x.B = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": lv := value.List() clv := lv.(*_TestVersion3_4_list) x.C = *clv.list - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": lv := value.List() clv := lv.(*_TestVersion3_5_list) x.D = *clv.list - case "testdata.TestVersion3.e": + case "testpb.TestVersion3.e": cv := int32(value.Int()) x.Sum = &TestVersion3_E{E: cv} - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": cv := value.Message().Interface().(*TestVersion3) x.Sum = &TestVersion3_F{F: cv} - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": lv := value.List() clv := lv.(*_TestVersion3_9_list) x.H = *clv.list - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": x.K = value.Message().Interface().(*Customer1) - case "testdata.TestVersion3.non_critical_field": + case "testpb.TestVersion3.non_critical_field": x.NonCriticalField = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", fd.FullName())) } } @@ -10121,29 +10121,29 @@ func (x *fastReflection_TestVersion3) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": if x.A == nil { x.A = new(TestVersion3) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": if x.B == nil { x.B = new(TestVersion3) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": if x.C == nil { x.C = []*TestVersion3{} } value := &_TestVersion3_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": if x.D == nil { x.D = []*TestVersion3{} } value := &_TestVersion3_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": if x.Sum == nil { value := &TestVersion3{} oneofValue := &TestVersion3_F{F: value} @@ -10159,33 +10159,33 @@ func (x *fastReflection_TestVersion3) Mutable(fd protoreflect.FieldDescriptor) p x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion3_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion3.x": - panic(fmt.Errorf("field x of message testdata.TestVersion3 is not mutable")) - case "testdata.TestVersion3.e": - panic(fmt.Errorf("field e of message testdata.TestVersion3 is not mutable")) - case "testdata.TestVersion3.non_critical_field": - panic(fmt.Errorf("field non_critical_field of message testdata.TestVersion3 is not mutable")) + case "testpb.TestVersion3.x": + panic(fmt.Errorf("field x of message testpb.TestVersion3 is not mutable")) + case "testpb.TestVersion3.e": + panic(fmt.Errorf("field e of message testpb.TestVersion3 is not mutable")) + case "testpb.TestVersion3.non_critical_field": + panic(fmt.Errorf("field non_critical_field of message testpb.TestVersion3 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", fd.FullName())) } } @@ -10194,41 +10194,41 @@ func (x *fastReflection_TestVersion3) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3.x": + case "testpb.TestVersion3.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion3.a": + case "testpb.TestVersion3.a": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3.b": + case "testpb.TestVersion3.b": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3.c": + case "testpb.TestVersion3.c": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3_4_list{list: &list}) - case "testdata.TestVersion3.d": + case "testpb.TestVersion3.d": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3_5_list{list: &list}) - case "testdata.TestVersion3.e": + case "testpb.TestVersion3.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersion3.f": + case "testpb.TestVersion3.f": value := &TestVersion3{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3.g": + case "testpb.TestVersion3.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3.h": + case "testpb.TestVersion3.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion3_9_list{list: &list}) - case "testdata.TestVersion3.k": + case "testpb.TestVersion3.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3.non_critical_field": + case "testpb.TestVersion3.non_critical_field": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3")) } - panic(fmt.Errorf("message testdata.TestVersion3 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3 does not contain field %s", fd.FullName())) } } @@ -10237,7 +10237,7 @@ func (x *fastReflection_TestVersion3) NewField(fd protoreflect.FieldDescriptor) // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion3) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion3.sum": + case "testpb.TestVersion3.sum": if x.Sum == nil { return nil } @@ -10248,7 +10248,7 @@ func (x *fastReflection_TestVersion3) WhichOneof(d protoreflect.OneofDescriptor) return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3", d.FullName())) } panic("unreachable") } @@ -11127,8 +11127,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneOneOfValue = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneOneOfValue") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneOneOfValue = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneOneOfValue") fd_TestVersion3LoneOneOfValue_x = md_TestVersion3LoneOneOfValue.Fields().ByName("x") fd_TestVersion3LoneOneOfValue_a = md_TestVersion3LoneOneOfValue.Fields().ByName("a") fd_TestVersion3LoneOneOfValue_b = md_TestVersion3LoneOneOfValue.Fields().ByName("b") @@ -11150,7 +11150,7 @@ func (x *TestVersion3LoneOneOfValue) ProtoReflect() protoreflect.Message { } func (x *TestVersion3LoneOneOfValue) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[14] + mi := &file_testpb_unknonwnproto_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -11285,17 +11285,17 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Range(f func(protoreflect.Fi // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneOneOfValue) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneOneOfValue.x": + case "testpb.TestVersion3LoneOneOfValue.x": return x.X != int64(0) - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": return x.A != nil - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": return x.B != nil - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": return len(x.C) != 0 - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": return len(x.D) != 0 - case "testdata.TestVersion3LoneOneOfValue.e": + case "testpb.TestVersion3LoneOneOfValue.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion3LoneOneOfValue_E); ok { @@ -11303,19 +11303,19 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Has(fd protoreflect.FieldDes } else { return false } - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": return x.G != nil - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": return len(x.H) != 0 - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": return x.K != nil - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": return x.NonCriticalField != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) } } @@ -11327,31 +11327,31 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Has(fd protoreflect.FieldDes // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneOneOfValue) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneOneOfValue.x": + case "testpb.TestVersion3LoneOneOfValue.x": x.X = int64(0) - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": x.A = nil - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": x.B = nil - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": x.C = nil - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": x.D = nil - case "testdata.TestVersion3LoneOneOfValue.e": + case "testpb.TestVersion3LoneOneOfValue.e": x.Sum = nil - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": x.G = nil - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": x.H = nil - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": x.K = nil - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": x.NonCriticalField = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) } } @@ -11363,28 +11363,28 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Clear(fd protoreflect.FieldD // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneOneOfValue) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneOneOfValue.x": + case "testpb.TestVersion3LoneOneOfValue.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_4_list{}) } listValue := &_TestVersion3LoneOneOfValue_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_5_list{}) } listValue := &_TestVersion3LoneOneOfValue_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneOneOfValue.e": + case "testpb.TestVersion3LoneOneOfValue.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersion3LoneOneOfValue_E); ok { @@ -11392,26 +11392,26 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Get(descriptor protoreflect. } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_9_list{}) } listValue := &_TestVersion3LoneOneOfValue_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": value := x.NonCriticalField return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", descriptor.FullName())) } } @@ -11427,38 +11427,38 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Get(descriptor protoreflect. // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneOneOfValue) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneOneOfValue.x": + case "testpb.TestVersion3LoneOneOfValue.x": x.X = value.Int() - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": x.A = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": x.B = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": lv := value.List() clv := lv.(*_TestVersion3LoneOneOfValue_4_list) x.C = *clv.list - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": lv := value.List() clv := lv.(*_TestVersion3LoneOneOfValue_5_list) x.D = *clv.list - case "testdata.TestVersion3LoneOneOfValue.e": + case "testpb.TestVersion3LoneOneOfValue.e": cv := int32(value.Int()) x.Sum = &TestVersion3LoneOneOfValue_E{E: cv} - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": lv := value.List() clv := lv.(*_TestVersion3LoneOneOfValue_9_list) x.H = *clv.list - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": x.K = value.Message().Interface().(*Customer1) - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": x.NonCriticalField = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) } } @@ -11474,55 +11474,55 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Set(fd protoreflect.FieldDes // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneOneOfValue) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": if x.A == nil { x.A = new(TestVersion3) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": if x.B == nil { x.B = new(TestVersion3) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": if x.C == nil { x.C = []*TestVersion3{} } value := &_TestVersion3LoneOneOfValue_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": if x.D == nil { x.D = []*TestVersion3{} } value := &_TestVersion3LoneOneOfValue_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion3LoneOneOfValue_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.x": - panic(fmt.Errorf("field x of message testdata.TestVersion3LoneOneOfValue is not mutable")) - case "testdata.TestVersion3LoneOneOfValue.e": - panic(fmt.Errorf("field e of message testdata.TestVersion3LoneOneOfValue is not mutable")) - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": - panic(fmt.Errorf("field non_critical_field of message testdata.TestVersion3LoneOneOfValue is not mutable")) + case "testpb.TestVersion3LoneOneOfValue.x": + panic(fmt.Errorf("field x of message testpb.TestVersion3LoneOneOfValue is not mutable")) + case "testpb.TestVersion3LoneOneOfValue.e": + panic(fmt.Errorf("field e of message testpb.TestVersion3LoneOneOfValue is not mutable")) + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": + panic(fmt.Errorf("field non_critical_field of message testpb.TestVersion3LoneOneOfValue is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) } } @@ -11531,38 +11531,38 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) Mutable(fd protoreflect.Fiel // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneOneOfValue) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneOneOfValue.x": + case "testpb.TestVersion3LoneOneOfValue.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion3LoneOneOfValue.a": + case "testpb.TestVersion3LoneOneOfValue.a": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.b": + case "testpb.TestVersion3LoneOneOfValue.b": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.c": + case "testpb.TestVersion3LoneOneOfValue.c": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_4_list{list: &list}) - case "testdata.TestVersion3LoneOneOfValue.d": + case "testpb.TestVersion3LoneOneOfValue.d": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_5_list{list: &list}) - case "testdata.TestVersion3LoneOneOfValue.e": + case "testpb.TestVersion3LoneOneOfValue.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersion3LoneOneOfValue.g": + case "testpb.TestVersion3LoneOneOfValue.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.h": + case "testpb.TestVersion3LoneOneOfValue.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion3LoneOneOfValue_9_list{list: &list}) - case "testdata.TestVersion3LoneOneOfValue.k": + case "testpb.TestVersion3LoneOneOfValue.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneOneOfValue.non_critical_field": + case "testpb.TestVersion3LoneOneOfValue.non_critical_field": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneOneOfValue")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneOneOfValue")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneOneOfValue does not contain field %s", fd.FullName())) } } @@ -11571,7 +11571,7 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) NewField(fd protoreflect.Fie // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion3LoneOneOfValue) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion3LoneOneOfValue.sum": + case "testpb.TestVersion3LoneOneOfValue.sum": if x.Sum == nil { return nil } @@ -11580,7 +11580,7 @@ func (x *fastReflection_TestVersion3LoneOneOfValue) WhichOneof(d protoreflect.On return x.Descriptor().Fields().ByName("e") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneOneOfValue", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneOneOfValue", d.FullName())) } panic("unreachable") } @@ -12407,8 +12407,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneNesting = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneNesting = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting") fd_TestVersion3LoneNesting_x = md_TestVersion3LoneNesting.Fields().ByName("x") fd_TestVersion3LoneNesting_a = md_TestVersion3LoneNesting.Fields().ByName("a") fd_TestVersion3LoneNesting_b = md_TestVersion3LoneNesting.Fields().ByName("b") @@ -12432,7 +12432,7 @@ func (x *TestVersion3LoneNesting) ProtoReflect() protoreflect.Message { } func (x *TestVersion3LoneNesting) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[15] + mi := &file_testpb_unknonwnproto_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -12579,17 +12579,17 @@ func (x *fastReflection_TestVersion3LoneNesting) Range(f func(protoreflect.Field // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneNesting) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.x": + case "testpb.TestVersion3LoneNesting.x": return x.X != int64(0) - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": return x.A != nil - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": return x.B != nil - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": return len(x.C) != 0 - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": return len(x.D) != 0 - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion3LoneNesting_F); ok { @@ -12597,23 +12597,23 @@ func (x *fastReflection_TestVersion3LoneNesting) Has(fd protoreflect.FieldDescri } else { return false } - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": return x.G != nil - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": return len(x.H) != 0 - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": return x.K != nil - case "testdata.TestVersion3LoneNesting.non_critical_field": + case "testpb.TestVersion3LoneNesting.non_critical_field": return x.NonCriticalField != "" - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": return x.Inner1 != nil - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": return x.Inner2 != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", fd.FullName())) } } @@ -12625,35 +12625,35 @@ func (x *fastReflection_TestVersion3LoneNesting) Has(fd protoreflect.FieldDescri // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.x": + case "testpb.TestVersion3LoneNesting.x": x.X = int64(0) - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": x.A = nil - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": x.B = nil - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": x.C = nil - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": x.D = nil - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": x.Sum = nil - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": x.G = nil - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": x.H = nil - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": x.K = nil - case "testdata.TestVersion3LoneNesting.non_critical_field": + case "testpb.TestVersion3LoneNesting.non_critical_field": x.NonCriticalField = "" - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": x.Inner1 = nil - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": x.Inner2 = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", fd.FullName())) } } @@ -12665,28 +12665,28 @@ func (x *fastReflection_TestVersion3LoneNesting) Clear(fd protoreflect.FieldDesc // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneNesting) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneNesting.x": + case "testpb.TestVersion3LoneNesting.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneNesting_4_list{}) } listValue := &_TestVersion3LoneNesting_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneNesting_5_list{}) } listValue := &_TestVersion3LoneNesting_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion3LoneNesting)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersion3LoneNesting_F); ok { @@ -12694,32 +12694,32 @@ func (x *fastReflection_TestVersion3LoneNesting) Get(descriptor protoreflect.Fie } else { return protoreflect.ValueOfMessage((*TestVersion3LoneNesting)(nil).ProtoReflect()) } - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion3LoneNesting_9_list{}) } listValue := &_TestVersion3LoneNesting_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.non_critical_field": + case "testpb.TestVersion3LoneNesting.non_critical_field": value := x.NonCriticalField return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": value := x.Inner1 return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": value := x.Inner2 return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", descriptor.FullName())) } } @@ -12735,42 +12735,42 @@ func (x *fastReflection_TestVersion3LoneNesting) Get(descriptor protoreflect.Fie // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.x": + case "testpb.TestVersion3LoneNesting.x": x.X = value.Int() - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": x.A = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": x.B = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": lv := value.List() clv := lv.(*_TestVersion3LoneNesting_4_list) x.C = *clv.list - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": lv := value.List() clv := lv.(*_TestVersion3LoneNesting_5_list) x.D = *clv.list - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": cv := value.Message().Interface().(*TestVersion3LoneNesting) x.Sum = &TestVersion3LoneNesting_F{F: cv} - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": lv := value.List() clv := lv.(*_TestVersion3LoneNesting_9_list) x.H = *clv.list - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": x.K = value.Message().Interface().(*Customer1) - case "testdata.TestVersion3LoneNesting.non_critical_field": + case "testpb.TestVersion3LoneNesting.non_critical_field": x.NonCriticalField = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": x.Inner1 = value.Message().Interface().(*TestVersion3LoneNesting_Inner1) - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": x.Inner2 = value.Message().Interface().(*TestVersion3LoneNesting_Inner2) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", fd.FullName())) } } @@ -12786,29 +12786,29 @@ func (x *fastReflection_TestVersion3LoneNesting) Set(fd protoreflect.FieldDescri // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": if x.A == nil { x.A = new(TestVersion3) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": if x.B == nil { x.B = new(TestVersion3) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": if x.C == nil { x.C = []*TestVersion3{} } value := &_TestVersion3LoneNesting_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": if x.D == nil { x.D = []*TestVersion3{} } value := &_TestVersion3LoneNesting_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": if x.Sum == nil { value := &TestVersion3LoneNesting{} oneofValue := &TestVersion3LoneNesting_F{F: value} @@ -12824,41 +12824,41 @@ func (x *fastReflection_TestVersion3LoneNesting) Mutable(fd protoreflect.FieldDe x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion3LoneNesting_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": if x.Inner1 == nil { x.Inner1 = new(TestVersion3LoneNesting_Inner1) } return protoreflect.ValueOfMessage(x.Inner1.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": if x.Inner2 == nil { x.Inner2 = new(TestVersion3LoneNesting_Inner2) } return protoreflect.ValueOfMessage(x.Inner2.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.x": - panic(fmt.Errorf("field x of message testdata.TestVersion3LoneNesting is not mutable")) - case "testdata.TestVersion3LoneNesting.non_critical_field": - panic(fmt.Errorf("field non_critical_field of message testdata.TestVersion3LoneNesting is not mutable")) + case "testpb.TestVersion3LoneNesting.x": + panic(fmt.Errorf("field x of message testpb.TestVersion3LoneNesting is not mutable")) + case "testpb.TestVersion3LoneNesting.non_critical_field": + panic(fmt.Errorf("field non_critical_field of message testpb.TestVersion3LoneNesting is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", fd.FullName())) } } @@ -12867,45 +12867,45 @@ func (x *fastReflection_TestVersion3LoneNesting) Mutable(fd protoreflect.FieldDe // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneNesting) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.x": + case "testpb.TestVersion3LoneNesting.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion3LoneNesting.a": + case "testpb.TestVersion3LoneNesting.a": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.b": + case "testpb.TestVersion3LoneNesting.b": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.c": + case "testpb.TestVersion3LoneNesting.c": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3LoneNesting_4_list{list: &list}) - case "testdata.TestVersion3LoneNesting.d": + case "testpb.TestVersion3LoneNesting.d": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion3LoneNesting_5_list{list: &list}) - case "testdata.TestVersion3LoneNesting.f": + case "testpb.TestVersion3LoneNesting.f": value := &TestVersion3LoneNesting{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.g": + case "testpb.TestVersion3LoneNesting.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.h": + case "testpb.TestVersion3LoneNesting.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion3LoneNesting_9_list{list: &list}) - case "testdata.TestVersion3LoneNesting.k": + case "testpb.TestVersion3LoneNesting.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.non_critical_field": + case "testpb.TestVersion3LoneNesting.non_critical_field": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.inner1": + case "testpb.TestVersion3LoneNesting.inner1": m := new(TestVersion3LoneNesting_Inner1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.inner2": + case "testpb.TestVersion3LoneNesting.inner2": m := new(TestVersion3LoneNesting_Inner2) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting does not contain field %s", fd.FullName())) } } @@ -12914,7 +12914,7 @@ func (x *fastReflection_TestVersion3LoneNesting) NewField(fd protoreflect.FieldD // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion3LoneNesting) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion3LoneNesting.sum": + case "testpb.TestVersion3LoneNesting.sum": if x.Sum == nil { return nil } @@ -12923,7 +12923,7 @@ func (x *fastReflection_TestVersion3LoneNesting) WhichOneof(d protoreflect.Oneof return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneNesting", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneNesting", d.FullName())) } panic("unreachable") } @@ -13721,8 +13721,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneNesting_Inner1 = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner1") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneNesting_Inner1 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner1") fd_TestVersion3LoneNesting_Inner1_id = md_TestVersion3LoneNesting_Inner1.Fields().ByName("id") fd_TestVersion3LoneNesting_Inner1_name = md_TestVersion3LoneNesting_Inner1.Fields().ByName("name") fd_TestVersion3LoneNesting_Inner1_inner = md_TestVersion3LoneNesting_Inner1.Fields().ByName("inner") @@ -13737,7 +13737,7 @@ func (x *TestVersion3LoneNesting_Inner1) ProtoReflect() protoreflect.Message { } func (x *TestVersion3LoneNesting_Inner1) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[25] + mi := &file_testpb_unknonwnproto_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -13826,17 +13826,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Range(f func(protoreflec // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneNesting_Inner1) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.id": + case "testpb.TestVersion3LoneNesting.Inner1.id": return x.Id != int64(0) - case "testdata.TestVersion3LoneNesting.Inner1.name": + case "testpb.TestVersion3LoneNesting.Inner1.name": return x.Name != "" - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": return x.Inner != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -13848,17 +13848,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Has(fd protoreflect.Fiel // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.id": + case "testpb.TestVersion3LoneNesting.Inner1.id": x.Id = int64(0) - case "testdata.TestVersion3LoneNesting.Inner1.name": + case "testpb.TestVersion3LoneNesting.Inner1.name": x.Name = "" - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": x.Inner = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -13870,20 +13870,20 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Clear(fd protoreflect.Fi // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneNesting_Inner1) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.id": + case "testpb.TestVersion3LoneNesting.Inner1.id": value := x.Id return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion3LoneNesting.Inner1.name": + case "testpb.TestVersion3LoneNesting.Inner1.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": value := x.Inner return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", descriptor.FullName())) } } @@ -13899,17 +13899,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Get(descriptor protorefl // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.id": + case "testpb.TestVersion3LoneNesting.Inner1.id": x.Id = value.Int() - case "testdata.TestVersion3LoneNesting.Inner1.name": + case "testpb.TestVersion3LoneNesting.Inner1.name": x.Name = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": x.Inner = value.Message().Interface().(*TestVersion3LoneNesting_Inner1_InnerInner) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -13925,20 +13925,20 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Set(fd protoreflect.Fiel // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": if x.Inner == nil { x.Inner = new(TestVersion3LoneNesting_Inner1_InnerInner) } return protoreflect.ValueOfMessage(x.Inner.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.Inner1.id": - panic(fmt.Errorf("field id of message testdata.TestVersion3LoneNesting.Inner1 is not mutable")) - case "testdata.TestVersion3LoneNesting.Inner1.name": - panic(fmt.Errorf("field name of message testdata.TestVersion3LoneNesting.Inner1 is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner1.id": + panic(fmt.Errorf("field id of message testpb.TestVersion3LoneNesting.Inner1 is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner1.name": + panic(fmt.Errorf("field name of message testpb.TestVersion3LoneNesting.Inner1 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -13947,18 +13947,18 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) Mutable(fd protoreflect. // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneNesting_Inner1) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.id": + case "testpb.TestVersion3LoneNesting.Inner1.id": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion3LoneNesting.Inner1.name": + case "testpb.TestVersion3LoneNesting.Inner1.name": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.Inner1.inner": + case "testpb.TestVersion3LoneNesting.Inner1.inner": m := new(TestVersion3LoneNesting_Inner1_InnerInner) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -13968,7 +13968,7 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1) NewField(fd protoreflect func (x *fastReflection_TestVersion3LoneNesting_Inner1) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneNesting.Inner1", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneNesting.Inner1", d.FullName())) } panic("unreachable") } @@ -14267,8 +14267,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneNesting_Inner1_InnerInner = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner1").Messages().ByName("InnerInner") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneNesting_Inner1_InnerInner = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner1").Messages().ByName("InnerInner") fd_TestVersion3LoneNesting_Inner1_InnerInner_id = md_TestVersion3LoneNesting_Inner1_InnerInner.Fields().ByName("id") fd_TestVersion3LoneNesting_Inner1_InnerInner_city = md_TestVersion3LoneNesting_Inner1_InnerInner.Fields().ByName("city") } @@ -14282,7 +14282,7 @@ func (x *TestVersion3LoneNesting_Inner1_InnerInner) ProtoReflect() protoreflect. } func (x *TestVersion3LoneNesting_Inner1_InnerInner) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[27] + mi := &file_testpb_unknonwnproto_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -14365,15 +14365,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Range(f func( // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": return x.Id != "" - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": return x.City != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -14385,15 +14385,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Has(fd protor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": x.Id = "" - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": x.City = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -14405,17 +14405,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Clear(fd prot // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": value := x.Id return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": value := x.City return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", descriptor.FullName())) } } @@ -14431,15 +14431,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Get(descripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": x.Id = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": x.City = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -14455,15 +14455,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Set(fd protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": - panic(fmt.Errorf("field id of message testdata.TestVersion3LoneNesting.Inner1.InnerInner is not mutable")) - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": - panic(fmt.Errorf("field city of message testdata.TestVersion3LoneNesting.Inner1.InnerInner is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": + panic(fmt.Errorf("field id of message testpb.TestVersion3LoneNesting.Inner1.InnerInner is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": + panic(fmt.Errorf("field city of message testpb.TestVersion3LoneNesting.Inner1.InnerInner is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -14472,15 +14472,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) Mutable(fd pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.id": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner1.InnerInner.city": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -14490,7 +14490,7 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) NewField(fd p func (x *fastReflection_TestVersion3LoneNesting_Inner1_InnerInner) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneNesting.Inner1.InnerInner", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneNesting.Inner1.InnerInner", d.FullName())) } panic("unreachable") } @@ -14752,8 +14752,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneNesting_Inner2 = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner2") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneNesting_Inner2 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner2") fd_TestVersion3LoneNesting_Inner2_id = md_TestVersion3LoneNesting_Inner2.Fields().ByName("id") fd_TestVersion3LoneNesting_Inner2_country = md_TestVersion3LoneNesting_Inner2.Fields().ByName("country") fd_TestVersion3LoneNesting_Inner2_inner = md_TestVersion3LoneNesting_Inner2.Fields().ByName("inner") @@ -14768,7 +14768,7 @@ func (x *TestVersion3LoneNesting_Inner2) ProtoReflect() protoreflect.Message { } func (x *TestVersion3LoneNesting_Inner2) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[26] + mi := &file_testpb_unknonwnproto_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -14857,17 +14857,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Range(f func(protoreflec // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneNesting_Inner2) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.id": + case "testpb.TestVersion3LoneNesting.Inner2.id": return x.Id != "" - case "testdata.TestVersion3LoneNesting.Inner2.country": + case "testpb.TestVersion3LoneNesting.Inner2.country": return x.Country != "" - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": return x.Inner != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -14879,17 +14879,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Has(fd protoreflect.Fiel // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.id": + case "testpb.TestVersion3LoneNesting.Inner2.id": x.Id = "" - case "testdata.TestVersion3LoneNesting.Inner2.country": + case "testpb.TestVersion3LoneNesting.Inner2.country": x.Country = "" - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": x.Inner = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -14901,20 +14901,20 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Clear(fd protoreflect.Fi // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneNesting_Inner2) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.id": + case "testpb.TestVersion3LoneNesting.Inner2.id": value := x.Id return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.Inner2.country": + case "testpb.TestVersion3LoneNesting.Inner2.country": value := x.Country return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": value := x.Inner return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", descriptor.FullName())) } } @@ -14930,17 +14930,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Get(descriptor protorefl // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.id": + case "testpb.TestVersion3LoneNesting.Inner2.id": x.Id = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.Inner2.country": + case "testpb.TestVersion3LoneNesting.Inner2.country": x.Country = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": x.Inner = value.Message().Interface().(*TestVersion3LoneNesting_Inner2_InnerInner) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -14956,20 +14956,20 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Set(fd protoreflect.Fiel // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": if x.Inner == nil { x.Inner = new(TestVersion3LoneNesting_Inner2_InnerInner) } return protoreflect.ValueOfMessage(x.Inner.ProtoReflect()) - case "testdata.TestVersion3LoneNesting.Inner2.id": - panic(fmt.Errorf("field id of message testdata.TestVersion3LoneNesting.Inner2 is not mutable")) - case "testdata.TestVersion3LoneNesting.Inner2.country": - panic(fmt.Errorf("field country of message testdata.TestVersion3LoneNesting.Inner2 is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner2.id": + panic(fmt.Errorf("field id of message testpb.TestVersion3LoneNesting.Inner2 is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner2.country": + panic(fmt.Errorf("field country of message testpb.TestVersion3LoneNesting.Inner2 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -14978,18 +14978,18 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) Mutable(fd protoreflect. // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneNesting_Inner2) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.id": + case "testpb.TestVersion3LoneNesting.Inner2.id": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.Inner2.country": + case "testpb.TestVersion3LoneNesting.Inner2.country": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.Inner2.inner": + case "testpb.TestVersion3LoneNesting.Inner2.inner": m := new(TestVersion3LoneNesting_Inner2_InnerInner) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -14999,7 +14999,7 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2) NewField(fd protoreflect func (x *fastReflection_TestVersion3LoneNesting_Inner2) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneNesting.Inner2", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneNesting.Inner2", d.FullName())) } panic("unreachable") } @@ -15314,8 +15314,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion3LoneNesting_Inner2_InnerInner = File_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner2").Messages().ByName("InnerInner") + file_testpb_unknonwnproto_proto_init() + md_TestVersion3LoneNesting_Inner2_InnerInner = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion3LoneNesting").Messages().ByName("Inner2").Messages().ByName("InnerInner") fd_TestVersion3LoneNesting_Inner2_InnerInner_id = md_TestVersion3LoneNesting_Inner2_InnerInner.Fields().ByName("id") fd_TestVersion3LoneNesting_Inner2_InnerInner_city = md_TestVersion3LoneNesting_Inner2_InnerInner.Fields().ByName("city") } @@ -15329,7 +15329,7 @@ func (x *TestVersion3LoneNesting_Inner2_InnerInner) ProtoReflect() protoreflect. } func (x *TestVersion3LoneNesting_Inner2_InnerInner) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[28] + mi := &file_testpb_unknonwnproto_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -15412,15 +15412,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Range(f func( // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": return x.Id != "" - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": return x.City != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -15432,15 +15432,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Has(fd protor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": x.Id = "" - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": x.City = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -15452,17 +15452,17 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Clear(fd prot // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": value := x.Id return protoreflect.ValueOfString(value) - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": value := x.City return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", descriptor.FullName())) } } @@ -15478,15 +15478,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Get(descripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": x.Id = value.Interface().(string) - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": x.City = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -15502,15 +15502,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Set(fd protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": - panic(fmt.Errorf("field id of message testdata.TestVersion3LoneNesting.Inner2.InnerInner is not mutable")) - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": - panic(fmt.Errorf("field city of message testdata.TestVersion3LoneNesting.Inner2.InnerInner is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": + panic(fmt.Errorf("field id of message testpb.TestVersion3LoneNesting.Inner2.InnerInner is not mutable")) + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": + panic(fmt.Errorf("field city of message testpb.TestVersion3LoneNesting.Inner2.InnerInner is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -15519,15 +15519,15 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) Mutable(fd pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.id": return protoreflect.ValueOfString("") - case "testdata.TestVersion3LoneNesting.Inner2.InnerInner.city": + case "testpb.TestVersion3LoneNesting.Inner2.InnerInner.city": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion3LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion3LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion3LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -15537,7 +15537,7 @@ func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) NewField(fd p func (x *fastReflection_TestVersion3LoneNesting_Inner2_InnerInner) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion3LoneNesting.Inner2.InnerInner", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion3LoneNesting.Inner2.InnerInner", d.FullName())) } panic("unreachable") } @@ -15961,8 +15961,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion4LoneNesting = File_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting") + file_testpb_unknonwnproto_proto_init() + md_TestVersion4LoneNesting = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting") fd_TestVersion4LoneNesting_x = md_TestVersion4LoneNesting.Fields().ByName("x") fd_TestVersion4LoneNesting_a = md_TestVersion4LoneNesting.Fields().ByName("a") fd_TestVersion4LoneNesting_b = md_TestVersion4LoneNesting.Fields().ByName("b") @@ -15986,7 +15986,7 @@ func (x *TestVersion4LoneNesting) ProtoReflect() protoreflect.Message { } func (x *TestVersion4LoneNesting) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[16] + mi := &file_testpb_unknonwnproto_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -16133,17 +16133,17 @@ func (x *fastReflection_TestVersion4LoneNesting) Range(f func(protoreflect.Field // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion4LoneNesting) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.x": + case "testpb.TestVersion4LoneNesting.x": return x.X != int64(0) - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": return x.A != nil - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": return x.B != nil - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": return len(x.C) != 0 - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": return len(x.D) != 0 - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersion4LoneNesting_F); ok { @@ -16151,23 +16151,23 @@ func (x *fastReflection_TestVersion4LoneNesting) Has(fd protoreflect.FieldDescri } else { return false } - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": return x.G != nil - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": return len(x.H) != 0 - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": return x.K != nil - case "testdata.TestVersion4LoneNesting.non_critical_field": + case "testpb.TestVersion4LoneNesting.non_critical_field": return x.NonCriticalField != "" - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": return x.Inner1 != nil - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": return x.Inner2 != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", fd.FullName())) } } @@ -16179,35 +16179,35 @@ func (x *fastReflection_TestVersion4LoneNesting) Has(fd protoreflect.FieldDescri // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.x": + case "testpb.TestVersion4LoneNesting.x": x.X = int64(0) - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": x.A = nil - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": x.B = nil - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": x.C = nil - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": x.D = nil - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": x.Sum = nil - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": x.G = nil - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": x.H = nil - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": x.K = nil - case "testdata.TestVersion4LoneNesting.non_critical_field": + case "testpb.TestVersion4LoneNesting.non_critical_field": x.NonCriticalField = "" - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": x.Inner1 = nil - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": x.Inner2 = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", fd.FullName())) } } @@ -16219,28 +16219,28 @@ func (x *fastReflection_TestVersion4LoneNesting) Clear(fd protoreflect.FieldDesc // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion4LoneNesting) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion4LoneNesting.x": + case "testpb.TestVersion4LoneNesting.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": value := x.B return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": if len(x.C) == 0 { return protoreflect.ValueOfList(&_TestVersion4LoneNesting_4_list{}) } listValue := &_TestVersion4LoneNesting_4_list{list: &x.C} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": if len(x.D) == 0 { return protoreflect.ValueOfList(&_TestVersion4LoneNesting_5_list{}) } listValue := &_TestVersion4LoneNesting_5_list{list: &x.D} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion3LoneNesting)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersion4LoneNesting_F); ok { @@ -16248,32 +16248,32 @@ func (x *fastReflection_TestVersion4LoneNesting) Get(descriptor protoreflect.Fie } else { return protoreflect.ValueOfMessage((*TestVersion3LoneNesting)(nil).ProtoReflect()) } - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersion4LoneNesting_9_list{}) } listValue := &_TestVersion4LoneNesting_9_list{list: &x.H} return protoreflect.ValueOfList(listValue) - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": value := x.K return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.non_critical_field": + case "testpb.TestVersion4LoneNesting.non_critical_field": value := x.NonCriticalField return protoreflect.ValueOfString(value) - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": value := x.Inner1 return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": value := x.Inner2 return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", descriptor.FullName())) } } @@ -16289,42 +16289,42 @@ func (x *fastReflection_TestVersion4LoneNesting) Get(descriptor protoreflect.Fie // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.x": + case "testpb.TestVersion4LoneNesting.x": x.X = value.Int() - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": x.A = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": x.B = value.Message().Interface().(*TestVersion3) - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": lv := value.List() clv := lv.(*_TestVersion4LoneNesting_4_list) x.C = *clv.list - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": lv := value.List() clv := lv.(*_TestVersion4LoneNesting_5_list) x.D = *clv.list - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": cv := value.Message().Interface().(*TestVersion3LoneNesting) x.Sum = &TestVersion4LoneNesting_F{F: cv} - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": lv := value.List() clv := lv.(*_TestVersion4LoneNesting_9_list) x.H = *clv.list - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": x.K = value.Message().Interface().(*Customer1) - case "testdata.TestVersion4LoneNesting.non_critical_field": + case "testpb.TestVersion4LoneNesting.non_critical_field": x.NonCriticalField = value.Interface().(string) - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": x.Inner1 = value.Message().Interface().(*TestVersion4LoneNesting_Inner1) - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": x.Inner2 = value.Message().Interface().(*TestVersion4LoneNesting_Inner2) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", fd.FullName())) } } @@ -16340,29 +16340,29 @@ func (x *fastReflection_TestVersion4LoneNesting) Set(fd protoreflect.FieldDescri // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": if x.A == nil { x.A = new(TestVersion3) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": if x.B == nil { x.B = new(TestVersion3) } return protoreflect.ValueOfMessage(x.B.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": if x.C == nil { x.C = []*TestVersion3{} } value := &_TestVersion4LoneNesting_4_list{list: &x.C} return protoreflect.ValueOfList(value) - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": if x.D == nil { x.D = []*TestVersion3{} } value := &_TestVersion4LoneNesting_5_list{list: &x.D} return protoreflect.ValueOfList(value) - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": if x.Sum == nil { value := &TestVersion3LoneNesting{} oneofValue := &TestVersion4LoneNesting_F{F: value} @@ -16378,41 +16378,41 @@ func (x *fastReflection_TestVersion4LoneNesting) Mutable(fd protoreflect.FieldDe x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersion4LoneNesting_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": if x.K == nil { x.K = new(Customer1) } return protoreflect.ValueOfMessage(x.K.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": if x.Inner1 == nil { x.Inner1 = new(TestVersion4LoneNesting_Inner1) } return protoreflect.ValueOfMessage(x.Inner1.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": if x.Inner2 == nil { x.Inner2 = new(TestVersion4LoneNesting_Inner2) } return protoreflect.ValueOfMessage(x.Inner2.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.x": - panic(fmt.Errorf("field x of message testdata.TestVersion4LoneNesting is not mutable")) - case "testdata.TestVersion4LoneNesting.non_critical_field": - panic(fmt.Errorf("field non_critical_field of message testdata.TestVersion4LoneNesting is not mutable")) + case "testpb.TestVersion4LoneNesting.x": + panic(fmt.Errorf("field x of message testpb.TestVersion4LoneNesting is not mutable")) + case "testpb.TestVersion4LoneNesting.non_critical_field": + panic(fmt.Errorf("field non_critical_field of message testpb.TestVersion4LoneNesting is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", fd.FullName())) } } @@ -16421,45 +16421,45 @@ func (x *fastReflection_TestVersion4LoneNesting) Mutable(fd protoreflect.FieldDe // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion4LoneNesting) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.x": + case "testpb.TestVersion4LoneNesting.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion4LoneNesting.a": + case "testpb.TestVersion4LoneNesting.a": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.b": + case "testpb.TestVersion4LoneNesting.b": m := new(TestVersion3) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.c": + case "testpb.TestVersion4LoneNesting.c": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion4LoneNesting_4_list{list: &list}) - case "testdata.TestVersion4LoneNesting.d": + case "testpb.TestVersion4LoneNesting.d": list := []*TestVersion3{} return protoreflect.ValueOfList(&_TestVersion4LoneNesting_5_list{list: &list}) - case "testdata.TestVersion4LoneNesting.f": + case "testpb.TestVersion4LoneNesting.f": value := &TestVersion3LoneNesting{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.g": + case "testpb.TestVersion4LoneNesting.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.h": + case "testpb.TestVersion4LoneNesting.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersion4LoneNesting_9_list{list: &list}) - case "testdata.TestVersion4LoneNesting.k": + case "testpb.TestVersion4LoneNesting.k": m := new(Customer1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.non_critical_field": + case "testpb.TestVersion4LoneNesting.non_critical_field": return protoreflect.ValueOfString("") - case "testdata.TestVersion4LoneNesting.inner1": + case "testpb.TestVersion4LoneNesting.inner1": m := new(TestVersion4LoneNesting_Inner1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.inner2": + case "testpb.TestVersion4LoneNesting.inner2": m := new(TestVersion4LoneNesting_Inner2) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting does not contain field %s", fd.FullName())) } } @@ -16468,7 +16468,7 @@ func (x *fastReflection_TestVersion4LoneNesting) NewField(fd protoreflect.FieldD // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersion4LoneNesting) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersion4LoneNesting.sum": + case "testpb.TestVersion4LoneNesting.sum": if x.Sum == nil { return nil } @@ -16477,7 +16477,7 @@ func (x *fastReflection_TestVersion4LoneNesting) WhichOneof(d protoreflect.Oneof return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion4LoneNesting", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion4LoneNesting", d.FullName())) } panic("unreachable") } @@ -17275,8 +17275,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion4LoneNesting_Inner1 = File_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner1") + file_testpb_unknonwnproto_proto_init() + md_TestVersion4LoneNesting_Inner1 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner1") fd_TestVersion4LoneNesting_Inner1_id = md_TestVersion4LoneNesting_Inner1.Fields().ByName("id") fd_TestVersion4LoneNesting_Inner1_name = md_TestVersion4LoneNesting_Inner1.Fields().ByName("name") fd_TestVersion4LoneNesting_Inner1_inner = md_TestVersion4LoneNesting_Inner1.Fields().ByName("inner") @@ -17291,7 +17291,7 @@ func (x *TestVersion4LoneNesting_Inner1) ProtoReflect() protoreflect.Message { } func (x *TestVersion4LoneNesting_Inner1) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[29] + mi := &file_testpb_unknonwnproto_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -17380,17 +17380,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Range(f func(protoreflec // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion4LoneNesting_Inner1) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.id": + case "testpb.TestVersion4LoneNesting.Inner1.id": return x.Id != int64(0) - case "testdata.TestVersion4LoneNesting.Inner1.name": + case "testpb.TestVersion4LoneNesting.Inner1.name": return x.Name != "" - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": return x.Inner != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -17402,17 +17402,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Has(fd protoreflect.Fiel // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.id": + case "testpb.TestVersion4LoneNesting.Inner1.id": x.Id = int64(0) - case "testdata.TestVersion4LoneNesting.Inner1.name": + case "testpb.TestVersion4LoneNesting.Inner1.name": x.Name = "" - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": x.Inner = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -17424,20 +17424,20 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Clear(fd protoreflect.Fi // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion4LoneNesting_Inner1) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.id": + case "testpb.TestVersion4LoneNesting.Inner1.id": value := x.Id return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion4LoneNesting.Inner1.name": + case "testpb.TestVersion4LoneNesting.Inner1.name": value := x.Name return protoreflect.ValueOfString(value) - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": value := x.Inner return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", descriptor.FullName())) } } @@ -17453,17 +17453,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Get(descriptor protorefl // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.id": + case "testpb.TestVersion4LoneNesting.Inner1.id": x.Id = value.Int() - case "testdata.TestVersion4LoneNesting.Inner1.name": + case "testpb.TestVersion4LoneNesting.Inner1.name": x.Name = value.Interface().(string) - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": x.Inner = value.Message().Interface().(*TestVersion4LoneNesting_Inner1_InnerInner) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -17479,20 +17479,20 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Set(fd protoreflect.Fiel // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": if x.Inner == nil { x.Inner = new(TestVersion4LoneNesting_Inner1_InnerInner) } return protoreflect.ValueOfMessage(x.Inner.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.Inner1.id": - panic(fmt.Errorf("field id of message testdata.TestVersion4LoneNesting.Inner1 is not mutable")) - case "testdata.TestVersion4LoneNesting.Inner1.name": - panic(fmt.Errorf("field name of message testdata.TestVersion4LoneNesting.Inner1 is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner1.id": + panic(fmt.Errorf("field id of message testpb.TestVersion4LoneNesting.Inner1 is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner1.name": + panic(fmt.Errorf("field name of message testpb.TestVersion4LoneNesting.Inner1 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -17501,18 +17501,18 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) Mutable(fd protoreflect. // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion4LoneNesting_Inner1) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.id": + case "testpb.TestVersion4LoneNesting.Inner1.id": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion4LoneNesting.Inner1.name": + case "testpb.TestVersion4LoneNesting.Inner1.name": return protoreflect.ValueOfString("") - case "testdata.TestVersion4LoneNesting.Inner1.inner": + case "testpb.TestVersion4LoneNesting.Inner1.inner": m := new(TestVersion4LoneNesting_Inner1_InnerInner) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1 does not contain field %s", fd.FullName())) } } @@ -17522,7 +17522,7 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1) NewField(fd protoreflect func (x *fastReflection_TestVersion4LoneNesting_Inner1) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion4LoneNesting.Inner1", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion4LoneNesting.Inner1", d.FullName())) } panic("unreachable") } @@ -17821,8 +17821,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion4LoneNesting_Inner1_InnerInner = File_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner1").Messages().ByName("InnerInner") + file_testpb_unknonwnproto_proto_init() + md_TestVersion4LoneNesting_Inner1_InnerInner = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner1").Messages().ByName("InnerInner") fd_TestVersion4LoneNesting_Inner1_InnerInner_id = md_TestVersion4LoneNesting_Inner1_InnerInner.Fields().ByName("id") fd_TestVersion4LoneNesting_Inner1_InnerInner_city = md_TestVersion4LoneNesting_Inner1_InnerInner.Fields().ByName("city") } @@ -17836,7 +17836,7 @@ func (x *TestVersion4LoneNesting_Inner1_InnerInner) ProtoReflect() protoreflect. } func (x *TestVersion4LoneNesting_Inner1_InnerInner) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[31] + mi := &file_testpb_unknonwnproto_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -17919,15 +17919,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Range(f func( // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": return x.Id != int64(0) - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": return x.City != "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -17939,15 +17939,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Has(fd protor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": x.Id = int64(0) - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": x.City = "" default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -17959,17 +17959,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Clear(fd prot // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": value := x.Id return protoreflect.ValueOfInt64(value) - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": value := x.City return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", descriptor.FullName())) } } @@ -17985,15 +17985,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Get(descripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": x.Id = value.Int() - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": x.City = value.Interface().(string) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -18009,15 +18009,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Set(fd protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": - panic(fmt.Errorf("field id of message testdata.TestVersion4LoneNesting.Inner1.InnerInner is not mutable")) - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": - panic(fmt.Errorf("field city of message testdata.TestVersion4LoneNesting.Inner1.InnerInner is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": + panic(fmt.Errorf("field id of message testpb.TestVersion4LoneNesting.Inner1.InnerInner is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": + panic(fmt.Errorf("field city of message testpb.TestVersion4LoneNesting.Inner1.InnerInner is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -18026,15 +18026,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) Mutable(fd pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.id": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersion4LoneNesting.Inner1.InnerInner.city": + case "testpb.TestVersion4LoneNesting.Inner1.InnerInner.city": return protoreflect.ValueOfString("") default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner1.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner1.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner1.InnerInner does not contain field %s", fd.FullName())) } } @@ -18044,7 +18044,7 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) NewField(fd p func (x *fastReflection_TestVersion4LoneNesting_Inner1_InnerInner) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion4LoneNesting.Inner1.InnerInner", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion4LoneNesting.Inner1.InnerInner", d.FullName())) } panic("unreachable") } @@ -18290,8 +18290,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion4LoneNesting_Inner2 = File_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner2") + file_testpb_unknonwnproto_proto_init() + md_TestVersion4LoneNesting_Inner2 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner2") fd_TestVersion4LoneNesting_Inner2_id = md_TestVersion4LoneNesting_Inner2.Fields().ByName("id") fd_TestVersion4LoneNesting_Inner2_country = md_TestVersion4LoneNesting_Inner2.Fields().ByName("country") fd_TestVersion4LoneNesting_Inner2_inner = md_TestVersion4LoneNesting_Inner2.Fields().ByName("inner") @@ -18306,7 +18306,7 @@ func (x *TestVersion4LoneNesting_Inner2) ProtoReflect() protoreflect.Message { } func (x *TestVersion4LoneNesting_Inner2) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[30] + mi := &file_testpb_unknonwnproto_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -18395,17 +18395,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Range(f func(protoreflec // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion4LoneNesting_Inner2) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.id": + case "testpb.TestVersion4LoneNesting.Inner2.id": return x.Id != "" - case "testdata.TestVersion4LoneNesting.Inner2.country": + case "testpb.TestVersion4LoneNesting.Inner2.country": return x.Country != "" - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": return x.Inner != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -18417,17 +18417,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Has(fd protoreflect.Fiel // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.id": + case "testpb.TestVersion4LoneNesting.Inner2.id": x.Id = "" - case "testdata.TestVersion4LoneNesting.Inner2.country": + case "testpb.TestVersion4LoneNesting.Inner2.country": x.Country = "" - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": x.Inner = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -18439,20 +18439,20 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Clear(fd protoreflect.Fi // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion4LoneNesting_Inner2) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.id": + case "testpb.TestVersion4LoneNesting.Inner2.id": value := x.Id return protoreflect.ValueOfString(value) - case "testdata.TestVersion4LoneNesting.Inner2.country": + case "testpb.TestVersion4LoneNesting.Inner2.country": value := x.Country return protoreflect.ValueOfString(value) - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": value := x.Inner return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", descriptor.FullName())) } } @@ -18468,17 +18468,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Get(descriptor protorefl // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.id": + case "testpb.TestVersion4LoneNesting.Inner2.id": x.Id = value.Interface().(string) - case "testdata.TestVersion4LoneNesting.Inner2.country": + case "testpb.TestVersion4LoneNesting.Inner2.country": x.Country = value.Interface().(string) - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": x.Inner = value.Message().Interface().(*TestVersion4LoneNesting_Inner2_InnerInner) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -18494,20 +18494,20 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Set(fd protoreflect.Fiel // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": if x.Inner == nil { x.Inner = new(TestVersion4LoneNesting_Inner2_InnerInner) } return protoreflect.ValueOfMessage(x.Inner.ProtoReflect()) - case "testdata.TestVersion4LoneNesting.Inner2.id": - panic(fmt.Errorf("field id of message testdata.TestVersion4LoneNesting.Inner2 is not mutable")) - case "testdata.TestVersion4LoneNesting.Inner2.country": - panic(fmt.Errorf("field country of message testdata.TestVersion4LoneNesting.Inner2 is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner2.id": + panic(fmt.Errorf("field id of message testpb.TestVersion4LoneNesting.Inner2 is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner2.country": + panic(fmt.Errorf("field country of message testpb.TestVersion4LoneNesting.Inner2 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -18516,18 +18516,18 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) Mutable(fd protoreflect. // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion4LoneNesting_Inner2) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.id": + case "testpb.TestVersion4LoneNesting.Inner2.id": return protoreflect.ValueOfString("") - case "testdata.TestVersion4LoneNesting.Inner2.country": + case "testpb.TestVersion4LoneNesting.Inner2.country": return protoreflect.ValueOfString("") - case "testdata.TestVersion4LoneNesting.Inner2.inner": + case "testpb.TestVersion4LoneNesting.Inner2.inner": m := new(TestVersion4LoneNesting_Inner2_InnerInner) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2 does not contain field %s", fd.FullName())) } } @@ -18537,7 +18537,7 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2) NewField(fd protoreflect func (x *fastReflection_TestVersion4LoneNesting_Inner2) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion4LoneNesting.Inner2", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion4LoneNesting.Inner2", d.FullName())) } panic("unreachable") } @@ -18852,8 +18852,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersion4LoneNesting_Inner2_InnerInner = File_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner2").Messages().ByName("InnerInner") + file_testpb_unknonwnproto_proto_init() + md_TestVersion4LoneNesting_Inner2_InnerInner = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersion4LoneNesting").Messages().ByName("Inner2").Messages().ByName("InnerInner") fd_TestVersion4LoneNesting_Inner2_InnerInner_id = md_TestVersion4LoneNesting_Inner2_InnerInner.Fields().ByName("id") fd_TestVersion4LoneNesting_Inner2_InnerInner_value = md_TestVersion4LoneNesting_Inner2_InnerInner.Fields().ByName("value") } @@ -18867,7 +18867,7 @@ func (x *TestVersion4LoneNesting_Inner2_InnerInner) ProtoReflect() protoreflect. } func (x *TestVersion4LoneNesting_Inner2_InnerInner) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[32] + mi := &file_testpb_unknonwnproto_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -18950,15 +18950,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Range(f func( // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": return x.Id != "" - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": return x.Value != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -18970,15 +18970,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Has(fd protor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": x.Id = "" - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": x.Value = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -18990,17 +18990,17 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Clear(fd prot // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": value := x.Id return protoreflect.ValueOfString(value) - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": value := x.Value return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", descriptor.FullName())) } } @@ -19016,15 +19016,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Get(descripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": x.Id = value.Interface().(string) - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": x.Value = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -19040,15 +19040,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Set(fd protor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": - panic(fmt.Errorf("field id of message testdata.TestVersion4LoneNesting.Inner2.InnerInner is not mutable")) - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": - panic(fmt.Errorf("field value of message testdata.TestVersion4LoneNesting.Inner2.InnerInner is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": + panic(fmt.Errorf("field id of message testpb.TestVersion4LoneNesting.Inner2.InnerInner is not mutable")) + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": + panic(fmt.Errorf("field value of message testpb.TestVersion4LoneNesting.Inner2.InnerInner is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -19057,15 +19057,15 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) Mutable(fd pr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.id": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.id": return protoreflect.ValueOfString("") - case "testdata.TestVersion4LoneNesting.Inner2.InnerInner.value": + case "testpb.TestVersion4LoneNesting.Inner2.InnerInner.value": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersion4LoneNesting.Inner2.InnerInner")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersion4LoneNesting.Inner2.InnerInner")) } - panic(fmt.Errorf("message testdata.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersion4LoneNesting.Inner2.InnerInner does not contain field %s", fd.FullName())) } } @@ -19075,7 +19075,7 @@ func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) NewField(fd p func (x *fastReflection_TestVersion4LoneNesting_Inner2_InnerInner) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersion4LoneNesting.Inner2.InnerInner", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersion4LoneNesting.Inner2.InnerInner", d.FullName())) } panic("unreachable") } @@ -19375,8 +19375,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersionFD1 = File_unknonwnproto_proto.Messages().ByName("TestVersionFD1") + file_testpb_unknonwnproto_proto_init() + md_TestVersionFD1 = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersionFD1") fd_TestVersionFD1_x = md_TestVersionFD1.Fields().ByName("x") fd_TestVersionFD1_a = md_TestVersionFD1.Fields().ByName("a") fd_TestVersionFD1_e = md_TestVersionFD1.Fields().ByName("e") @@ -19394,7 +19394,7 @@ func (x *TestVersionFD1) ProtoReflect() protoreflect.Message { } func (x *TestVersionFD1) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[17] + mi := &file_testpb_unknonwnproto_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -19505,11 +19505,11 @@ func (x *fastReflection_TestVersionFD1) Range(f func(protoreflect.FieldDescripto // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersionFD1) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersionFD1.x": + case "testpb.TestVersionFD1.x": return x.X != int64(0) - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": return x.A != nil - case "testdata.TestVersionFD1.e": + case "testpb.TestVersionFD1.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersionFD1_E); ok { @@ -19517,7 +19517,7 @@ func (x *fastReflection_TestVersionFD1) Has(fd protoreflect.FieldDescriptor) boo } else { return false } - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersionFD1_F); ok { @@ -19525,15 +19525,15 @@ func (x *fastReflection_TestVersionFD1) Has(fd protoreflect.FieldDescriptor) boo } else { return false } - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": return x.G != nil - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": return len(x.H) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", fd.FullName())) } } @@ -19545,23 +19545,23 @@ func (x *fastReflection_TestVersionFD1) Has(fd protoreflect.FieldDescriptor) boo // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersionFD1.x": + case "testpb.TestVersionFD1.x": x.X = int64(0) - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": x.A = nil - case "testdata.TestVersionFD1.e": + case "testpb.TestVersionFD1.e": x.Sum = nil - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": x.Sum = nil - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": x.G = nil - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": x.H = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", fd.FullName())) } } @@ -19573,13 +19573,13 @@ func (x *fastReflection_TestVersionFD1) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersionFD1) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersionFD1.x": + case "testpb.TestVersionFD1.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1.e": + case "testpb.TestVersionFD1.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersionFD1_E); ok { @@ -19587,7 +19587,7 @@ func (x *fastReflection_TestVersionFD1) Get(descriptor protoreflect.FieldDescrip } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersionFD1_F); ok { @@ -19595,10 +19595,10 @@ func (x *fastReflection_TestVersionFD1) Get(descriptor protoreflect.FieldDescrip } else { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersionFD1_9_list{}) } @@ -19606,9 +19606,9 @@ func (x *fastReflection_TestVersionFD1) Get(descriptor protoreflect.FieldDescrip return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", descriptor.FullName())) } } @@ -19624,27 +19624,27 @@ func (x *fastReflection_TestVersionFD1) Get(descriptor protoreflect.FieldDescrip // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersionFD1.x": + case "testpb.TestVersionFD1.x": x.X = value.Int() - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": x.A = value.Message().Interface().(*TestVersion1) - case "testdata.TestVersionFD1.e": + case "testpb.TestVersionFD1.e": cv := int32(value.Int()) x.Sum = &TestVersionFD1_E{E: cv} - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": cv := value.Message().Interface().(*TestVersion1) x.Sum = &TestVersionFD1_F{F: cv} - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": x.G = value.Message().Interface().(*anypb.Any) - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": lv := value.List() clv := lv.(*_TestVersionFD1_9_list) x.H = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", fd.FullName())) } } @@ -19660,12 +19660,12 @@ func (x *fastReflection_TestVersionFD1) Set(fd protoreflect.FieldDescriptor, val // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": if x.A == nil { x.A = new(TestVersion1) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": if x.Sum == nil { value := &TestVersion1{} oneofValue := &TestVersionFD1_F{F: value} @@ -19681,26 +19681,26 @@ func (x *fastReflection_TestVersionFD1) Mutable(fd protoreflect.FieldDescriptor) x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": if x.G == nil { x.G = new(anypb.Any) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersionFD1_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersionFD1.x": - panic(fmt.Errorf("field x of message testdata.TestVersionFD1 is not mutable")) - case "testdata.TestVersionFD1.e": - panic(fmt.Errorf("field e of message testdata.TestVersionFD1 is not mutable")) + case "testpb.TestVersionFD1.x": + panic(fmt.Errorf("field x of message testpb.TestVersionFD1 is not mutable")) + case "testpb.TestVersionFD1.e": + panic(fmt.Errorf("field e of message testpb.TestVersionFD1 is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", fd.FullName())) } } @@ -19709,27 +19709,27 @@ func (x *fastReflection_TestVersionFD1) Mutable(fd protoreflect.FieldDescriptor) // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersionFD1) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersionFD1.x": + case "testpb.TestVersionFD1.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersionFD1.a": + case "testpb.TestVersionFD1.a": m := new(TestVersion1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersionFD1.e": + case "testpb.TestVersionFD1.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersionFD1.f": + case "testpb.TestVersionFD1.f": value := &TestVersion1{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1.g": + case "testpb.TestVersionFD1.g": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersionFD1.h": + case "testpb.TestVersionFD1.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersionFD1_9_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1")) } - panic(fmt.Errorf("message testdata.TestVersionFD1 does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1 does not contain field %s", fd.FullName())) } } @@ -19738,7 +19738,7 @@ func (x *fastReflection_TestVersionFD1) NewField(fd protoreflect.FieldDescriptor // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersionFD1) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersionFD1.sum": + case "testpb.TestVersionFD1.sum": if x.Sum == nil { return nil } @@ -19749,7 +19749,7 @@ func (x *fastReflection_TestVersionFD1) WhichOneof(d protoreflect.OneofDescripto return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersionFD1", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersionFD1", d.FullName())) } panic("unreachable") } @@ -20257,8 +20257,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestVersionFD1WithExtraAny = File_unknonwnproto_proto.Messages().ByName("TestVersionFD1WithExtraAny") + file_testpb_unknonwnproto_proto_init() + md_TestVersionFD1WithExtraAny = File_testpb_unknonwnproto_proto.Messages().ByName("TestVersionFD1WithExtraAny") fd_TestVersionFD1WithExtraAny_x = md_TestVersionFD1WithExtraAny.Fields().ByName("x") fd_TestVersionFD1WithExtraAny_a = md_TestVersionFD1WithExtraAny.Fields().ByName("a") fd_TestVersionFD1WithExtraAny_e = md_TestVersionFD1WithExtraAny.Fields().ByName("e") @@ -20276,7 +20276,7 @@ func (x *TestVersionFD1WithExtraAny) ProtoReflect() protoreflect.Message { } func (x *TestVersionFD1WithExtraAny) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[18] + mi := &file_testpb_unknonwnproto_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -20387,11 +20387,11 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Range(f func(protoreflect.Fi // a repeated field is populated if it is non-empty. func (x *fastReflection_TestVersionFD1WithExtraAny) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestVersionFD1WithExtraAny.x": + case "testpb.TestVersionFD1WithExtraAny.x": return x.X != int64(0) - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": return x.A != nil - case "testdata.TestVersionFD1WithExtraAny.e": + case "testpb.TestVersionFD1WithExtraAny.e": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersionFD1WithExtraAny_E); ok { @@ -20399,7 +20399,7 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Has(fd protoreflect.FieldDes } else { return false } - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": if x.Sum == nil { return false } else if _, ok := x.Sum.(*TestVersionFD1WithExtraAny_F); ok { @@ -20407,15 +20407,15 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Has(fd protoreflect.FieldDes } else { return false } - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": return x.G != nil - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": return len(x.H) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) } } @@ -20427,23 +20427,23 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Has(fd protoreflect.FieldDes // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1WithExtraAny) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestVersionFD1WithExtraAny.x": + case "testpb.TestVersionFD1WithExtraAny.x": x.X = int64(0) - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": x.A = nil - case "testdata.TestVersionFD1WithExtraAny.e": + case "testpb.TestVersionFD1WithExtraAny.e": x.Sum = nil - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": x.Sum = nil - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": x.G = nil - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": x.H = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) } } @@ -20455,13 +20455,13 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Clear(fd protoreflect.FieldD // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestVersionFD1WithExtraAny) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestVersionFD1WithExtraAny.x": + case "testpb.TestVersionFD1WithExtraAny.x": value := x.X return protoreflect.ValueOfInt64(value) - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.e": + case "testpb.TestVersionFD1WithExtraAny.e": if x.Sum == nil { return protoreflect.ValueOfInt32(int32(0)) } else if v, ok := x.Sum.(*TestVersionFD1WithExtraAny_E); ok { @@ -20469,7 +20469,7 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Get(descriptor protoreflect. } else { return protoreflect.ValueOfInt32(int32(0)) } - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": if x.Sum == nil { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } else if v, ok := x.Sum.(*TestVersionFD1WithExtraAny_F); ok { @@ -20477,10 +20477,10 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Get(descriptor protoreflect. } else { return protoreflect.ValueOfMessage((*TestVersion1)(nil).ProtoReflect()) } - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": value := x.G return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": if len(x.H) == 0 { return protoreflect.ValueOfList(&_TestVersionFD1WithExtraAny_9_list{}) } @@ -20488,9 +20488,9 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Get(descriptor protoreflect. return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", descriptor.FullName())) } } @@ -20506,27 +20506,27 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Get(descriptor protoreflect. // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1WithExtraAny) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestVersionFD1WithExtraAny.x": + case "testpb.TestVersionFD1WithExtraAny.x": x.X = value.Int() - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": x.A = value.Message().Interface().(*TestVersion1) - case "testdata.TestVersionFD1WithExtraAny.e": + case "testpb.TestVersionFD1WithExtraAny.e": cv := int32(value.Int()) x.Sum = &TestVersionFD1WithExtraAny_E{E: cv} - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": cv := value.Message().Interface().(*TestVersion1) x.Sum = &TestVersionFD1WithExtraAny_F{F: cv} - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": x.G = value.Message().Interface().(*AnyWithExtra) - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": lv := value.List() clv := lv.(*_TestVersionFD1WithExtraAny_9_list) x.H = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) } } @@ -20542,12 +20542,12 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Set(fd protoreflect.FieldDes // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestVersionFD1WithExtraAny) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": if x.A == nil { x.A = new(TestVersion1) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": if x.Sum == nil { value := &TestVersion1{} oneofValue := &TestVersionFD1WithExtraAny_F{F: value} @@ -20563,26 +20563,26 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Mutable(fd protoreflect.Fiel x.Sum = oneofValue return protoreflect.ValueOfMessage(value.ProtoReflect()) } - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": if x.G == nil { x.G = new(AnyWithExtra) } return protoreflect.ValueOfMessage(x.G.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": if x.H == nil { x.H = []*TestVersion1{} } value := &_TestVersionFD1WithExtraAny_9_list{list: &x.H} return protoreflect.ValueOfList(value) - case "testdata.TestVersionFD1WithExtraAny.x": - panic(fmt.Errorf("field x of message testdata.TestVersionFD1WithExtraAny is not mutable")) - case "testdata.TestVersionFD1WithExtraAny.e": - panic(fmt.Errorf("field e of message testdata.TestVersionFD1WithExtraAny is not mutable")) + case "testpb.TestVersionFD1WithExtraAny.x": + panic(fmt.Errorf("field x of message testpb.TestVersionFD1WithExtraAny is not mutable")) + case "testpb.TestVersionFD1WithExtraAny.e": + panic(fmt.Errorf("field e of message testpb.TestVersionFD1WithExtraAny is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) } } @@ -20591,27 +20591,27 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) Mutable(fd protoreflect.Fiel // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestVersionFD1WithExtraAny) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestVersionFD1WithExtraAny.x": + case "testpb.TestVersionFD1WithExtraAny.x": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestVersionFD1WithExtraAny.a": + case "testpb.TestVersionFD1WithExtraAny.a": m := new(TestVersion1) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.e": + case "testpb.TestVersionFD1WithExtraAny.e": return protoreflect.ValueOfInt32(int32(0)) - case "testdata.TestVersionFD1WithExtraAny.f": + case "testpb.TestVersionFD1WithExtraAny.f": value := &TestVersion1{} return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.g": + case "testpb.TestVersionFD1WithExtraAny.g": m := new(AnyWithExtra) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestVersionFD1WithExtraAny.h": + case "testpb.TestVersionFD1WithExtraAny.h": list := []*TestVersion1{} return protoreflect.ValueOfList(&_TestVersionFD1WithExtraAny_9_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestVersionFD1WithExtraAny")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestVersionFD1WithExtraAny")) } - panic(fmt.Errorf("message testdata.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestVersionFD1WithExtraAny does not contain field %s", fd.FullName())) } } @@ -20620,7 +20620,7 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) NewField(fd protoreflect.Fie // It panics if the oneof descriptor does not belong to this message. func (x *fastReflection_TestVersionFD1WithExtraAny) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { - case "testdata.TestVersionFD1WithExtraAny.sum": + case "testpb.TestVersionFD1WithExtraAny.sum": if x.Sum == nil { return nil } @@ -20631,7 +20631,7 @@ func (x *fastReflection_TestVersionFD1WithExtraAny) WhichOneof(d protoreflect.On return x.Descriptor().Fields().ByName("f") } default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestVersionFD1WithExtraAny", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestVersionFD1WithExtraAny", d.FullName())) } panic("unreachable") } @@ -21085,8 +21085,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_AnyWithExtra = File_unknonwnproto_proto.Messages().ByName("AnyWithExtra") + file_testpb_unknonwnproto_proto_init() + md_AnyWithExtra = File_testpb_unknonwnproto_proto.Messages().ByName("AnyWithExtra") fd_AnyWithExtra_a = md_AnyWithExtra.Fields().ByName("a") fd_AnyWithExtra_b = md_AnyWithExtra.Fields().ByName("b") fd_AnyWithExtra_c = md_AnyWithExtra.Fields().ByName("c") @@ -21101,7 +21101,7 @@ func (x *AnyWithExtra) ProtoReflect() protoreflect.Message { } func (x *AnyWithExtra) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[19] + mi := &file_testpb_unknonwnproto_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -21190,17 +21190,17 @@ func (x *fastReflection_AnyWithExtra) Range(f func(protoreflect.FieldDescriptor, // a repeated field is populated if it is non-empty. func (x *fastReflection_AnyWithExtra) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": return x.A != nil - case "testdata.AnyWithExtra.b": + case "testpb.AnyWithExtra.b": return x.B != int64(0) - case "testdata.AnyWithExtra.c": + case "testpb.AnyWithExtra.c": return x.C != int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", fd.FullName())) } } @@ -21212,17 +21212,17 @@ func (x *fastReflection_AnyWithExtra) Has(fd protoreflect.FieldDescriptor) bool // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_AnyWithExtra) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": x.A = nil - case "testdata.AnyWithExtra.b": + case "testpb.AnyWithExtra.b": x.B = int64(0) - case "testdata.AnyWithExtra.c": + case "testpb.AnyWithExtra.c": x.C = int64(0) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", fd.FullName())) } } @@ -21234,20 +21234,20 @@ func (x *fastReflection_AnyWithExtra) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_AnyWithExtra) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": value := x.A return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.AnyWithExtra.b": + case "testpb.AnyWithExtra.b": value := x.B return protoreflect.ValueOfInt64(value) - case "testdata.AnyWithExtra.c": + case "testpb.AnyWithExtra.c": value := x.C return protoreflect.ValueOfInt64(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", descriptor.FullName())) } } @@ -21263,17 +21263,17 @@ func (x *fastReflection_AnyWithExtra) Get(descriptor protoreflect.FieldDescripto // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_AnyWithExtra) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": x.A = value.Message().Interface().(*anypb.Any) - case "testdata.AnyWithExtra.b": + case "testpb.AnyWithExtra.b": x.B = value.Int() - case "testdata.AnyWithExtra.c": + case "testpb.AnyWithExtra.c": x.C = value.Int() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", fd.FullName())) } } @@ -21289,20 +21289,20 @@ func (x *fastReflection_AnyWithExtra) Set(fd protoreflect.FieldDescriptor, value // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_AnyWithExtra) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": if x.A == nil { x.A = new(anypb.Any) } return protoreflect.ValueOfMessage(x.A.ProtoReflect()) - case "testdata.AnyWithExtra.b": - panic(fmt.Errorf("field b of message testdata.AnyWithExtra is not mutable")) - case "testdata.AnyWithExtra.c": - panic(fmt.Errorf("field c of message testdata.AnyWithExtra is not mutable")) + case "testpb.AnyWithExtra.b": + panic(fmt.Errorf("field b of message testpb.AnyWithExtra is not mutable")) + case "testpb.AnyWithExtra.c": + panic(fmt.Errorf("field c of message testpb.AnyWithExtra is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", fd.FullName())) } } @@ -21311,18 +21311,18 @@ func (x *fastReflection_AnyWithExtra) Mutable(fd protoreflect.FieldDescriptor) p // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_AnyWithExtra) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.AnyWithExtra.a": + case "testpb.AnyWithExtra.a": m := new(anypb.Any) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.AnyWithExtra.b": + case "testpb.AnyWithExtra.b": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.AnyWithExtra.c": + case "testpb.AnyWithExtra.c": return protoreflect.ValueOfInt64(int64(0)) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.AnyWithExtra")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.AnyWithExtra")) } - panic(fmt.Errorf("message testdata.AnyWithExtra does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.AnyWithExtra does not contain field %s", fd.FullName())) } } @@ -21332,7 +21332,7 @@ func (x *fastReflection_AnyWithExtra) NewField(fd protoreflect.FieldDescriptor) func (x *fastReflection_AnyWithExtra) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.AnyWithExtra", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.AnyWithExtra", d.FullName())) } panic("unreachable") } @@ -21664,8 +21664,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestUpdatedTxRaw = File_unknonwnproto_proto.Messages().ByName("TestUpdatedTxRaw") + file_testpb_unknonwnproto_proto_init() + md_TestUpdatedTxRaw = File_testpb_unknonwnproto_proto.Messages().ByName("TestUpdatedTxRaw") fd_TestUpdatedTxRaw_body_bytes = md_TestUpdatedTxRaw.Fields().ByName("body_bytes") fd_TestUpdatedTxRaw_auth_info_bytes = md_TestUpdatedTxRaw.Fields().ByName("auth_info_bytes") fd_TestUpdatedTxRaw_signatures = md_TestUpdatedTxRaw.Fields().ByName("signatures") @@ -21682,7 +21682,7 @@ func (x *TestUpdatedTxRaw) ProtoReflect() protoreflect.Message { } func (x *TestUpdatedTxRaw) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[20] + mi := &file_testpb_unknonwnproto_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -21783,21 +21783,21 @@ func (x *fastReflection_TestUpdatedTxRaw) Range(f func(protoreflect.FieldDescrip // a repeated field is populated if it is non-empty. func (x *fastReflection_TestUpdatedTxRaw) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestUpdatedTxRaw.body_bytes": + case "testpb.TestUpdatedTxRaw.body_bytes": return len(x.BodyBytes) != 0 - case "testdata.TestUpdatedTxRaw.auth_info_bytes": + case "testpb.TestUpdatedTxRaw.auth_info_bytes": return len(x.AuthInfoBytes) != 0 - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": return len(x.Signatures) != 0 - case "testdata.TestUpdatedTxRaw.new_field_5": + case "testpb.TestUpdatedTxRaw.new_field_5": return len(x.NewField_5) != 0 - case "testdata.TestUpdatedTxRaw.new_field_1024": + case "testpb.TestUpdatedTxRaw.new_field_1024": return len(x.NewField_1024) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", fd.FullName())) } } @@ -21809,21 +21809,21 @@ func (x *fastReflection_TestUpdatedTxRaw) Has(fd protoreflect.FieldDescriptor) b // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxRaw) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestUpdatedTxRaw.body_bytes": + case "testpb.TestUpdatedTxRaw.body_bytes": x.BodyBytes = nil - case "testdata.TestUpdatedTxRaw.auth_info_bytes": + case "testpb.TestUpdatedTxRaw.auth_info_bytes": x.AuthInfoBytes = nil - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": x.Signatures = nil - case "testdata.TestUpdatedTxRaw.new_field_5": + case "testpb.TestUpdatedTxRaw.new_field_5": x.NewField_5 = nil - case "testdata.TestUpdatedTxRaw.new_field_1024": + case "testpb.TestUpdatedTxRaw.new_field_1024": x.NewField_1024 = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", fd.FullName())) } } @@ -21835,29 +21835,29 @@ func (x *fastReflection_TestUpdatedTxRaw) Clear(fd protoreflect.FieldDescriptor) // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestUpdatedTxRaw) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestUpdatedTxRaw.body_bytes": + case "testpb.TestUpdatedTxRaw.body_bytes": value := x.BodyBytes return protoreflect.ValueOfBytes(value) - case "testdata.TestUpdatedTxRaw.auth_info_bytes": + case "testpb.TestUpdatedTxRaw.auth_info_bytes": value := x.AuthInfoBytes return protoreflect.ValueOfBytes(value) - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": if len(x.Signatures) == 0 { return protoreflect.ValueOfList(&_TestUpdatedTxRaw_3_list{}) } listValue := &_TestUpdatedTxRaw_3_list{list: &x.Signatures} return protoreflect.ValueOfList(listValue) - case "testdata.TestUpdatedTxRaw.new_field_5": + case "testpb.TestUpdatedTxRaw.new_field_5": value := x.NewField_5 return protoreflect.ValueOfBytes(value) - case "testdata.TestUpdatedTxRaw.new_field_1024": + case "testpb.TestUpdatedTxRaw.new_field_1024": value := x.NewField_1024 return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", descriptor.FullName())) } } @@ -21873,23 +21873,23 @@ func (x *fastReflection_TestUpdatedTxRaw) Get(descriptor protoreflect.FieldDescr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxRaw) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestUpdatedTxRaw.body_bytes": + case "testpb.TestUpdatedTxRaw.body_bytes": x.BodyBytes = value.Bytes() - case "testdata.TestUpdatedTxRaw.auth_info_bytes": + case "testpb.TestUpdatedTxRaw.auth_info_bytes": x.AuthInfoBytes = value.Bytes() - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": lv := value.List() clv := lv.(*_TestUpdatedTxRaw_3_list) x.Signatures = *clv.list - case "testdata.TestUpdatedTxRaw.new_field_5": + case "testpb.TestUpdatedTxRaw.new_field_5": x.NewField_5 = value.Bytes() - case "testdata.TestUpdatedTxRaw.new_field_1024": + case "testpb.TestUpdatedTxRaw.new_field_1024": x.NewField_1024 = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", fd.FullName())) } } @@ -21905,25 +21905,25 @@ func (x *fastReflection_TestUpdatedTxRaw) Set(fd protoreflect.FieldDescriptor, v // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxRaw) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": if x.Signatures == nil { x.Signatures = [][]byte{} } value := &_TestUpdatedTxRaw_3_list{list: &x.Signatures} return protoreflect.ValueOfList(value) - case "testdata.TestUpdatedTxRaw.body_bytes": - panic(fmt.Errorf("field body_bytes of message testdata.TestUpdatedTxRaw is not mutable")) - case "testdata.TestUpdatedTxRaw.auth_info_bytes": - panic(fmt.Errorf("field auth_info_bytes of message testdata.TestUpdatedTxRaw is not mutable")) - case "testdata.TestUpdatedTxRaw.new_field_5": - panic(fmt.Errorf("field new_field_5 of message testdata.TestUpdatedTxRaw is not mutable")) - case "testdata.TestUpdatedTxRaw.new_field_1024": - panic(fmt.Errorf("field new_field_1024 of message testdata.TestUpdatedTxRaw is not mutable")) + case "testpb.TestUpdatedTxRaw.body_bytes": + panic(fmt.Errorf("field body_bytes of message testpb.TestUpdatedTxRaw is not mutable")) + case "testpb.TestUpdatedTxRaw.auth_info_bytes": + panic(fmt.Errorf("field auth_info_bytes of message testpb.TestUpdatedTxRaw is not mutable")) + case "testpb.TestUpdatedTxRaw.new_field_5": + panic(fmt.Errorf("field new_field_5 of message testpb.TestUpdatedTxRaw is not mutable")) + case "testpb.TestUpdatedTxRaw.new_field_1024": + panic(fmt.Errorf("field new_field_1024 of message testpb.TestUpdatedTxRaw is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", fd.FullName())) } } @@ -21932,22 +21932,22 @@ func (x *fastReflection_TestUpdatedTxRaw) Mutable(fd protoreflect.FieldDescripto // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestUpdatedTxRaw) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedTxRaw.body_bytes": + case "testpb.TestUpdatedTxRaw.body_bytes": return protoreflect.ValueOfBytes(nil) - case "testdata.TestUpdatedTxRaw.auth_info_bytes": + case "testpb.TestUpdatedTxRaw.auth_info_bytes": return protoreflect.ValueOfBytes(nil) - case "testdata.TestUpdatedTxRaw.signatures": + case "testpb.TestUpdatedTxRaw.signatures": list := [][]byte{} return protoreflect.ValueOfList(&_TestUpdatedTxRaw_3_list{list: &list}) - case "testdata.TestUpdatedTxRaw.new_field_5": + case "testpb.TestUpdatedTxRaw.new_field_5": return protoreflect.ValueOfBytes(nil) - case "testdata.TestUpdatedTxRaw.new_field_1024": + case "testpb.TestUpdatedTxRaw.new_field_1024": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxRaw")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxRaw")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxRaw does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxRaw does not contain field %s", fd.FullName())) } } @@ -21957,7 +21957,7 @@ func (x *fastReflection_TestUpdatedTxRaw) NewField(fd protoreflect.FieldDescript func (x *fastReflection_TestUpdatedTxRaw) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestUpdatedTxRaw", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestUpdatedTxRaw", d.FullName())) } panic("unreachable") } @@ -22519,8 +22519,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestUpdatedTxBody = File_unknonwnproto_proto.Messages().ByName("TestUpdatedTxBody") + file_testpb_unknonwnproto_proto_init() + md_TestUpdatedTxBody = File_testpb_unknonwnproto_proto.Messages().ByName("TestUpdatedTxBody") fd_TestUpdatedTxBody_messages = md_TestUpdatedTxBody.Fields().ByName("messages") fd_TestUpdatedTxBody_memo = md_TestUpdatedTxBody.Fields().ByName("memo") fd_TestUpdatedTxBody_timeout_height = md_TestUpdatedTxBody.Fields().ByName("timeout_height") @@ -22539,7 +22539,7 @@ func (x *TestUpdatedTxBody) ProtoReflect() protoreflect.Message { } func (x *TestUpdatedTxBody) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[21] + mi := &file_testpb_unknonwnproto_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -22652,25 +22652,25 @@ func (x *fastReflection_TestUpdatedTxBody) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_TestUpdatedTxBody) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": return len(x.Messages) != 0 - case "testdata.TestUpdatedTxBody.memo": + case "testpb.TestUpdatedTxBody.memo": return x.Memo != "" - case "testdata.TestUpdatedTxBody.timeout_height": + case "testpb.TestUpdatedTxBody.timeout_height": return x.TimeoutHeight != int64(0) - case "testdata.TestUpdatedTxBody.some_new_field": + case "testpb.TestUpdatedTxBody.some_new_field": return x.SomeNewField != uint64(0) - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": return x.SomeNewFieldNonCriticalField != "" - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": return len(x.ExtensionOptions) != 0 - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": return len(x.NonCriticalExtensionOptions) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", fd.FullName())) } } @@ -22682,25 +22682,25 @@ func (x *fastReflection_TestUpdatedTxBody) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxBody) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": x.Messages = nil - case "testdata.TestUpdatedTxBody.memo": + case "testpb.TestUpdatedTxBody.memo": x.Memo = "" - case "testdata.TestUpdatedTxBody.timeout_height": + case "testpb.TestUpdatedTxBody.timeout_height": x.TimeoutHeight = int64(0) - case "testdata.TestUpdatedTxBody.some_new_field": + case "testpb.TestUpdatedTxBody.some_new_field": x.SomeNewField = uint64(0) - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": x.SomeNewFieldNonCriticalField = "" - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": x.ExtensionOptions = nil - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": x.NonCriticalExtensionOptions = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", fd.FullName())) } } @@ -22712,31 +22712,31 @@ func (x *fastReflection_TestUpdatedTxBody) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestUpdatedTxBody) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": if len(x.Messages) == 0 { return protoreflect.ValueOfList(&_TestUpdatedTxBody_1_list{}) } listValue := &_TestUpdatedTxBody_1_list{list: &x.Messages} return protoreflect.ValueOfList(listValue) - case "testdata.TestUpdatedTxBody.memo": + case "testpb.TestUpdatedTxBody.memo": value := x.Memo return protoreflect.ValueOfString(value) - case "testdata.TestUpdatedTxBody.timeout_height": + case "testpb.TestUpdatedTxBody.timeout_height": value := x.TimeoutHeight return protoreflect.ValueOfInt64(value) - case "testdata.TestUpdatedTxBody.some_new_field": + case "testpb.TestUpdatedTxBody.some_new_field": value := x.SomeNewField return protoreflect.ValueOfUint64(value) - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": value := x.SomeNewFieldNonCriticalField return protoreflect.ValueOfString(value) - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": if len(x.ExtensionOptions) == 0 { return protoreflect.ValueOfList(&_TestUpdatedTxBody_1023_list{}) } listValue := &_TestUpdatedTxBody_1023_list{list: &x.ExtensionOptions} return protoreflect.ValueOfList(listValue) - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": if len(x.NonCriticalExtensionOptions) == 0 { return protoreflect.ValueOfList(&_TestUpdatedTxBody_2047_list{}) } @@ -22744,9 +22744,9 @@ func (x *fastReflection_TestUpdatedTxBody) Get(descriptor protoreflect.FieldDesc return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", descriptor.FullName())) } } @@ -22762,31 +22762,31 @@ func (x *fastReflection_TestUpdatedTxBody) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxBody) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": lv := value.List() clv := lv.(*_TestUpdatedTxBody_1_list) x.Messages = *clv.list - case "testdata.TestUpdatedTxBody.memo": + case "testpb.TestUpdatedTxBody.memo": x.Memo = value.Interface().(string) - case "testdata.TestUpdatedTxBody.timeout_height": + case "testpb.TestUpdatedTxBody.timeout_height": x.TimeoutHeight = value.Int() - case "testdata.TestUpdatedTxBody.some_new_field": + case "testpb.TestUpdatedTxBody.some_new_field": x.SomeNewField = value.Uint() - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": x.SomeNewFieldNonCriticalField = value.Interface().(string) - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": lv := value.List() clv := lv.(*_TestUpdatedTxBody_1023_list) x.ExtensionOptions = *clv.list - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": lv := value.List() clv := lv.(*_TestUpdatedTxBody_2047_list) x.NonCriticalExtensionOptions = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", fd.FullName())) } } @@ -22802,37 +22802,37 @@ func (x *fastReflection_TestUpdatedTxBody) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedTxBody) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": if x.Messages == nil { x.Messages = []*anypb.Any{} } value := &_TestUpdatedTxBody_1_list{list: &x.Messages} return protoreflect.ValueOfList(value) - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": if x.ExtensionOptions == nil { x.ExtensionOptions = []*anypb.Any{} } value := &_TestUpdatedTxBody_1023_list{list: &x.ExtensionOptions} return protoreflect.ValueOfList(value) - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": if x.NonCriticalExtensionOptions == nil { x.NonCriticalExtensionOptions = []*anypb.Any{} } value := &_TestUpdatedTxBody_2047_list{list: &x.NonCriticalExtensionOptions} return protoreflect.ValueOfList(value) - case "testdata.TestUpdatedTxBody.memo": - panic(fmt.Errorf("field memo of message testdata.TestUpdatedTxBody is not mutable")) - case "testdata.TestUpdatedTxBody.timeout_height": - panic(fmt.Errorf("field timeout_height of message testdata.TestUpdatedTxBody is not mutable")) - case "testdata.TestUpdatedTxBody.some_new_field": - panic(fmt.Errorf("field some_new_field of message testdata.TestUpdatedTxBody is not mutable")) - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": - panic(fmt.Errorf("field some_new_field_non_critical_field of message testdata.TestUpdatedTxBody is not mutable")) + case "testpb.TestUpdatedTxBody.memo": + panic(fmt.Errorf("field memo of message testpb.TestUpdatedTxBody is not mutable")) + case "testpb.TestUpdatedTxBody.timeout_height": + panic(fmt.Errorf("field timeout_height of message testpb.TestUpdatedTxBody is not mutable")) + case "testpb.TestUpdatedTxBody.some_new_field": + panic(fmt.Errorf("field some_new_field of message testpb.TestUpdatedTxBody is not mutable")) + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": + panic(fmt.Errorf("field some_new_field_non_critical_field of message testpb.TestUpdatedTxBody is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", fd.FullName())) } } @@ -22841,28 +22841,28 @@ func (x *fastReflection_TestUpdatedTxBody) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestUpdatedTxBody) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedTxBody.messages": + case "testpb.TestUpdatedTxBody.messages": list := []*anypb.Any{} return protoreflect.ValueOfList(&_TestUpdatedTxBody_1_list{list: &list}) - case "testdata.TestUpdatedTxBody.memo": + case "testpb.TestUpdatedTxBody.memo": return protoreflect.ValueOfString("") - case "testdata.TestUpdatedTxBody.timeout_height": + case "testpb.TestUpdatedTxBody.timeout_height": return protoreflect.ValueOfInt64(int64(0)) - case "testdata.TestUpdatedTxBody.some_new_field": + case "testpb.TestUpdatedTxBody.some_new_field": return protoreflect.ValueOfUint64(uint64(0)) - case "testdata.TestUpdatedTxBody.some_new_field_non_critical_field": + case "testpb.TestUpdatedTxBody.some_new_field_non_critical_field": return protoreflect.ValueOfString("") - case "testdata.TestUpdatedTxBody.extension_options": + case "testpb.TestUpdatedTxBody.extension_options": list := []*anypb.Any{} return protoreflect.ValueOfList(&_TestUpdatedTxBody_1023_list{list: &list}) - case "testdata.TestUpdatedTxBody.non_critical_extension_options": + case "testpb.TestUpdatedTxBody.non_critical_extension_options": list := []*anypb.Any{} return protoreflect.ValueOfList(&_TestUpdatedTxBody_2047_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedTxBody")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedTxBody")) } - panic(fmt.Errorf("message testdata.TestUpdatedTxBody does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedTxBody does not contain field %s", fd.FullName())) } } @@ -22872,7 +22872,7 @@ func (x *fastReflection_TestUpdatedTxBody) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_TestUpdatedTxBody) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestUpdatedTxBody", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestUpdatedTxBody", d.FullName())) } panic("unreachable") } @@ -23414,8 +23414,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestUpdatedAuthInfo = File_unknonwnproto_proto.Messages().ByName("TestUpdatedAuthInfo") + file_testpb_unknonwnproto_proto_init() + md_TestUpdatedAuthInfo = File_testpb_unknonwnproto_proto.Messages().ByName("TestUpdatedAuthInfo") fd_TestUpdatedAuthInfo_signer_infos = md_TestUpdatedAuthInfo.Fields().ByName("signer_infos") fd_TestUpdatedAuthInfo_fee = md_TestUpdatedAuthInfo.Fields().ByName("fee") fd_TestUpdatedAuthInfo_new_field_3 = md_TestUpdatedAuthInfo.Fields().ByName("new_field_3") @@ -23431,7 +23431,7 @@ func (x *TestUpdatedAuthInfo) ProtoReflect() protoreflect.Message { } func (x *TestUpdatedAuthInfo) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[22] + mi := &file_testpb_unknonwnproto_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -23526,19 +23526,19 @@ func (x *fastReflection_TestUpdatedAuthInfo) Range(f func(protoreflect.FieldDesc // a repeated field is populated if it is non-empty. func (x *fastReflection_TestUpdatedAuthInfo) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": return len(x.SignerInfos) != 0 - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": return x.Fee != nil - case "testdata.TestUpdatedAuthInfo.new_field_3": + case "testpb.TestUpdatedAuthInfo.new_field_3": return len(x.NewField_3) != 0 - case "testdata.TestUpdatedAuthInfo.new_field_1024": + case "testpb.TestUpdatedAuthInfo.new_field_1024": return len(x.NewField_1024) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) } } @@ -23550,19 +23550,19 @@ func (x *fastReflection_TestUpdatedAuthInfo) Has(fd protoreflect.FieldDescriptor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedAuthInfo) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": x.SignerInfos = nil - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": x.Fee = nil - case "testdata.TestUpdatedAuthInfo.new_field_3": + case "testpb.TestUpdatedAuthInfo.new_field_3": x.NewField_3 = nil - case "testdata.TestUpdatedAuthInfo.new_field_1024": + case "testpb.TestUpdatedAuthInfo.new_field_1024": x.NewField_1024 = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) } } @@ -23574,26 +23574,26 @@ func (x *fastReflection_TestUpdatedAuthInfo) Clear(fd protoreflect.FieldDescript // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestUpdatedAuthInfo) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": if len(x.SignerInfos) == 0 { return protoreflect.ValueOfList(&_TestUpdatedAuthInfo_1_list{}) } listValue := &_TestUpdatedAuthInfo_1_list{list: &x.SignerInfos} return protoreflect.ValueOfList(listValue) - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": value := x.Fee return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "testdata.TestUpdatedAuthInfo.new_field_3": + case "testpb.TestUpdatedAuthInfo.new_field_3": value := x.NewField_3 return protoreflect.ValueOfBytes(value) - case "testdata.TestUpdatedAuthInfo.new_field_1024": + case "testpb.TestUpdatedAuthInfo.new_field_1024": value := x.NewField_1024 return protoreflect.ValueOfBytes(value) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", descriptor.FullName())) } } @@ -23609,21 +23609,21 @@ func (x *fastReflection_TestUpdatedAuthInfo) Get(descriptor protoreflect.FieldDe // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedAuthInfo) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": lv := value.List() clv := lv.(*_TestUpdatedAuthInfo_1_list) x.SignerInfos = *clv.list - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": x.Fee = value.Message().Interface().(*v1beta1.Fee) - case "testdata.TestUpdatedAuthInfo.new_field_3": + case "testpb.TestUpdatedAuthInfo.new_field_3": x.NewField_3 = value.Bytes() - case "testdata.TestUpdatedAuthInfo.new_field_1024": + case "testpb.TestUpdatedAuthInfo.new_field_1024": x.NewField_1024 = value.Bytes() default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) } } @@ -23639,26 +23639,26 @@ func (x *fastReflection_TestUpdatedAuthInfo) Set(fd protoreflect.FieldDescriptor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestUpdatedAuthInfo) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": if x.SignerInfos == nil { x.SignerInfos = []*v1beta1.SignerInfo{} } value := &_TestUpdatedAuthInfo_1_list{list: &x.SignerInfos} return protoreflect.ValueOfList(value) - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": if x.Fee == nil { x.Fee = new(v1beta1.Fee) } return protoreflect.ValueOfMessage(x.Fee.ProtoReflect()) - case "testdata.TestUpdatedAuthInfo.new_field_3": - panic(fmt.Errorf("field new_field_3 of message testdata.TestUpdatedAuthInfo is not mutable")) - case "testdata.TestUpdatedAuthInfo.new_field_1024": - panic(fmt.Errorf("field new_field_1024 of message testdata.TestUpdatedAuthInfo is not mutable")) + case "testpb.TestUpdatedAuthInfo.new_field_3": + panic(fmt.Errorf("field new_field_3 of message testpb.TestUpdatedAuthInfo is not mutable")) + case "testpb.TestUpdatedAuthInfo.new_field_1024": + panic(fmt.Errorf("field new_field_1024 of message testpb.TestUpdatedAuthInfo is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) } } @@ -23667,21 +23667,21 @@ func (x *fastReflection_TestUpdatedAuthInfo) Mutable(fd protoreflect.FieldDescri // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestUpdatedAuthInfo) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestUpdatedAuthInfo.signer_infos": + case "testpb.TestUpdatedAuthInfo.signer_infos": list := []*v1beta1.SignerInfo{} return protoreflect.ValueOfList(&_TestUpdatedAuthInfo_1_list{list: &list}) - case "testdata.TestUpdatedAuthInfo.fee": + case "testpb.TestUpdatedAuthInfo.fee": m := new(v1beta1.Fee) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "testdata.TestUpdatedAuthInfo.new_field_3": + case "testpb.TestUpdatedAuthInfo.new_field_3": return protoreflect.ValueOfBytes(nil) - case "testdata.TestUpdatedAuthInfo.new_field_1024": + case "testpb.TestUpdatedAuthInfo.new_field_1024": return protoreflect.ValueOfBytes(nil) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestUpdatedAuthInfo")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestUpdatedAuthInfo")) } - panic(fmt.Errorf("message testdata.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestUpdatedAuthInfo does not contain field %s", fd.FullName())) } } @@ -23691,7 +23691,7 @@ func (x *fastReflection_TestUpdatedAuthInfo) NewField(fd protoreflect.FieldDescr func (x *fastReflection_TestUpdatedAuthInfo) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestUpdatedAuthInfo", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestUpdatedAuthInfo", d.FullName())) } panic("unreachable") } @@ -24113,8 +24113,8 @@ var ( ) func init() { - file_unknonwnproto_proto_init() - md_TestRepeatedUints = File_unknonwnproto_proto.Messages().ByName("TestRepeatedUints") + file_testpb_unknonwnproto_proto_init() + md_TestRepeatedUints = File_testpb_unknonwnproto_proto.Messages().ByName("TestRepeatedUints") fd_TestRepeatedUints_nums = md_TestRepeatedUints.Fields().ByName("nums") } @@ -24127,7 +24127,7 @@ func (x *TestRepeatedUints) ProtoReflect() protoreflect.Message { } func (x *TestRepeatedUints) slowProtoReflect() protoreflect.Message { - mi := &file_unknonwnproto_proto_msgTypes[23] + mi := &file_testpb_unknonwnproto_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -24204,13 +24204,13 @@ func (x *fastReflection_TestRepeatedUints) Range(f func(protoreflect.FieldDescri // a repeated field is populated if it is non-empty. func (x *fastReflection_TestRepeatedUints) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": return len(x.Nums) != 0 default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", fd.FullName())) } } @@ -24222,13 +24222,13 @@ func (x *fastReflection_TestRepeatedUints) Has(fd protoreflect.FieldDescriptor) // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestRepeatedUints) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": x.Nums = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", fd.FullName())) } } @@ -24240,7 +24240,7 @@ func (x *fastReflection_TestRepeatedUints) Clear(fd protoreflect.FieldDescriptor // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_TestRepeatedUints) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": if len(x.Nums) == 0 { return protoreflect.ValueOfList(&_TestRepeatedUints_1_list{}) } @@ -24248,9 +24248,9 @@ func (x *fastReflection_TestRepeatedUints) Get(descriptor protoreflect.FieldDesc return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", descriptor.FullName())) } } @@ -24266,15 +24266,15 @@ func (x *fastReflection_TestRepeatedUints) Get(descriptor protoreflect.FieldDesc // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestRepeatedUints) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": lv := value.List() clv := lv.(*_TestRepeatedUints_1_list) x.Nums = *clv.list default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", fd.FullName())) } } @@ -24290,7 +24290,7 @@ func (x *fastReflection_TestRepeatedUints) Set(fd protoreflect.FieldDescriptor, // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_TestRepeatedUints) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": if x.Nums == nil { x.Nums = []uint64{} } @@ -24298,9 +24298,9 @@ func (x *fastReflection_TestRepeatedUints) Mutable(fd protoreflect.FieldDescript return protoreflect.ValueOfList(value) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", fd.FullName())) } } @@ -24309,14 +24309,14 @@ func (x *fastReflection_TestRepeatedUints) Mutable(fd protoreflect.FieldDescript // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_TestRepeatedUints) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "testdata.TestRepeatedUints.nums": + case "testpb.TestRepeatedUints.nums": list := []uint64{} return protoreflect.ValueOfList(&_TestRepeatedUints_1_list{list: &list}) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: testdata.TestRepeatedUints")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: testpb.TestRepeatedUints")) } - panic(fmt.Errorf("message testdata.TestRepeatedUints does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message testpb.TestRepeatedUints does not contain field %s", fd.FullName())) } } @@ -24326,7 +24326,7 @@ func (x *fastReflection_TestRepeatedUints) NewField(fd protoreflect.FieldDescrip func (x *fastReflection_TestRepeatedUints) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in testdata.TestRepeatedUints", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in testpb.TestRepeatedUints", d.FullName())) } panic("unreachable") } @@ -24601,7 +24601,7 @@ func (x *fastReflection_TestRepeatedUints) ProtoMethods() *protoiface.Methods { // versions: // protoc-gen-go v1.27.0 // protoc (unknown) -// source: unknonwnproto.proto +// source: testpb/unknonwnproto.proto const ( // Verify that this generated code is sufficiently up-to-date. @@ -24649,11 +24649,11 @@ func (x Customer2_City) String() string { } func (Customer2_City) Descriptor() protoreflect.EnumDescriptor { - return file_unknonwnproto_proto_enumTypes[0].Descriptor() + return file_testpb_unknonwnproto_proto_enumTypes[0].Descriptor() } func (Customer2_City) Type() protoreflect.EnumType { - return &file_unknonwnproto_proto_enumTypes[0] + return &file_testpb_unknonwnproto_proto_enumTypes[0] } func (x Customer2_City) Number() protoreflect.EnumNumber { @@ -24662,7 +24662,7 @@ func (x Customer2_City) Number() protoreflect.EnumNumber { // Deprecated: Use Customer2_City.Descriptor instead. func (Customer2_City) EnumDescriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{1, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{1, 0} } type Customer1 struct { @@ -24679,7 +24679,7 @@ type Customer1 struct { func (x *Customer1) Reset() { *x = Customer1{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[0] + mi := &file_testpb_unknonwnproto_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24693,7 +24693,7 @@ func (*Customer1) ProtoMessage() {} // Deprecated: Use Customer1.ProtoReflect.Descriptor instead. func (*Customer1) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{0} } func (x *Customer1) GetId() int32 { @@ -24734,14 +24734,14 @@ type Customer2 struct { Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` Fewer float32 `protobuf:"fixed32,4,opt,name=fewer,proto3" json:"fewer,omitempty"` Reserved int64 `protobuf:"varint,1047,opt,name=reserved,proto3" json:"reserved,omitempty"` - City Customer2_City `protobuf:"varint,6,opt,name=city,proto3,enum=testdata.Customer2_City" json:"city,omitempty"` + City Customer2_City `protobuf:"varint,6,opt,name=city,proto3,enum=testpb.Customer2_City" json:"city,omitempty"` Miscellaneous *anypb.Any `protobuf:"bytes,10,opt,name=miscellaneous,proto3" json:"miscellaneous,omitempty"` } func (x *Customer2) Reset() { *x = Customer2{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[1] + mi := &file_testpb_unknonwnproto_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24755,7 +24755,7 @@ func (*Customer2) ProtoMessage() {} // Deprecated: Use Customer2.ProtoReflect.Descriptor instead. func (*Customer2) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{1} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{1} } func (x *Customer2) GetId() int32 { @@ -24819,7 +24819,7 @@ type Nested4A struct { func (x *Nested4A) Reset() { *x = Nested4A{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[2] + mi := &file_testpb_unknonwnproto_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24833,7 +24833,7 @@ func (*Nested4A) ProtoMessage() {} // Deprecated: Use Nested4A.ProtoReflect.Descriptor instead. func (*Nested4A) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{2} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{2} } func (x *Nested4A) GetId() int32 { @@ -24864,7 +24864,7 @@ type Nested3A struct { func (x *Nested3A) Reset() { *x = Nested3A{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[3] + mi := &file_testpb_unknonwnproto_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24878,7 +24878,7 @@ func (*Nested3A) ProtoMessage() {} // Deprecated: Use Nested3A.ProtoReflect.Descriptor instead. func (*Nested3A) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{3} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{3} } func (x *Nested3A) GetId() int32 { @@ -24922,7 +24922,7 @@ type Nested2A struct { func (x *Nested2A) Reset() { *x = Nested2A{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[4] + mi := &file_testpb_unknonwnproto_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24936,7 +24936,7 @@ func (*Nested2A) ProtoMessage() {} // Deprecated: Use Nested2A.ProtoReflect.Descriptor instead. func (*Nested2A) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{4} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{4} } func (x *Nested2A) GetId() int32 { @@ -24972,7 +24972,7 @@ type Nested1A struct { func (x *Nested1A) Reset() { *x = Nested1A{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[5] + mi := &file_testpb_unknonwnproto_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -24986,7 +24986,7 @@ func (*Nested1A) ProtoMessage() {} // Deprecated: Use Nested1A.ProtoReflect.Descriptor instead. func (*Nested1A) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{5} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{5} } func (x *Nested1A) GetId() int32 { @@ -25016,7 +25016,7 @@ type Nested4B struct { func (x *Nested4B) Reset() { *x = Nested4B{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[6] + mi := &file_testpb_unknonwnproto_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25030,7 +25030,7 @@ func (*Nested4B) ProtoMessage() {} // Deprecated: Use Nested4B.ProtoReflect.Descriptor instead. func (*Nested4B) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{6} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{6} } func (x *Nested4B) GetId() int32 { @@ -25068,7 +25068,7 @@ type Nested3B struct { func (x *Nested3B) Reset() { *x = Nested3B{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[7] + mi := &file_testpb_unknonwnproto_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25082,7 +25082,7 @@ func (*Nested3B) ProtoMessage() {} // Deprecated: Use Nested3B.ProtoReflect.Descriptor instead. func (*Nested3B) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{7} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{7} } func (x *Nested3B) GetId() int32 { @@ -25127,7 +25127,7 @@ type Nested2B struct { func (x *Nested2B) Reset() { *x = Nested2B{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[8] + mi := &file_testpb_unknonwnproto_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25141,7 +25141,7 @@ func (*Nested2B) ProtoMessage() {} // Deprecated: Use Nested2B.ProtoReflect.Descriptor instead. func (*Nested2B) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{8} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{8} } func (x *Nested2B) GetId() int32 { @@ -25185,7 +25185,7 @@ type Nested1B struct { func (x *Nested1B) Reset() { *x = Nested1B{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[9] + mi := &file_testpb_unknonwnproto_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25199,7 +25199,7 @@ func (*Nested1B) ProtoMessage() {} // Deprecated: Use Nested1B.ProtoReflect.Descriptor instead. func (*Nested1B) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{9} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{9} } func (x *Nested1B) GetId() int32 { @@ -25244,7 +25244,7 @@ type Customer3 struct { func (x *Customer3) Reset() { *x = Customer3{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[10] + mi := &file_testpb_unknonwnproto_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25258,7 +25258,7 @@ func (*Customer3) ProtoMessage() {} // Deprecated: Use Customer3.ProtoReflect.Descriptor instead. func (*Customer3) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{10} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{10} } func (x *Customer3) GetId() int32 { @@ -25365,7 +25365,7 @@ type TestVersion1 struct { func (x *TestVersion1) Reset() { *x = TestVersion1{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[11] + mi := &file_testpb_unknonwnproto_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25379,7 +25379,7 @@ func (*TestVersion1) ProtoMessage() {} // Deprecated: Use TestVersion1.ProtoReflect.Descriptor instead. func (*TestVersion1) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{11} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{11} } func (x *TestVersion1) GetX() int64 { @@ -25501,7 +25501,7 @@ type TestVersion2 struct { func (x *TestVersion2) Reset() { *x = TestVersion2{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[12] + mi := &file_testpb_unknonwnproto_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25515,7 +25515,7 @@ func (*TestVersion2) ProtoMessage() {} // Deprecated: Use TestVersion2.ProtoReflect.Descriptor instead. func (*TestVersion2) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{12} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{12} } func (x *TestVersion2) GetX() int64 { @@ -25644,7 +25644,7 @@ type TestVersion3 struct { func (x *TestVersion3) Reset() { *x = TestVersion3{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[13] + mi := &file_testpb_unknonwnproto_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25658,7 +25658,7 @@ func (*TestVersion3) ProtoMessage() {} // Deprecated: Use TestVersion3.ProtoReflect.Descriptor instead. func (*TestVersion3) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{13} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{13} } func (x *TestVersion3) GetX() int64 { @@ -25786,7 +25786,7 @@ type TestVersion3LoneOneOfValue struct { func (x *TestVersion3LoneOneOfValue) Reset() { *x = TestVersion3LoneOneOfValue{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[14] + mi := &file_testpb_unknonwnproto_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25800,7 +25800,7 @@ func (*TestVersion3LoneOneOfValue) ProtoMessage() {} // Deprecated: Use TestVersion3LoneOneOfValue.ProtoReflect.Descriptor instead. func (*TestVersion3LoneOneOfValue) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{14} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{14} } func (x *TestVersion3LoneOneOfValue) GetX() int64 { @@ -25917,7 +25917,7 @@ type TestVersion3LoneNesting struct { func (x *TestVersion3LoneNesting) Reset() { *x = TestVersion3LoneNesting{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[15] + mi := &file_testpb_unknonwnproto_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -25931,7 +25931,7 @@ func (*TestVersion3LoneNesting) ProtoMessage() {} // Deprecated: Use TestVersion3LoneNesting.ProtoReflect.Descriptor instead. func (*TestVersion3LoneNesting) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{15} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{15} } func (x *TestVersion3LoneNesting) GetX() int64 { @@ -26062,7 +26062,7 @@ type TestVersion4LoneNesting struct { func (x *TestVersion4LoneNesting) Reset() { *x = TestVersion4LoneNesting{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[16] + mi := &file_testpb_unknonwnproto_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26076,7 +26076,7 @@ func (*TestVersion4LoneNesting) ProtoMessage() {} // Deprecated: Use TestVersion4LoneNesting.ProtoReflect.Descriptor instead. func (*TestVersion4LoneNesting) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{16} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{16} } func (x *TestVersion4LoneNesting) GetX() int64 { @@ -26199,7 +26199,7 @@ type TestVersionFD1 struct { func (x *TestVersionFD1) Reset() { *x = TestVersionFD1{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[17] + mi := &file_testpb_unknonwnproto_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26213,7 +26213,7 @@ func (*TestVersionFD1) ProtoMessage() {} // Deprecated: Use TestVersionFD1.ProtoReflect.Descriptor instead. func (*TestVersionFD1) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{17} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{17} } func (x *TestVersionFD1) GetX() int64 { @@ -26300,7 +26300,7 @@ type TestVersionFD1WithExtraAny struct { func (x *TestVersionFD1WithExtraAny) Reset() { *x = TestVersionFD1WithExtraAny{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[18] + mi := &file_testpb_unknonwnproto_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26314,7 +26314,7 @@ func (*TestVersionFD1WithExtraAny) ProtoMessage() {} // Deprecated: Use TestVersionFD1WithExtraAny.ProtoReflect.Descriptor instead. func (*TestVersionFD1WithExtraAny) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{18} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{18} } func (x *TestVersionFD1WithExtraAny) GetX() int64 { @@ -26395,7 +26395,7 @@ type AnyWithExtra struct { func (x *AnyWithExtra) Reset() { *x = AnyWithExtra{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[19] + mi := &file_testpb_unknonwnproto_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26409,7 +26409,7 @@ func (*AnyWithExtra) ProtoMessage() {} // Deprecated: Use AnyWithExtra.ProtoReflect.Descriptor instead. func (*AnyWithExtra) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{19} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{19} } func (x *AnyWithExtra) GetA() *anypb.Any { @@ -26448,7 +26448,7 @@ type TestUpdatedTxRaw struct { func (x *TestUpdatedTxRaw) Reset() { *x = TestUpdatedTxRaw{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[20] + mi := &file_testpb_unknonwnproto_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26462,7 +26462,7 @@ func (*TestUpdatedTxRaw) ProtoMessage() {} // Deprecated: Use TestUpdatedTxRaw.ProtoReflect.Descriptor instead. func (*TestUpdatedTxRaw) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{20} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{20} } func (x *TestUpdatedTxRaw) GetBodyBytes() []byte { @@ -26517,7 +26517,7 @@ type TestUpdatedTxBody struct { func (x *TestUpdatedTxBody) Reset() { *x = TestUpdatedTxBody{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[21] + mi := &file_testpb_unknonwnproto_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26531,7 +26531,7 @@ func (*TestUpdatedTxBody) ProtoMessage() {} // Deprecated: Use TestUpdatedTxBody.ProtoReflect.Descriptor instead. func (*TestUpdatedTxBody) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{21} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{21} } func (x *TestUpdatedTxBody) GetMessages() []*anypb.Any { @@ -26597,7 +26597,7 @@ type TestUpdatedAuthInfo struct { func (x *TestUpdatedAuthInfo) Reset() { *x = TestUpdatedAuthInfo{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[22] + mi := &file_testpb_unknonwnproto_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26611,7 +26611,7 @@ func (*TestUpdatedAuthInfo) ProtoMessage() {} // Deprecated: Use TestUpdatedAuthInfo.ProtoReflect.Descriptor instead. func (*TestUpdatedAuthInfo) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{22} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{22} } func (x *TestUpdatedAuthInfo) GetSignerInfos() []*v1beta1.SignerInfo { @@ -26653,7 +26653,7 @@ type TestRepeatedUints struct { func (x *TestRepeatedUints) Reset() { *x = TestRepeatedUints{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[23] + mi := &file_testpb_unknonwnproto_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26667,7 +26667,7 @@ func (*TestRepeatedUints) ProtoMessage() {} // Deprecated: Use TestRepeatedUints.ProtoReflect.Descriptor instead. func (*TestRepeatedUints) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{23} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{23} } func (x *TestRepeatedUints) GetNums() []uint64 { @@ -26690,7 +26690,7 @@ type TestVersion3LoneNesting_Inner1 struct { func (x *TestVersion3LoneNesting_Inner1) Reset() { *x = TestVersion3LoneNesting_Inner1{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[25] + mi := &file_testpb_unknonwnproto_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26704,7 +26704,7 @@ func (*TestVersion3LoneNesting_Inner1) ProtoMessage() {} // Deprecated: Use TestVersion3LoneNesting_Inner1.ProtoReflect.Descriptor instead. func (*TestVersion3LoneNesting_Inner1) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{15, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{15, 0} } func (x *TestVersion3LoneNesting_Inner1) GetId() int64 { @@ -26741,7 +26741,7 @@ type TestVersion3LoneNesting_Inner2 struct { func (x *TestVersion3LoneNesting_Inner2) Reset() { *x = TestVersion3LoneNesting_Inner2{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[26] + mi := &file_testpb_unknonwnproto_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26755,7 +26755,7 @@ func (*TestVersion3LoneNesting_Inner2) ProtoMessage() {} // Deprecated: Use TestVersion3LoneNesting_Inner2.ProtoReflect.Descriptor instead. func (*TestVersion3LoneNesting_Inner2) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{15, 1} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{15, 1} } func (x *TestVersion3LoneNesting_Inner2) GetId() string { @@ -26791,7 +26791,7 @@ type TestVersion3LoneNesting_Inner1_InnerInner struct { func (x *TestVersion3LoneNesting_Inner1_InnerInner) Reset() { *x = TestVersion3LoneNesting_Inner1_InnerInner{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[27] + mi := &file_testpb_unknonwnproto_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26805,7 +26805,7 @@ func (*TestVersion3LoneNesting_Inner1_InnerInner) ProtoMessage() {} // Deprecated: Use TestVersion3LoneNesting_Inner1_InnerInner.ProtoReflect.Descriptor instead. func (*TestVersion3LoneNesting_Inner1_InnerInner) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{15, 0, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{15, 0, 0} } func (x *TestVersion3LoneNesting_Inner1_InnerInner) GetId() string { @@ -26834,7 +26834,7 @@ type TestVersion3LoneNesting_Inner2_InnerInner struct { func (x *TestVersion3LoneNesting_Inner2_InnerInner) Reset() { *x = TestVersion3LoneNesting_Inner2_InnerInner{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[28] + mi := &file_testpb_unknonwnproto_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26848,7 +26848,7 @@ func (*TestVersion3LoneNesting_Inner2_InnerInner) ProtoMessage() {} // Deprecated: Use TestVersion3LoneNesting_Inner2_InnerInner.ProtoReflect.Descriptor instead. func (*TestVersion3LoneNesting_Inner2_InnerInner) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{15, 1, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{15, 1, 0} } func (x *TestVersion3LoneNesting_Inner2_InnerInner) GetId() string { @@ -26878,7 +26878,7 @@ type TestVersion4LoneNesting_Inner1 struct { func (x *TestVersion4LoneNesting_Inner1) Reset() { *x = TestVersion4LoneNesting_Inner1{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[29] + mi := &file_testpb_unknonwnproto_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26892,7 +26892,7 @@ func (*TestVersion4LoneNesting_Inner1) ProtoMessage() {} // Deprecated: Use TestVersion4LoneNesting_Inner1.ProtoReflect.Descriptor instead. func (*TestVersion4LoneNesting_Inner1) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{16, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{16, 0} } func (x *TestVersion4LoneNesting_Inner1) GetId() int64 { @@ -26929,7 +26929,7 @@ type TestVersion4LoneNesting_Inner2 struct { func (x *TestVersion4LoneNesting_Inner2) Reset() { *x = TestVersion4LoneNesting_Inner2{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[30] + mi := &file_testpb_unknonwnproto_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26943,7 +26943,7 @@ func (*TestVersion4LoneNesting_Inner2) ProtoMessage() {} // Deprecated: Use TestVersion4LoneNesting_Inner2.ProtoReflect.Descriptor instead. func (*TestVersion4LoneNesting_Inner2) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{16, 1} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{16, 1} } func (x *TestVersion4LoneNesting_Inner2) GetId() string { @@ -26979,7 +26979,7 @@ type TestVersion4LoneNesting_Inner1_InnerInner struct { func (x *TestVersion4LoneNesting_Inner1_InnerInner) Reset() { *x = TestVersion4LoneNesting_Inner1_InnerInner{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[31] + mi := &file_testpb_unknonwnproto_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -26993,7 +26993,7 @@ func (*TestVersion4LoneNesting_Inner1_InnerInner) ProtoMessage() {} // Deprecated: Use TestVersion4LoneNesting_Inner1_InnerInner.ProtoReflect.Descriptor instead. func (*TestVersion4LoneNesting_Inner1_InnerInner) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{16, 0, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{16, 0, 0} } func (x *TestVersion4LoneNesting_Inner1_InnerInner) GetId() int64 { @@ -27022,7 +27022,7 @@ type TestVersion4LoneNesting_Inner2_InnerInner struct { func (x *TestVersion4LoneNesting_Inner2_InnerInner) Reset() { *x = TestVersion4LoneNesting_Inner2_InnerInner{} if protoimpl.UnsafeEnabled { - mi := &file_unknonwnproto_proto_msgTypes[32] + mi := &file_testpb_unknonwnproto_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -27036,7 +27036,7 @@ func (*TestVersion4LoneNesting_Inner2_InnerInner) ProtoMessage() {} // Deprecated: Use TestVersion4LoneNesting_Inner2_InnerInner.ProtoReflect.Descriptor instead. func (*TestVersion4LoneNesting_Inner2_InnerInner) Descriptor() ([]byte, []int) { - return file_unknonwnproto_proto_rawDescGZIP(), []int{16, 1, 0} + return file_testpb_unknonwnproto_proto_rawDescGZIP(), []int{16, 1, 0} } func (x *TestVersion4LoneNesting_Inner2_InnerInner) GetId() string { @@ -27053,549 +27053,541 @@ func (x *TestVersion4LoneNesting_Inner2_InnerInner) GetValue() int64 { return 0 } -var File_unknonwnproto_proto protoreflect.FileDescriptor - -var file_unknonwnproto_proto_rawDesc = []byte{ - 0x0a, 0x13, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x6e, 0x77, 0x6e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x1a, - 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x1a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x74, 0x78, 0x2f, 0x76, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0x2f, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x74, 0x0a, 0x09, - 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, - 0x10, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x65, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6d, - 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0xb1, 0x02, 0x0a, 0x09, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x32, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, 0x79, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x66, 0x65, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, - 0x05, 0x66, 0x65, 0x77, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, - 0x65, 0x64, 0x18, 0x97, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x72, 0x65, 0x73, 0x65, 0x72, - 0x76, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x18, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x32, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x52, 0x04, 0x63, 0x69, 0x74, - 0x79, 0x12, 0x3a, 0x0a, 0x0d, 0x6d, 0x69, 0x73, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x6e, 0x65, 0x6f, - 0x75, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x0d, - 0x6d, 0x69, 0x73, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x47, 0x0a, - 0x04, 0x43, 0x69, 0x74, 0x79, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x61, 0x6f, 0x73, 0x10, 0x00, 0x12, - 0x0e, 0x0a, 0x0a, 0x4c, 0x6f, 0x73, 0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x10, 0x01, 0x12, - 0x0c, 0x0a, 0x08, 0x50, 0x61, 0x6c, 0x6f, 0x41, 0x6c, 0x74, 0x6f, 0x10, 0x02, 0x12, 0x0a, 0x0a, - 0x06, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x61, 0x69, - 0x72, 0x6f, 0x62, 0x69, 0x10, 0x04, 0x22, 0x2e, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, - 0x34, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xd5, 0x01, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, - 0x64, 0x33, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x02, 0x61, 0x34, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, - 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x41, 0x52, 0x02, 0x61, 0x34, 0x12, 0x33, 0x0a, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x41, 0x2e, 0x49, - 0x6e, 0x64, 0x65, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, - 0x1a, 0x4c, 0x0a, 0x0a, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x28, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, - 0x64, 0x34, 0x41, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x5a, - 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2a, - 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, - 0x33, 0x41, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x46, 0x0a, 0x08, 0x4e, 0x65, - 0x73, 0x74, 0x65, 0x64, 0x31, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x41, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, - 0x65, 0x64, 0x22, 0x40, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x42, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x64, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x42, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, - 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x02, 0x62, 0x34, 0x18, 0x04, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x65, - 0x73, 0x74, 0x65, 0x64, 0x34, 0x42, 0x52, 0x02, 0x62, 0x34, 0x22, 0x6e, 0x0a, 0x08, 0x4e, 0x65, - 0x73, 0x74, 0x65, 0x64, 0x32, 0x42, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x66, 0x65, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x01, 0x52, 0x03, 0x66, 0x65, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, - 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x42, 0x52, 0x06, 0x6e, 0x65, - 0x73, 0x74, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x08, 0x4e, 0x65, - 0x73, 0x74, 0x65, 0x64, 0x31, 0x42, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x42, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, - 0x65, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x61, 0x67, 0x65, 0x22, 0x82, 0x02, 0x0a, 0x09, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, - 0x72, 0x33, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x73, 0x66, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x02, 0x73, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x75, 0x72, 0x63, 0x68, 0x61, - 0x72, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x73, 0x75, 0x72, 0x63, 0x68, - 0x61, 0x72, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x5f, 0x63, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, - 0x52, 0x0c, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4e, 0x6f, 0x12, 0x1d, - 0x0a, 0x09, 0x63, 0x68, 0x65, 0x71, 0x75, 0x65, 0x5f, 0x6e, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x00, 0x52, 0x08, 0x63, 0x68, 0x65, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x12, 0x2f, 0x0a, - 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x65, 0x72, 0x31, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x42, 0x09, - 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0xec, 0x02, 0x0a, 0x0c, 0x54, 0x65, - 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, - 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, 0x12, 0x24, - 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x31, 0x52, 0x01, 0x62, 0x12, 0x24, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x63, 0x12, 0x2a, 0x0a, 0x01, 0x64, 0x18, - 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x42, 0x04, 0xc8, - 0xde, 0x1f, 0x00, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x26, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, - 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, - 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, - 0x01, 0x67, 0x12, 0x24, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, - 0x6b, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0x83, 0x03, 0x0a, 0x0c, 0x54, 0x65, 0x73, - 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, - 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x61, 0x12, 0x24, 0x0a, - 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, - 0x52, 0x01, 0x62, 0x12, 0x24, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x63, 0x12, 0x24, 0x0a, 0x01, 0x64, 0x18, 0x05, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x64, 0x12, +var File_testpb_unknonwnproto_proto protoreflect.FileDescriptor + +var file_testpb_unknonwnproto_proto_rawDesc = []byte{ + 0x0a, 0x1a, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x6e, 0x77, + 0x6e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x74, 0x78, + 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x74, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x74, 0x0a, 0x09, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x66, 0x65, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x73, 0x75, + 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0xaf, 0x02, 0x0a, 0x09, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x65, 0x72, 0x32, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x75, 0x73, 0x74, 0x72, + 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x65, 0x77, 0x65, 0x72, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x66, 0x65, 0x77, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x08, 0x72, + 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x18, 0x97, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x12, 0x2a, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x32, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x52, 0x04, + 0x63, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x0d, 0x6d, 0x69, 0x73, 0x63, 0x65, 0x6c, 0x6c, 0x61, + 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x0d, 0x6d, 0x69, 0x73, 0x63, 0x65, 0x6c, 0x6c, 0x61, 0x6e, 0x65, 0x6f, 0x75, 0x73, + 0x22, 0x47, 0x0a, 0x04, 0x43, 0x69, 0x74, 0x79, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x61, 0x6f, 0x73, + 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4c, 0x6f, 0x73, 0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, + 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x61, 0x6c, 0x6f, 0x41, 0x6c, 0x74, 0x6f, 0x10, 0x02, + 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, + 0x4e, 0x61, 0x69, 0x72, 0x6f, 0x62, 0x69, 0x10, 0x04, 0x22, 0x2e, 0x0a, 0x08, 0x4e, 0x65, 0x73, + 0x74, 0x65, 0x64, 0x34, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xcf, 0x01, 0x0a, 0x08, 0x4e, 0x65, + 0x73, 0x74, 0x65, 0x64, 0x33, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x02, 0x61, 0x34, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x41, 0x52, 0x02, 0x61, 0x34, 0x12, 0x31, 0x0a, 0x05, + 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x41, 0x2e, 0x49, 0x6e, + 0x64, 0x65, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x1a, + 0x4a, 0x0a, 0x0a, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x26, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x41, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x08, 0x4e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x6e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x41, 0x52, 0x06, 0x6e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x44, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x31, + 0x41, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x28, 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, + 0x64, 0x32, 0x41, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x40, 0x0a, 0x08, 0x4e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x42, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x62, 0x0a, + 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, 0x42, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x20, 0x0a, 0x02, 0x62, 0x34, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x34, 0x42, 0x52, 0x02, 0x62, + 0x34, 0x22, 0x6c, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x42, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x66, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x66, 0x65, 0x65, 0x12, + 0x28, 0x0a, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x33, + 0x42, 0x52, 0x06, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x22, + 0x56, 0x0a, 0x08, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x31, 0x42, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x6e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x42, 0x52, 0x06, 0x6e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x61, 0x67, 0x65, 0x22, 0x80, 0x02, 0x0a, 0x09, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x65, 0x72, 0x33, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x73, 0x66, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x02, 0x73, 0x66, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x75, 0x72, + 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x73, 0x75, + 0x72, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x74, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, + 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x5f, 0x63, 0x61, 0x72, 0x64, 0x5f, 0x6e, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x00, 0x52, 0x0c, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4e, + 0x6f, 0x12, 0x1d, 0x0a, 0x09, 0x63, 0x68, 0x65, 0x71, 0x75, 0x65, 0x5f, 0x6e, 0x6f, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x63, 0x68, 0x65, 0x71, 0x75, 0x65, 0x4e, 0x6f, + 0x12, 0x2d, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x43, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x42, + 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0xde, 0x02, 0x0a, 0x0c, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x12, 0x0c, 0x0a, 0x01, 0x78, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, + 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, 0x12, 0x22, 0x0a, + 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, + 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x31, 0x52, 0x01, 0x63, 0x12, 0x28, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, - 0x26, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x32, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x24, 0x0a, 0x01, 0x68, - 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, - 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, - 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, - 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x19, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6e, - 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0x95, - 0x03, 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x12, - 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, - 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, - 0x52, 0x01, 0x61, 0x12, 0x24, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, 0x24, 0x0a, 0x01, 0x63, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, - 0x24, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x26, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, - 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, - 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, - 0x67, 0x12, 0x24, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, - 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, - 0x12, 0x2d, 0x0a, 0x12, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, - 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, - 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, - 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xfb, 0x02, 0x0a, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4f, 0x6e, 0x65, 0x4f, 0x66, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x61, 0x12, 0x24, 0x0a, 0x01, 0x62, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, - 0x24, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, 0x24, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, - 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x22, 0x0a, 0x01, 0x67, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, - 0x24, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x13, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, 0x74, - 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, - 0x0a, 0x12, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, - 0x69, 0x65, 0x6c, 0x64, 0x18, 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, - 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x05, 0x0a, - 0x03, 0x73, 0x75, 0x6d, 0x22, 0xfd, 0x06, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, - 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x33, 0x52, 0x01, 0x61, 0x12, 0x24, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, 0x24, 0x0a, 0x01, 0x63, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, - 0x12, 0x24, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x31, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, - 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, - 0x74, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x24, 0x0a, - 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, - 0x52, 0x01, 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, - 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x18, 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, - 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x40, 0x0a, 0x06, 0x69, - 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x40, 0x0a, - 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x1a, - 0xa9, 0x01, 0x0a, 0x06, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x49, - 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, - 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x30, 0x0a, 0x0a, 0x49, 0x6e, 0x6e, - 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x1a, 0xaf, 0x01, 0x0a, 0x06, - 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, - 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x49, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x33, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x30, 0x0a, 0x0a, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, - 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x42, 0x05, 0x0a, - 0x03, 0x73, 0x75, 0x6d, 0x22, 0xff, 0x06, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, - 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x33, 0x52, 0x01, 0x61, 0x12, 0x24, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, 0x24, 0x0a, 0x01, 0x63, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, - 0x12, 0x24, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x31, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, - 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, - 0x74, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x24, 0x0a, - 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, - 0x52, 0x01, 0x68, 0x12, 0x27, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, - 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x18, 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, - 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x40, 0x0a, 0x06, 0x69, - 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x74, 0x65, - 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, - 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x40, 0x0a, - 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x1a, - 0xa9, 0x01, 0x0a, 0x06, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x49, - 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, - 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, - 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x30, 0x0a, 0x0a, 0x49, 0x6e, 0x6e, - 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x1a, 0xb1, 0x01, 0x0a, 0x06, - 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, - 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x49, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x33, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x32, 0x0a, 0x0a, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, - 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xcd, 0x01, 0x0a, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x44, 0x31, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, - 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, 0x12, 0x0e, 0x0a, - 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x26, 0x0a, - 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, + 0x24, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x24, 0x0a, 0x01, 0x68, 0x18, 0x09, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x42, - 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xdb, 0x01, 0x0a, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x44, 0x31, 0x57, 0x69, 0x74, 0x68, 0x45, 0x78, 0x74, - 0x72, 0x61, 0x41, 0x6e, 0x79, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x01, 0x78, 0x12, 0x24, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x26, 0x0a, 0x01, 0x66, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x48, 0x00, 0x52, 0x01, - 0x66, 0x12, 0x24, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x41, 0x6e, 0x79, 0x57, 0x69, 0x74, 0x68, 0x45, - 0x78, 0x74, 0x72, 0x61, 0x52, 0x01, 0x67, 0x12, 0x24, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x65, - 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x42, 0x05, 0x0a, - 0x03, 0x73, 0x75, 0x6d, 0x22, 0x54, 0x0a, 0x0c, 0x41, 0x6e, 0x79, 0x57, 0x69, 0x74, 0x68, 0x45, - 0x78, 0x74, 0x72, 0x61, 0x12, 0x28, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, 0x68, 0x18, 0x09, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, + 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x25, 0x0a, + 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, + 0x01, 0x52, 0x01, 0x6b, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xf5, 0x02, 0x0a, 0x0c, + 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x12, 0x0c, 0x0a, 0x01, + 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x61, 0x12, 0x22, + 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, + 0x01, 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x63, 0x12, 0x22, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x24, 0x0a, 0x01, 0x66, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x48, 0x00, 0x52, 0x01, 0x66, + 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x25, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x43, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, + 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x19, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x05, 0x0a, 0x03, + 0x73, 0x75, 0x6d, 0x22, 0x87, 0x03, 0x0a, 0x0c, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x33, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x61, 0x12, 0x22, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, 0x22, + 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, + 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, + 0x01, 0x65, 0x12, 0x24, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x33, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, + 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, + 0x12, 0x25, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, + 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, + 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x87, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xef, 0x02, + 0x0a, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, + 0x6e, 0x65, 0x4f, 0x6e, 0x65, 0x4f, 0x66, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x0c, 0x0a, 0x01, + 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x61, 0x12, 0x22, + 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, + 0x01, 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, 0x22, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, + 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, + 0x01, 0x68, 0x12, 0x25, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, + 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, 0x6e, 0x6f, 0x6e, + 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, + 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, + 0xe7, 0x06, 0x0a, 0x17, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, + 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x0c, 0x0a, 0x01, 0x78, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, + 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x61, 0x12, 0x22, 0x0a, + 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, + 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, 0x22, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x64, 0x12, 0x2f, 0x0a, 0x01, 0x66, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, + 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, + 0x73, 0x74, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, + 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, + 0x01, 0x68, 0x12, 0x25, 0x0a, 0x01, 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, + 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, 0x6e, 0x6f, 0x6e, + 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, + 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x3e, 0x0a, 0x06, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, + 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, + 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x3e, 0x0a, 0x06, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x32, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, + 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, + 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x1a, 0xa7, 0x01, 0x0a, 0x06, 0x49, 0x6e, 0x6e, + 0x65, 0x72, 0x31, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x47, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, + 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x2e, 0x49, + 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, + 0x1a, 0x30, 0x0a, 0x0a, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, + 0x74, 0x79, 0x1a, 0xad, 0x01, 0x0a, 0x06, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x47, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, + 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x2e, 0x49, + 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, + 0x1a, 0x30, 0x0a, 0x0a, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, + 0x74, 0x79, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xe9, 0x06, 0x0a, 0x17, 0x54, 0x65, + 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, + 0x73, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x61, 0x12, 0x22, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x62, 0x12, 0x22, 0x0a, 0x01, 0x63, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, 0x52, 0x01, 0x63, 0x12, + 0x22, 0x0a, 0x01, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x33, + 0x52, 0x01, 0x64, 0x12, 0x2f, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x33, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x48, + 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x61, 0x12, 0x0c, - 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x62, 0x12, 0x0c, 0x0a, 0x01, - 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x63, 0x22, 0xc0, 0x01, 0x0a, 0x10, 0x54, - 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x78, 0x52, 0x61, 0x77, 0x12, - 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x09, 0x62, 0x6f, 0x64, 0x79, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x26, - 0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x5f, 0x62, 0x79, 0x74, 0x65, - 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x49, 0x6e, 0x66, - 0x6f, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, - 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x5f, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6e, 0x65, 0x77, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x35, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x5f, 0x31, 0x30, 0x32, 0x34, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x0c, 0x6e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x30, 0x32, 0x34, 0x22, 0x90, 0x03, - 0x0a, 0x11, 0x54, 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x78, 0x42, - 0x6f, 0x64, 0x79, 0x12, 0x30, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x6d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6f, 0x6d, 0x65, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x73, 0x6f, 0x6d, 0x65, 0x4e, 0x65, - 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x48, 0x0a, 0x21, 0x73, 0x6f, 0x6d, 0x65, 0x5f, 0x6e, - 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x9a, 0x08, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x1c, 0x73, 0x6f, 0x6d, 0x65, 0x4e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x4e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x12, 0x42, 0x0a, 0x11, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xff, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, - 0x6e, 0x79, 0x52, 0x10, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5a, 0x0a, 0x1e, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xff, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, + 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x12, 0x25, 0x0a, 0x01, + 0x6b, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x65, 0x72, 0x31, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, + 0x52, 0x01, 0x6b, 0x12, 0x2d, 0x0a, 0x12, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x87, 0x08, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x10, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, + 0x6c, 0x64, 0x12, 0x3e, 0x0a, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x31, 0x12, 0x3e, 0x0a, 0x06, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x18, 0x0f, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x52, 0x06, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x32, 0x1a, 0xa7, 0x01, 0x0a, 0x06, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x47, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x31, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, + 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x31, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, + 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x30, 0x0a, 0x0a, 0x49, 0x6e, + 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x74, 0x79, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x74, 0x79, 0x1a, 0xaf, 0x01, 0x0a, + 0x06, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x47, 0x0a, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x31, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x34, 0x4c, 0x6f, 0x6e, 0x65, 0x4e, 0x65, 0x73, 0x74, 0x69, 0x6e, + 0x67, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x32, 0x2e, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x49, 0x6e, + 0x6e, 0x65, 0x72, 0x52, 0x05, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x1a, 0x32, 0x0a, 0x0a, 0x49, 0x6e, + 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x05, + 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0xc7, 0x01, 0x0a, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x46, 0x44, 0x31, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x24, 0x0a, 0x01, 0x66, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x48, 0x00, 0x52, 0x01, 0x66, + 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, + 0x79, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, 0x68, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, + 0xd3, 0x01, 0x0a, 0x1a, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x46, + 0x44, 0x31, 0x57, 0x69, 0x74, 0x68, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x6e, 0x79, 0x12, 0x0c, + 0x0a, 0x01, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x78, 0x12, 0x22, 0x0a, 0x01, + 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x61, + 0x12, 0x0e, 0x0a, 0x01, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x01, 0x65, + 0x12, 0x24, 0x0a, 0x01, 0x66, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x31, 0x48, 0x00, 0x52, 0x01, 0x66, 0x12, 0x22, 0x0a, 0x01, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x41, 0x6e, 0x79, 0x57, 0x69, + 0x74, 0x68, 0x45, 0x78, 0x74, 0x72, 0x61, 0x52, 0x01, 0x67, 0x12, 0x22, 0x0a, 0x01, 0x68, 0x18, + 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x31, 0x52, 0x01, 0x68, 0x42, 0x05, + 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x22, 0x54, 0x0a, 0x0c, 0x41, 0x6e, 0x79, 0x57, 0x69, 0x74, 0x68, + 0x45, 0x78, 0x74, 0x72, 0x61, 0x12, 0x28, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x01, 0x61, 0x12, + 0x0c, 0x0a, 0x01, 0x62, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x62, 0x12, 0x0c, 0x0a, + 0x01, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x01, 0x63, 0x22, 0xc0, 0x01, 0x0a, 0x10, + 0x54, 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x78, 0x52, 0x61, 0x77, + 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x62, 0x6f, 0x64, 0x79, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, + 0x26, 0x0a, 0x0f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x5f, 0x62, 0x79, 0x74, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x49, 0x6e, + 0x66, 0x6f, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x35, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6e, 0x65, + 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x35, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x31, 0x30, 0x32, 0x34, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28, 0x0c, + 0x52, 0x0c, 0x6e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x30, 0x32, 0x34, 0x22, 0x90, + 0x03, 0x0a, 0x11, 0x54, 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x54, 0x78, + 0x42, 0x6f, 0x64, 0x79, 0x12, 0x30, 0x0a, 0x08, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x6d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x25, 0x0a, 0x0e, 0x74, 0x69, + 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x48, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x6f, 0x6d, 0x65, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, + 0x65, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x73, 0x6f, 0x6d, 0x65, 0x4e, + 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x48, 0x0a, 0x21, 0x73, 0x6f, 0x6d, 0x65, 0x5f, + 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, + 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x9a, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x1c, 0x73, 0x6f, 0x6d, 0x65, 0x4e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x4e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x12, 0x42, 0x0a, 0x11, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xff, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x41, 0x6e, 0x79, 0x52, 0x1b, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, - 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0xc8, 0x01, 0x0a, 0x13, 0x54, 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, - 0x41, 0x75, 0x74, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x40, 0x0a, 0x0c, 0x73, 0x69, 0x67, 0x6e, - 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, - 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x74, 0x78, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, - 0x61, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x73, - 0x69, 0x67, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x03, 0x66, 0x65, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x74, 0x78, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x65, 0x65, 0x52, - 0x03, 0x66, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, - 0x64, 0x5f, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6e, 0x65, 0x77, 0x46, 0x69, - 0x65, 0x6c, 0x64, 0x33, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, - 0x64, 0x5f, 0x31, 0x30, 0x32, 0x34, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x6e, - 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x30, 0x32, 0x34, 0x22, 0x27, 0x0a, 0x11, 0x54, - 0x65, 0x73, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, 0x73, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x04, - 0x6e, 0x75, 0x6d, 0x73, 0x42, 0x99, 0x01, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x42, 0x12, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x6e, 0x77, 0x6e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, - 0x69, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, - 0x61, 0x72, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0xca, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0xe2, 0x02, - 0x14, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x54, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x41, 0x6e, 0x79, 0x52, 0x10, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x5a, 0x0a, 0x1e, 0x6e, 0x6f, 0x6e, 0x5f, 0x63, 0x72, 0x69, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xff, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x1b, 0x6e, 0x6f, 0x6e, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0xc8, 0x01, 0x0a, 0x13, 0x54, 0x65, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x64, 0x41, 0x75, 0x74, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x40, 0x0a, 0x0c, 0x73, 0x69, 0x67, + 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x1d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x74, 0x78, 0x2e, 0x76, 0x31, 0x62, 0x65, + 0x74, 0x61, 0x31, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, + 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x12, 0x28, 0x0a, 0x03, 0x66, + 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x2e, 0x74, 0x78, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x46, 0x65, 0x65, + 0x52, 0x03, 0x66, 0x65, 0x65, 0x12, 0x1e, 0x0a, 0x0b, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x5f, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6e, 0x65, 0x77, 0x46, + 0x69, 0x65, 0x6c, 0x64, 0x33, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x5f, 0x31, 0x30, 0x32, 0x34, 0x18, 0x80, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, + 0x6e, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x30, 0x32, 0x34, 0x22, 0x27, 0x0a, 0x11, + 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x55, 0x69, 0x6e, 0x74, + 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, + 0x04, 0x6e, 0x75, 0x6d, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x42, 0x12, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x6e, 0x77, 0x6e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x75, 0x74, 0x69, + 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x75, 0x6c, 0x73, 0x61, + 0x72, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, + 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, + 0xe2, 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_unknonwnproto_proto_rawDescOnce sync.Once - file_unknonwnproto_proto_rawDescData = file_unknonwnproto_proto_rawDesc + file_testpb_unknonwnproto_proto_rawDescOnce sync.Once + file_testpb_unknonwnproto_proto_rawDescData = file_testpb_unknonwnproto_proto_rawDesc ) -func file_unknonwnproto_proto_rawDescGZIP() []byte { - file_unknonwnproto_proto_rawDescOnce.Do(func() { - file_unknonwnproto_proto_rawDescData = protoimpl.X.CompressGZIP(file_unknonwnproto_proto_rawDescData) +func file_testpb_unknonwnproto_proto_rawDescGZIP() []byte { + file_testpb_unknonwnproto_proto_rawDescOnce.Do(func() { + file_testpb_unknonwnproto_proto_rawDescData = protoimpl.X.CompressGZIP(file_testpb_unknonwnproto_proto_rawDescData) }) - return file_unknonwnproto_proto_rawDescData -} - -var file_unknonwnproto_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_unknonwnproto_proto_msgTypes = make([]protoimpl.MessageInfo, 33) -var file_unknonwnproto_proto_goTypes = []interface{}{ - (Customer2_City)(0), // 0: testdata.Customer2.City - (*Customer1)(nil), // 1: testdata.Customer1 - (*Customer2)(nil), // 2: testdata.Customer2 - (*Nested4A)(nil), // 3: testdata.Nested4A - (*Nested3A)(nil), // 4: testdata.Nested3A - (*Nested2A)(nil), // 5: testdata.Nested2A - (*Nested1A)(nil), // 6: testdata.Nested1A - (*Nested4B)(nil), // 7: testdata.Nested4B - (*Nested3B)(nil), // 8: testdata.Nested3B - (*Nested2B)(nil), // 9: testdata.Nested2B - (*Nested1B)(nil), // 10: testdata.Nested1B - (*Customer3)(nil), // 11: testdata.Customer3 - (*TestVersion1)(nil), // 12: testdata.TestVersion1 - (*TestVersion2)(nil), // 13: testdata.TestVersion2 - (*TestVersion3)(nil), // 14: testdata.TestVersion3 - (*TestVersion3LoneOneOfValue)(nil), // 15: testdata.TestVersion3LoneOneOfValue - (*TestVersion3LoneNesting)(nil), // 16: testdata.TestVersion3LoneNesting - (*TestVersion4LoneNesting)(nil), // 17: testdata.TestVersion4LoneNesting - (*TestVersionFD1)(nil), // 18: testdata.TestVersionFD1 - (*TestVersionFD1WithExtraAny)(nil), // 19: testdata.TestVersionFD1WithExtraAny - (*AnyWithExtra)(nil), // 20: testdata.AnyWithExtra - (*TestUpdatedTxRaw)(nil), // 21: testdata.TestUpdatedTxRaw - (*TestUpdatedTxBody)(nil), // 22: testdata.TestUpdatedTxBody - (*TestUpdatedAuthInfo)(nil), // 23: testdata.TestUpdatedAuthInfo - (*TestRepeatedUints)(nil), // 24: testdata.TestRepeatedUints - nil, // 25: testdata.Nested3A.IndexEntry - (*TestVersion3LoneNesting_Inner1)(nil), // 26: testdata.TestVersion3LoneNesting.Inner1 - (*TestVersion3LoneNesting_Inner2)(nil), // 27: testdata.TestVersion3LoneNesting.Inner2 - (*TestVersion3LoneNesting_Inner1_InnerInner)(nil), // 28: testdata.TestVersion3LoneNesting.Inner1.InnerInner - (*TestVersion3LoneNesting_Inner2_InnerInner)(nil), // 29: testdata.TestVersion3LoneNesting.Inner2.InnerInner - (*TestVersion4LoneNesting_Inner1)(nil), // 30: testdata.TestVersion4LoneNesting.Inner1 - (*TestVersion4LoneNesting_Inner2)(nil), // 31: testdata.TestVersion4LoneNesting.Inner2 - (*TestVersion4LoneNesting_Inner1_InnerInner)(nil), // 32: testdata.TestVersion4LoneNesting.Inner1.InnerInner - (*TestVersion4LoneNesting_Inner2_InnerInner)(nil), // 33: testdata.TestVersion4LoneNesting.Inner2.InnerInner + return file_testpb_unknonwnproto_proto_rawDescData +} + +var file_testpb_unknonwnproto_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_testpb_unknonwnproto_proto_msgTypes = make([]protoimpl.MessageInfo, 33) +var file_testpb_unknonwnproto_proto_goTypes = []interface{}{ + (Customer2_City)(0), // 0: testpb.Customer2.City + (*Customer1)(nil), // 1: testpb.Customer1 + (*Customer2)(nil), // 2: testpb.Customer2 + (*Nested4A)(nil), // 3: testpb.Nested4A + (*Nested3A)(nil), // 4: testpb.Nested3A + (*Nested2A)(nil), // 5: testpb.Nested2A + (*Nested1A)(nil), // 6: testpb.Nested1A + (*Nested4B)(nil), // 7: testpb.Nested4B + (*Nested3B)(nil), // 8: testpb.Nested3B + (*Nested2B)(nil), // 9: testpb.Nested2B + (*Nested1B)(nil), // 10: testpb.Nested1B + (*Customer3)(nil), // 11: testpb.Customer3 + (*TestVersion1)(nil), // 12: testpb.TestVersion1 + (*TestVersion2)(nil), // 13: testpb.TestVersion2 + (*TestVersion3)(nil), // 14: testpb.TestVersion3 + (*TestVersion3LoneOneOfValue)(nil), // 15: testpb.TestVersion3LoneOneOfValue + (*TestVersion3LoneNesting)(nil), // 16: testpb.TestVersion3LoneNesting + (*TestVersion4LoneNesting)(nil), // 17: testpb.TestVersion4LoneNesting + (*TestVersionFD1)(nil), // 18: testpb.TestVersionFD1 + (*TestVersionFD1WithExtraAny)(nil), // 19: testpb.TestVersionFD1WithExtraAny + (*AnyWithExtra)(nil), // 20: testpb.AnyWithExtra + (*TestUpdatedTxRaw)(nil), // 21: testpb.TestUpdatedTxRaw + (*TestUpdatedTxBody)(nil), // 22: testpb.TestUpdatedTxBody + (*TestUpdatedAuthInfo)(nil), // 23: testpb.TestUpdatedAuthInfo + (*TestRepeatedUints)(nil), // 24: testpb.TestRepeatedUints + nil, // 25: testpb.Nested3A.IndexEntry + (*TestVersion3LoneNesting_Inner1)(nil), // 26: testpb.TestVersion3LoneNesting.Inner1 + (*TestVersion3LoneNesting_Inner2)(nil), // 27: testpb.TestVersion3LoneNesting.Inner2 + (*TestVersion3LoneNesting_Inner1_InnerInner)(nil), // 28: testpb.TestVersion3LoneNesting.Inner1.InnerInner + (*TestVersion3LoneNesting_Inner2_InnerInner)(nil), // 29: testpb.TestVersion3LoneNesting.Inner2.InnerInner + (*TestVersion4LoneNesting_Inner1)(nil), // 30: testpb.TestVersion4LoneNesting.Inner1 + (*TestVersion4LoneNesting_Inner2)(nil), // 31: testpb.TestVersion4LoneNesting.Inner2 + (*TestVersion4LoneNesting_Inner1_InnerInner)(nil), // 32: testpb.TestVersion4LoneNesting.Inner1.InnerInner + (*TestVersion4LoneNesting_Inner2_InnerInner)(nil), // 33: testpb.TestVersion4LoneNesting.Inner2.InnerInner (*anypb.Any)(nil), // 34: google.protobuf.Any (*v1beta1.SignerInfo)(nil), // 35: cosmos.tx.v1beta1.SignerInfo (*v1beta1.Fee)(nil), // 36: cosmos.tx.v1beta1.Fee } -var file_unknonwnproto_proto_depIdxs = []int32{ - 0, // 0: testdata.Customer2.city:type_name -> testdata.Customer2.City - 34, // 1: testdata.Customer2.miscellaneous:type_name -> google.protobuf.Any - 3, // 2: testdata.Nested3A.a4:type_name -> testdata.Nested4A - 25, // 3: testdata.Nested3A.index:type_name -> testdata.Nested3A.IndexEntry - 4, // 4: testdata.Nested2A.nested:type_name -> testdata.Nested3A - 5, // 5: testdata.Nested1A.nested:type_name -> testdata.Nested2A - 7, // 6: testdata.Nested3B.b4:type_name -> testdata.Nested4B - 8, // 7: testdata.Nested2B.nested:type_name -> testdata.Nested3B - 9, // 8: testdata.Nested1B.nested:type_name -> testdata.Nested2B - 1, // 9: testdata.Customer3.original:type_name -> testdata.Customer1 - 12, // 10: testdata.TestVersion1.a:type_name -> testdata.TestVersion1 - 12, // 11: testdata.TestVersion1.b:type_name -> testdata.TestVersion1 - 12, // 12: testdata.TestVersion1.c:type_name -> testdata.TestVersion1 - 12, // 13: testdata.TestVersion1.d:type_name -> testdata.TestVersion1 - 12, // 14: testdata.TestVersion1.f:type_name -> testdata.TestVersion1 - 34, // 15: testdata.TestVersion1.g:type_name -> google.protobuf.Any - 12, // 16: testdata.TestVersion1.h:type_name -> testdata.TestVersion1 - 1, // 17: testdata.TestVersion1.k:type_name -> testdata.Customer1 - 13, // 18: testdata.TestVersion2.a:type_name -> testdata.TestVersion2 - 13, // 19: testdata.TestVersion2.b:type_name -> testdata.TestVersion2 - 13, // 20: testdata.TestVersion2.c:type_name -> testdata.TestVersion2 - 13, // 21: testdata.TestVersion2.d:type_name -> testdata.TestVersion2 - 13, // 22: testdata.TestVersion2.f:type_name -> testdata.TestVersion2 - 34, // 23: testdata.TestVersion2.g:type_name -> google.protobuf.Any - 12, // 24: testdata.TestVersion2.h:type_name -> testdata.TestVersion1 - 1, // 25: testdata.TestVersion2.k:type_name -> testdata.Customer1 - 14, // 26: testdata.TestVersion3.a:type_name -> testdata.TestVersion3 - 14, // 27: testdata.TestVersion3.b:type_name -> testdata.TestVersion3 - 14, // 28: testdata.TestVersion3.c:type_name -> testdata.TestVersion3 - 14, // 29: testdata.TestVersion3.d:type_name -> testdata.TestVersion3 - 14, // 30: testdata.TestVersion3.f:type_name -> testdata.TestVersion3 - 34, // 31: testdata.TestVersion3.g:type_name -> google.protobuf.Any - 12, // 32: testdata.TestVersion3.h:type_name -> testdata.TestVersion1 - 1, // 33: testdata.TestVersion3.k:type_name -> testdata.Customer1 - 14, // 34: testdata.TestVersion3LoneOneOfValue.a:type_name -> testdata.TestVersion3 - 14, // 35: testdata.TestVersion3LoneOneOfValue.b:type_name -> testdata.TestVersion3 - 14, // 36: testdata.TestVersion3LoneOneOfValue.c:type_name -> testdata.TestVersion3 - 14, // 37: testdata.TestVersion3LoneOneOfValue.d:type_name -> testdata.TestVersion3 - 34, // 38: testdata.TestVersion3LoneOneOfValue.g:type_name -> google.protobuf.Any - 12, // 39: testdata.TestVersion3LoneOneOfValue.h:type_name -> testdata.TestVersion1 - 1, // 40: testdata.TestVersion3LoneOneOfValue.k:type_name -> testdata.Customer1 - 14, // 41: testdata.TestVersion3LoneNesting.a:type_name -> testdata.TestVersion3 - 14, // 42: testdata.TestVersion3LoneNesting.b:type_name -> testdata.TestVersion3 - 14, // 43: testdata.TestVersion3LoneNesting.c:type_name -> testdata.TestVersion3 - 14, // 44: testdata.TestVersion3LoneNesting.d:type_name -> testdata.TestVersion3 - 16, // 45: testdata.TestVersion3LoneNesting.f:type_name -> testdata.TestVersion3LoneNesting - 34, // 46: testdata.TestVersion3LoneNesting.g:type_name -> google.protobuf.Any - 12, // 47: testdata.TestVersion3LoneNesting.h:type_name -> testdata.TestVersion1 - 1, // 48: testdata.TestVersion3LoneNesting.k:type_name -> testdata.Customer1 - 26, // 49: testdata.TestVersion3LoneNesting.inner1:type_name -> testdata.TestVersion3LoneNesting.Inner1 - 27, // 50: testdata.TestVersion3LoneNesting.inner2:type_name -> testdata.TestVersion3LoneNesting.Inner2 - 14, // 51: testdata.TestVersion4LoneNesting.a:type_name -> testdata.TestVersion3 - 14, // 52: testdata.TestVersion4LoneNesting.b:type_name -> testdata.TestVersion3 - 14, // 53: testdata.TestVersion4LoneNesting.c:type_name -> testdata.TestVersion3 - 14, // 54: testdata.TestVersion4LoneNesting.d:type_name -> testdata.TestVersion3 - 16, // 55: testdata.TestVersion4LoneNesting.f:type_name -> testdata.TestVersion3LoneNesting - 34, // 56: testdata.TestVersion4LoneNesting.g:type_name -> google.protobuf.Any - 12, // 57: testdata.TestVersion4LoneNesting.h:type_name -> testdata.TestVersion1 - 1, // 58: testdata.TestVersion4LoneNesting.k:type_name -> testdata.Customer1 - 30, // 59: testdata.TestVersion4LoneNesting.inner1:type_name -> testdata.TestVersion4LoneNesting.Inner1 - 31, // 60: testdata.TestVersion4LoneNesting.inner2:type_name -> testdata.TestVersion4LoneNesting.Inner2 - 12, // 61: testdata.TestVersionFD1.a:type_name -> testdata.TestVersion1 - 12, // 62: testdata.TestVersionFD1.f:type_name -> testdata.TestVersion1 - 34, // 63: testdata.TestVersionFD1.g:type_name -> google.protobuf.Any - 12, // 64: testdata.TestVersionFD1.h:type_name -> testdata.TestVersion1 - 12, // 65: testdata.TestVersionFD1WithExtraAny.a:type_name -> testdata.TestVersion1 - 12, // 66: testdata.TestVersionFD1WithExtraAny.f:type_name -> testdata.TestVersion1 - 20, // 67: testdata.TestVersionFD1WithExtraAny.g:type_name -> testdata.AnyWithExtra - 12, // 68: testdata.TestVersionFD1WithExtraAny.h:type_name -> testdata.TestVersion1 - 34, // 69: testdata.AnyWithExtra.a:type_name -> google.protobuf.Any - 34, // 70: testdata.TestUpdatedTxBody.messages:type_name -> google.protobuf.Any - 34, // 71: testdata.TestUpdatedTxBody.extension_options:type_name -> google.protobuf.Any - 34, // 72: testdata.TestUpdatedTxBody.non_critical_extension_options:type_name -> google.protobuf.Any - 35, // 73: testdata.TestUpdatedAuthInfo.signer_infos:type_name -> cosmos.tx.v1beta1.SignerInfo - 36, // 74: testdata.TestUpdatedAuthInfo.fee:type_name -> cosmos.tx.v1beta1.Fee - 3, // 75: testdata.Nested3A.IndexEntry.value:type_name -> testdata.Nested4A - 28, // 76: testdata.TestVersion3LoneNesting.Inner1.inner:type_name -> testdata.TestVersion3LoneNesting.Inner1.InnerInner - 29, // 77: testdata.TestVersion3LoneNesting.Inner2.inner:type_name -> testdata.TestVersion3LoneNesting.Inner2.InnerInner - 32, // 78: testdata.TestVersion4LoneNesting.Inner1.inner:type_name -> testdata.TestVersion4LoneNesting.Inner1.InnerInner - 33, // 79: testdata.TestVersion4LoneNesting.Inner2.inner:type_name -> testdata.TestVersion4LoneNesting.Inner2.InnerInner +var file_testpb_unknonwnproto_proto_depIdxs = []int32{ + 0, // 0: testpb.Customer2.city:type_name -> testpb.Customer2.City + 34, // 1: testpb.Customer2.miscellaneous:type_name -> google.protobuf.Any + 3, // 2: testpb.Nested3A.a4:type_name -> testpb.Nested4A + 25, // 3: testpb.Nested3A.index:type_name -> testpb.Nested3A.IndexEntry + 4, // 4: testpb.Nested2A.nested:type_name -> testpb.Nested3A + 5, // 5: testpb.Nested1A.nested:type_name -> testpb.Nested2A + 7, // 6: testpb.Nested3B.b4:type_name -> testpb.Nested4B + 8, // 7: testpb.Nested2B.nested:type_name -> testpb.Nested3B + 9, // 8: testpb.Nested1B.nested:type_name -> testpb.Nested2B + 1, // 9: testpb.Customer3.original:type_name -> testpb.Customer1 + 12, // 10: testpb.TestVersion1.a:type_name -> testpb.TestVersion1 + 12, // 11: testpb.TestVersion1.b:type_name -> testpb.TestVersion1 + 12, // 12: testpb.TestVersion1.c:type_name -> testpb.TestVersion1 + 12, // 13: testpb.TestVersion1.d:type_name -> testpb.TestVersion1 + 12, // 14: testpb.TestVersion1.f:type_name -> testpb.TestVersion1 + 34, // 15: testpb.TestVersion1.g:type_name -> google.protobuf.Any + 12, // 16: testpb.TestVersion1.h:type_name -> testpb.TestVersion1 + 1, // 17: testpb.TestVersion1.k:type_name -> testpb.Customer1 + 13, // 18: testpb.TestVersion2.a:type_name -> testpb.TestVersion2 + 13, // 19: testpb.TestVersion2.b:type_name -> testpb.TestVersion2 + 13, // 20: testpb.TestVersion2.c:type_name -> testpb.TestVersion2 + 13, // 21: testpb.TestVersion2.d:type_name -> testpb.TestVersion2 + 13, // 22: testpb.TestVersion2.f:type_name -> testpb.TestVersion2 + 34, // 23: testpb.TestVersion2.g:type_name -> google.protobuf.Any + 12, // 24: testpb.TestVersion2.h:type_name -> testpb.TestVersion1 + 1, // 25: testpb.TestVersion2.k:type_name -> testpb.Customer1 + 14, // 26: testpb.TestVersion3.a:type_name -> testpb.TestVersion3 + 14, // 27: testpb.TestVersion3.b:type_name -> testpb.TestVersion3 + 14, // 28: testpb.TestVersion3.c:type_name -> testpb.TestVersion3 + 14, // 29: testpb.TestVersion3.d:type_name -> testpb.TestVersion3 + 14, // 30: testpb.TestVersion3.f:type_name -> testpb.TestVersion3 + 34, // 31: testpb.TestVersion3.g:type_name -> google.protobuf.Any + 12, // 32: testpb.TestVersion3.h:type_name -> testpb.TestVersion1 + 1, // 33: testpb.TestVersion3.k:type_name -> testpb.Customer1 + 14, // 34: testpb.TestVersion3LoneOneOfValue.a:type_name -> testpb.TestVersion3 + 14, // 35: testpb.TestVersion3LoneOneOfValue.b:type_name -> testpb.TestVersion3 + 14, // 36: testpb.TestVersion3LoneOneOfValue.c:type_name -> testpb.TestVersion3 + 14, // 37: testpb.TestVersion3LoneOneOfValue.d:type_name -> testpb.TestVersion3 + 34, // 38: testpb.TestVersion3LoneOneOfValue.g:type_name -> google.protobuf.Any + 12, // 39: testpb.TestVersion3LoneOneOfValue.h:type_name -> testpb.TestVersion1 + 1, // 40: testpb.TestVersion3LoneOneOfValue.k:type_name -> testpb.Customer1 + 14, // 41: testpb.TestVersion3LoneNesting.a:type_name -> testpb.TestVersion3 + 14, // 42: testpb.TestVersion3LoneNesting.b:type_name -> testpb.TestVersion3 + 14, // 43: testpb.TestVersion3LoneNesting.c:type_name -> testpb.TestVersion3 + 14, // 44: testpb.TestVersion3LoneNesting.d:type_name -> testpb.TestVersion3 + 16, // 45: testpb.TestVersion3LoneNesting.f:type_name -> testpb.TestVersion3LoneNesting + 34, // 46: testpb.TestVersion3LoneNesting.g:type_name -> google.protobuf.Any + 12, // 47: testpb.TestVersion3LoneNesting.h:type_name -> testpb.TestVersion1 + 1, // 48: testpb.TestVersion3LoneNesting.k:type_name -> testpb.Customer1 + 26, // 49: testpb.TestVersion3LoneNesting.inner1:type_name -> testpb.TestVersion3LoneNesting.Inner1 + 27, // 50: testpb.TestVersion3LoneNesting.inner2:type_name -> testpb.TestVersion3LoneNesting.Inner2 + 14, // 51: testpb.TestVersion4LoneNesting.a:type_name -> testpb.TestVersion3 + 14, // 52: testpb.TestVersion4LoneNesting.b:type_name -> testpb.TestVersion3 + 14, // 53: testpb.TestVersion4LoneNesting.c:type_name -> testpb.TestVersion3 + 14, // 54: testpb.TestVersion4LoneNesting.d:type_name -> testpb.TestVersion3 + 16, // 55: testpb.TestVersion4LoneNesting.f:type_name -> testpb.TestVersion3LoneNesting + 34, // 56: testpb.TestVersion4LoneNesting.g:type_name -> google.protobuf.Any + 12, // 57: testpb.TestVersion4LoneNesting.h:type_name -> testpb.TestVersion1 + 1, // 58: testpb.TestVersion4LoneNesting.k:type_name -> testpb.Customer1 + 30, // 59: testpb.TestVersion4LoneNesting.inner1:type_name -> testpb.TestVersion4LoneNesting.Inner1 + 31, // 60: testpb.TestVersion4LoneNesting.inner2:type_name -> testpb.TestVersion4LoneNesting.Inner2 + 12, // 61: testpb.TestVersionFD1.a:type_name -> testpb.TestVersion1 + 12, // 62: testpb.TestVersionFD1.f:type_name -> testpb.TestVersion1 + 34, // 63: testpb.TestVersionFD1.g:type_name -> google.protobuf.Any + 12, // 64: testpb.TestVersionFD1.h:type_name -> testpb.TestVersion1 + 12, // 65: testpb.TestVersionFD1WithExtraAny.a:type_name -> testpb.TestVersion1 + 12, // 66: testpb.TestVersionFD1WithExtraAny.f:type_name -> testpb.TestVersion1 + 20, // 67: testpb.TestVersionFD1WithExtraAny.g:type_name -> testpb.AnyWithExtra + 12, // 68: testpb.TestVersionFD1WithExtraAny.h:type_name -> testpb.TestVersion1 + 34, // 69: testpb.AnyWithExtra.a:type_name -> google.protobuf.Any + 34, // 70: testpb.TestUpdatedTxBody.messages:type_name -> google.protobuf.Any + 34, // 71: testpb.TestUpdatedTxBody.extension_options:type_name -> google.protobuf.Any + 34, // 72: testpb.TestUpdatedTxBody.non_critical_extension_options:type_name -> google.protobuf.Any + 35, // 73: testpb.TestUpdatedAuthInfo.signer_infos:type_name -> cosmos.tx.v1beta1.SignerInfo + 36, // 74: testpb.TestUpdatedAuthInfo.fee:type_name -> cosmos.tx.v1beta1.Fee + 3, // 75: testpb.Nested3A.IndexEntry.value:type_name -> testpb.Nested4A + 28, // 76: testpb.TestVersion3LoneNesting.Inner1.inner:type_name -> testpb.TestVersion3LoneNesting.Inner1.InnerInner + 29, // 77: testpb.TestVersion3LoneNesting.Inner2.inner:type_name -> testpb.TestVersion3LoneNesting.Inner2.InnerInner + 32, // 78: testpb.TestVersion4LoneNesting.Inner1.inner:type_name -> testpb.TestVersion4LoneNesting.Inner1.InnerInner + 33, // 79: testpb.TestVersion4LoneNesting.Inner2.inner:type_name -> testpb.TestVersion4LoneNesting.Inner2.InnerInner 80, // [80:80] is the sub-list for method output_type 80, // [80:80] is the sub-list for method input_type 80, // [80:80] is the sub-list for extension type_name @@ -27603,13 +27595,13 @@ var file_unknonwnproto_proto_depIdxs = []int32{ 0, // [0:80] is the sub-list for field type_name } -func init() { file_unknonwnproto_proto_init() } -func file_unknonwnproto_proto_init() { - if File_unknonwnproto_proto != nil { +func init() { file_testpb_unknonwnproto_proto_init() } +func file_testpb_unknonwnproto_proto_init() { + if File_testpb_unknonwnproto_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_unknonwnproto_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Customer1); i { case 0: return &v.state @@ -27621,7 +27613,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Customer2); i { case 0: return &v.state @@ -27633,7 +27625,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested4A); i { case 0: return &v.state @@ -27645,7 +27637,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested3A); i { case 0: return &v.state @@ -27657,7 +27649,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested2A); i { case 0: return &v.state @@ -27669,7 +27661,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested1A); i { case 0: return &v.state @@ -27681,7 +27673,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested4B); i { case 0: return &v.state @@ -27693,7 +27685,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested3B); i { case 0: return &v.state @@ -27705,7 +27697,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested2B); i { case 0: return &v.state @@ -27717,7 +27709,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Nested1B); i { case 0: return &v.state @@ -27729,7 +27721,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Customer3); i { case 0: return &v.state @@ -27741,7 +27733,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion1); i { case 0: return &v.state @@ -27753,7 +27745,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion2); i { case 0: return &v.state @@ -27765,7 +27757,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3); i { case 0: return &v.state @@ -27777,7 +27769,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneOneOfValue); i { case 0: return &v.state @@ -27789,7 +27781,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneNesting); i { case 0: return &v.state @@ -27801,7 +27793,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion4LoneNesting); i { case 0: return &v.state @@ -27813,7 +27805,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersionFD1); i { case 0: return &v.state @@ -27825,7 +27817,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersionFD1WithExtraAny); i { case 0: return &v.state @@ -27837,7 +27829,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AnyWithExtra); i { case 0: return &v.state @@ -27849,7 +27841,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestUpdatedTxRaw); i { case 0: return &v.state @@ -27861,7 +27853,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestUpdatedTxBody); i { case 0: return &v.state @@ -27873,7 +27865,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestUpdatedAuthInfo); i { case 0: return &v.state @@ -27885,7 +27877,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestRepeatedUints); i { case 0: return &v.state @@ -27897,7 +27889,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneNesting_Inner1); i { case 0: return &v.state @@ -27909,7 +27901,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneNesting_Inner2); i { case 0: return &v.state @@ -27921,7 +27913,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneNesting_Inner1_InnerInner); i { case 0: return &v.state @@ -27933,7 +27925,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion3LoneNesting_Inner2_InnerInner); i { case 0: return &v.state @@ -27945,7 +27937,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion4LoneNesting_Inner1); i { case 0: return &v.state @@ -27957,7 +27949,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion4LoneNesting_Inner2); i { case 0: return &v.state @@ -27969,7 +27961,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion4LoneNesting_Inner1_InnerInner); i { case 0: return &v.state @@ -27981,7 +27973,7 @@ func file_unknonwnproto_proto_init() { return nil } } - file_unknonwnproto_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + file_testpb_unknonwnproto_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestVersion4LoneNesting_Inner2_InnerInner); i { case 0: return &v.state @@ -27994,36 +27986,36 @@ func file_unknonwnproto_proto_init() { } } } - file_unknonwnproto_proto_msgTypes[10].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[10].OneofWrappers = []interface{}{ (*Customer3_CreditCardNo)(nil), (*Customer3_ChequeNo)(nil), } - file_unknonwnproto_proto_msgTypes[11].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[11].OneofWrappers = []interface{}{ (*TestVersion1_E)(nil), (*TestVersion1_F)(nil), } - file_unknonwnproto_proto_msgTypes[12].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[12].OneofWrappers = []interface{}{ (*TestVersion2_E)(nil), (*TestVersion2_F)(nil), } - file_unknonwnproto_proto_msgTypes[13].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[13].OneofWrappers = []interface{}{ (*TestVersion3_E)(nil), (*TestVersion3_F)(nil), } - file_unknonwnproto_proto_msgTypes[14].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[14].OneofWrappers = []interface{}{ (*TestVersion3LoneOneOfValue_E)(nil), } - file_unknonwnproto_proto_msgTypes[15].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[15].OneofWrappers = []interface{}{ (*TestVersion3LoneNesting_F)(nil), } - file_unknonwnproto_proto_msgTypes[16].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[16].OneofWrappers = []interface{}{ (*TestVersion4LoneNesting_F)(nil), } - file_unknonwnproto_proto_msgTypes[17].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[17].OneofWrappers = []interface{}{ (*TestVersionFD1_E)(nil), (*TestVersionFD1_F)(nil), } - file_unknonwnproto_proto_msgTypes[18].OneofWrappers = []interface{}{ + file_testpb_unknonwnproto_proto_msgTypes[18].OneofWrappers = []interface{}{ (*TestVersionFD1WithExtraAny_E)(nil), (*TestVersionFD1WithExtraAny_F)(nil), } @@ -28031,19 +28023,19 @@ func file_unknonwnproto_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_unknonwnproto_proto_rawDesc, + RawDescriptor: file_testpb_unknonwnproto_proto_rawDesc, NumEnums: 1, NumMessages: 33, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_unknonwnproto_proto_goTypes, - DependencyIndexes: file_unknonwnproto_proto_depIdxs, - EnumInfos: file_unknonwnproto_proto_enumTypes, - MessageInfos: file_unknonwnproto_proto_msgTypes, + GoTypes: file_testpb_unknonwnproto_proto_goTypes, + DependencyIndexes: file_testpb_unknonwnproto_proto_depIdxs, + EnumInfos: file_testpb_unknonwnproto_proto_enumTypes, + MessageInfos: file_testpb_unknonwnproto_proto_msgTypes, }.Build() - File_unknonwnproto_proto = out.File - file_unknonwnproto_proto_rawDesc = nil - file_unknonwnproto_proto_goTypes = nil - file_unknonwnproto_proto_depIdxs = nil + File_testpb_unknonwnproto_proto = out.File + file_testpb_unknonwnproto_proto_rawDesc = nil + file_testpb_unknonwnproto_proto_goTypes = nil + file_testpb_unknonwnproto_proto_depIdxs = nil } diff --git a/testutil/testdata/tx.pb.go b/testutil/testdata/tx.pb.go index d291b1ee15..9f7abdf9b7 100644 --- a/testutil/testdata/tx.pb.go +++ b/testutil/testdata/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tx.proto +// source: testpb/tx.proto package testdata @@ -36,7 +36,7 @@ func (m *MsgCreateDog) Reset() { *m = MsgCreateDog{} } func (m *MsgCreateDog) String() string { return proto.CompactTextString(m) } func (*MsgCreateDog) ProtoMessage() {} func (*MsgCreateDog) Descriptor() ([]byte, []int) { - return fileDescriptor_0fd2153dc07d3b5c, []int{0} + return fileDescriptor_1c54006dba274b2e, []int{0} } func (m *MsgCreateDog) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -80,7 +80,7 @@ func (m *MsgCreateDogResponse) Reset() { *m = MsgCreateDogResponse{} } func (m *MsgCreateDogResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateDogResponse) ProtoMessage() {} func (*MsgCreateDogResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0fd2153dc07d3b5c, []int{1} + return fileDescriptor_1c54006dba274b2e, []int{1} } func (m *MsgCreateDogResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -126,7 +126,7 @@ func (m *TestMsg) Reset() { *m = TestMsg{} } func (m *TestMsg) String() string { return proto.CompactTextString(m) } func (*TestMsg) ProtoMessage() {} func (*TestMsg) Descriptor() ([]byte, []int) { - return fileDescriptor_0fd2153dc07d3b5c, []int{2} + return fileDescriptor_1c54006dba274b2e, []int{2} } func (m *TestMsg) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -156,32 +156,32 @@ func (m *TestMsg) XXX_DiscardUnknown() { var xxx_messageInfo_TestMsg proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgCreateDog)(nil), "testdata.MsgCreateDog") - proto.RegisterType((*MsgCreateDogResponse)(nil), "testdata.MsgCreateDogResponse") - proto.RegisterType((*TestMsg)(nil), "testdata.TestMsg") -} - -func init() { proto.RegisterFile("tx.proto", fileDescriptor_0fd2153dc07d3b5c) } - -var fileDescriptor_0fd2153dc07d3b5c = []byte{ - // 258 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x28, 0xa9, 0xd0, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x28, 0x49, 0x2d, 0x2e, 0x49, 0x49, 0x2c, 0x49, 0x94, 0x12, - 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x0b, 0xea, 0x83, 0x58, 0x10, 0x79, 0x29, 0x3e, 0x98, 0x3c, 0x84, - 0xaf, 0xa4, 0xcf, 0xc5, 0xe3, 0x5b, 0x9c, 0xee, 0x5c, 0x94, 0x9a, 0x58, 0x92, 0xea, 0x92, 0x9f, - 0x2e, 0x24, 0xcf, 0xc5, 0x9c, 0x92, 0x9f, 0x2e, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xc4, 0xab, - 0x07, 0x57, 0xed, 0x92, 0x9f, 0x1e, 0x04, 0x92, 0x51, 0xd2, 0xe2, 0x12, 0x41, 0xd6, 0x10, 0x94, - 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x2a, 0x24, 0xc4, 0xc5, 0x92, 0x97, 0x98, 0x9b, 0x0a, 0xd6, - 0xc9, 0x19, 0x04, 0x66, 0x2b, 0x69, 0x72, 0xb1, 0x87, 0xa4, 0x16, 0x97, 0xf8, 0x16, 0xa7, 0x0b, - 0x49, 0x70, 0xb1, 0x17, 0x67, 0xa6, 0xe7, 0xa5, 0x16, 0x15, 0x4b, 0x30, 0x2a, 0x30, 0x6b, 0x70, - 0x06, 0xc1, 0xb8, 0x56, 0x2c, 0x1d, 0x0b, 0xe4, 0x19, 0x8c, 0xbc, 0xb8, 0x98, 0x41, 0xca, 0x9c, - 0xb9, 0x38, 0x11, 0x6e, 0x11, 0x43, 0x58, 0x8f, 0x6c, 0xa5, 0x94, 0x1c, 0x76, 0x71, 0x98, 0x53, - 0x9c, 0x3c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, - 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x2f, 0x3d, 0xb3, - 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, - 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x83, 0x4c, 0x2d, 0x2d, 0xc9, 0xcc, 0xd1, 0x87, 0x19, 0x9f, 0xc4, - 0x06, 0x0e, 0x24, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0x63, 0x9a, 0x1b, 0x60, 0x01, - 0x00, 0x00, + proto.RegisterType((*MsgCreateDog)(nil), "testpb.MsgCreateDog") + proto.RegisterType((*MsgCreateDogResponse)(nil), "testpb.MsgCreateDogResponse") + proto.RegisterType((*TestMsg)(nil), "testpb.TestMsg") +} + +func init() { proto.RegisterFile("testpb/tx.proto", fileDescriptor_1c54006dba274b2e) } + +var fileDescriptor_1c54006dba274b2e = []byte{ + // 265 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0x49, 0x2d, 0x2e, + 0x29, 0x48, 0xd2, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0x08, 0x48, + 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x85, 0xf4, 0x41, 0x2c, 0x88, 0xac, 0x94, 0x28, 0x4c, 0x79, + 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0x22, 0x44, 0x58, 0x49, 0x97, 0x8b, 0xc7, 0xb7, 0x38, 0xdd, + 0xb9, 0x28, 0x35, 0xb1, 0x24, 0xd5, 0x25, 0x3f, 0x5d, 0x48, 0x96, 0x8b, 0x39, 0x25, 0x3f, 0x5d, + 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x88, 0x5b, 0x0f, 0xa2, 0x49, 0xcf, 0x25, 0x3f, 0x3d, 0x08, + 0x24, 0xae, 0xa4, 0xc5, 0x25, 0x82, 0xac, 0x3c, 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, + 0x48, 0x88, 0x8b, 0x25, 0x2f, 0x31, 0x37, 0x15, 0xac, 0x8f, 0x33, 0x08, 0xcc, 0x56, 0xd2, 0xe4, + 0x62, 0x0f, 0x49, 0x2d, 0x2e, 0xf1, 0x2d, 0x4e, 0x17, 0x92, 0xe0, 0x62, 0x2f, 0xce, 0x4c, 0xcf, + 0x4b, 0x2d, 0x2a, 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x0c, 0x82, 0x71, 0xad, 0x58, 0x3a, 0x16, + 0xc8, 0x33, 0x18, 0xb9, 0x71, 0x31, 0x83, 0x94, 0xd9, 0x73, 0x71, 0x22, 0x5c, 0x22, 0x02, 0xb3, + 0x1c, 0xd9, 0x42, 0x29, 0x19, 0x6c, 0xa2, 0x30, 0x67, 0x38, 0x79, 0x9c, 0x78, 0x24, 0xc7, 0x78, + 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, + 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x5e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, + 0xae, 0x7e, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0x31, 0x94, 0xd2, 0x2d, 0x4e, 0xc9, 0x06, 0x07, 0x4a, + 0x69, 0x49, 0x66, 0x0e, 0x3c, 0x74, 0x92, 0xd8, 0xc0, 0xc1, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, + 0xff, 0xd5, 0x7f, 0x29, 0x59, 0x66, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -209,7 +209,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) CreateDog(ctx context.Context, in *MsgCreateDog, opts ...grpc.CallOption) (*MsgCreateDogResponse, error) { out := new(MsgCreateDogResponse) - err := c.cc.Invoke(ctx, "/testdata.Msg/CreateDog", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.Msg/CreateDog", in, out, opts...) if err != nil { return nil, err } @@ -243,7 +243,7 @@ func _Msg_CreateDog_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testdata.Msg/CreateDog", + FullMethod: "/testpb.Msg/CreateDog", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).CreateDog(ctx, req.(*MsgCreateDog)) @@ -252,7 +252,7 @@ func _Msg_CreateDog_Handler(srv interface{}, ctx context.Context, dec func(inter } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "testdata.Msg", + ServiceName: "testpb.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -261,7 +261,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tx.proto", + Metadata: "testpb/tx.proto", } func (m *MsgCreateDog) Marshal() (dAtA []byte, err error) { diff --git a/testutil/testdata/unknonwnproto.pb.go b/testutil/testdata/unknonwnproto.pb.go index 7e9f2b1303..3522a72535 100644 --- a/testutil/testdata/unknonwnproto.pb.go +++ b/testutil/testdata/unknonwnproto.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: unknonwnproto.proto +// source: testpb/unknonwnproto.proto package testdata @@ -57,7 +57,7 @@ func (x Customer2_City) String() string { } func (Customer2_City) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{1, 0} + return fileDescriptor_fe4560133be9209a, []int{1, 0} } type Customer1 struct { @@ -71,7 +71,7 @@ func (m *Customer1) Reset() { *m = Customer1{} } func (m *Customer1) String() string { return proto.CompactTextString(m) } func (*Customer1) ProtoMessage() {} func (*Customer1) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{0} + return fileDescriptor_fe4560133be9209a, []int{0} } func (m *Customer1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -134,7 +134,7 @@ type Customer2 struct { Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` Fewer float32 `protobuf:"fixed32,4,opt,name=fewer,proto3" json:"fewer,omitempty"` Reserved int64 `protobuf:"varint,1047,opt,name=reserved,proto3" json:"reserved,omitempty"` - City Customer2_City `protobuf:"varint,6,opt,name=city,proto3,enum=testdata.Customer2_City" json:"city,omitempty"` + City Customer2_City `protobuf:"varint,6,opt,name=city,proto3,enum=testpb.Customer2_City" json:"city,omitempty"` Miscellaneous *types.Any `protobuf:"bytes,10,opt,name=miscellaneous,proto3" json:"miscellaneous,omitempty"` } @@ -142,7 +142,7 @@ func (m *Customer2) Reset() { *m = Customer2{} } func (m *Customer2) String() string { return proto.CompactTextString(m) } func (*Customer2) ProtoMessage() {} func (*Customer2) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{1} + return fileDescriptor_fe4560133be9209a, []int{1} } func (m *Customer2) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -229,7 +229,7 @@ func (m *Nested4A) Reset() { *m = Nested4A{} } func (m *Nested4A) String() string { return proto.CompactTextString(m) } func (*Nested4A) ProtoMessage() {} func (*Nested4A) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{2} + return fileDescriptor_fe4560133be9209a, []int{2} } func (m *Nested4A) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -283,7 +283,7 @@ func (m *Nested3A) Reset() { *m = Nested3A{} } func (m *Nested3A) String() string { return proto.CompactTextString(m) } func (*Nested3A) ProtoMessage() {} func (*Nested3A) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{3} + return fileDescriptor_fe4560133be9209a, []int{3} } func (m *Nested3A) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -350,7 +350,7 @@ func (m *Nested2A) Reset() { *m = Nested2A{} } func (m *Nested2A) String() string { return proto.CompactTextString(m) } func (*Nested2A) ProtoMessage() {} func (*Nested2A) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{4} + return fileDescriptor_fe4560133be9209a, []int{4} } func (m *Nested2A) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -409,7 +409,7 @@ func (m *Nested1A) Reset() { *m = Nested1A{} } func (m *Nested1A) String() string { return proto.CompactTextString(m) } func (*Nested1A) ProtoMessage() {} func (*Nested1A) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{5} + return fileDescriptor_fe4560133be9209a, []int{5} } func (m *Nested1A) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -462,7 +462,7 @@ func (m *Nested4B) Reset() { *m = Nested4B{} } func (m *Nested4B) String() string { return proto.CompactTextString(m) } func (*Nested4B) ProtoMessage() {} func (*Nested4B) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{6} + return fileDescriptor_fe4560133be9209a, []int{6} } func (m *Nested4B) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -523,7 +523,7 @@ func (m *Nested3B) Reset() { *m = Nested3B{} } func (m *Nested3B) String() string { return proto.CompactTextString(m) } func (*Nested3B) ProtoMessage() {} func (*Nested3B) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{7} + return fileDescriptor_fe4560133be9209a, []int{7} } func (m *Nested3B) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -591,7 +591,7 @@ func (m *Nested2B) Reset() { *m = Nested2B{} } func (m *Nested2B) String() string { return proto.CompactTextString(m) } func (*Nested2B) ProtoMessage() {} func (*Nested2B) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{8} + return fileDescriptor_fe4560133be9209a, []int{8} } func (m *Nested2B) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -658,7 +658,7 @@ func (m *Nested1B) Reset() { *m = Nested1B{} } func (m *Nested1B) String() string { return proto.CompactTextString(m) } func (*Nested1B) ProtoMessage() {} func (*Nested1B) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{9} + return fileDescriptor_fe4560133be9209a, []int{9} } func (m *Nested1B) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -726,7 +726,7 @@ func (m *Customer3) Reset() { *m = Customer3{} } func (m *Customer3) String() string { return proto.CompactTextString(m) } func (*Customer3) ProtoMessage() {} func (*Customer3) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{10} + return fileDescriptor_fe4560133be9209a, []int{10} } func (m *Customer3) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -864,7 +864,7 @@ func (m *TestVersion1) Reset() { *m = TestVersion1{} } func (m *TestVersion1) String() string { return proto.CompactTextString(m) } func (*TestVersion1) ProtoMessage() {} func (*TestVersion1) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{11} + return fileDescriptor_fe4560133be9209a, []int{11} } func (m *TestVersion1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,7 +1010,7 @@ func (m *TestVersion2) Reset() { *m = TestVersion2{} } func (m *TestVersion2) String() string { return proto.CompactTextString(m) } func (*TestVersion2) ProtoMessage() {} func (*TestVersion2) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{12} + return fileDescriptor_fe4560133be9209a, []int{12} } func (m *TestVersion2) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1163,7 +1163,7 @@ func (m *TestVersion3) Reset() { *m = TestVersion3{} } func (m *TestVersion3) String() string { return proto.CompactTextString(m) } func (*TestVersion3) ProtoMessage() {} func (*TestVersion3) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{13} + return fileDescriptor_fe4560133be9209a, []int{13} } func (m *TestVersion3) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1315,7 +1315,7 @@ func (m *TestVersion3LoneOneOfValue) Reset() { *m = TestVersion3LoneOneO func (m *TestVersion3LoneOneOfValue) String() string { return proto.CompactTextString(m) } func (*TestVersion3LoneOneOfValue) ProtoMessage() {} func (*TestVersion3LoneOneOfValue) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{14} + return fileDescriptor_fe4560133be9209a, []int{14} } func (m *TestVersion3LoneOneOfValue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1457,7 +1457,7 @@ func (m *TestVersion3LoneNesting) Reset() { *m = TestVersion3LoneNesting func (m *TestVersion3LoneNesting) String() string { return proto.CompactTextString(m) } func (*TestVersion3LoneNesting) ProtoMessage() {} func (*TestVersion3LoneNesting) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{15} + return fileDescriptor_fe4560133be9209a, []int{15} } func (m *TestVersion3LoneNesting) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1599,7 +1599,7 @@ func (m *TestVersion3LoneNesting_Inner1) Reset() { *m = TestVersion3Lone func (m *TestVersion3LoneNesting_Inner1) String() string { return proto.CompactTextString(m) } func (*TestVersion3LoneNesting_Inner1) ProtoMessage() {} func (*TestVersion3LoneNesting_Inner1) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{15, 0} + return fileDescriptor_fe4560133be9209a, []int{15, 0} } func (m *TestVersion3LoneNesting_Inner1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1662,7 +1662,7 @@ func (m *TestVersion3LoneNesting_Inner1_InnerInner) String() string { } func (*TestVersion3LoneNesting_Inner1_InnerInner) ProtoMessage() {} func (*TestVersion3LoneNesting_Inner1_InnerInner) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{15, 0, 0} + return fileDescriptor_fe4560133be9209a, []int{15, 0, 0} } func (m *TestVersion3LoneNesting_Inner1_InnerInner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1715,7 +1715,7 @@ func (m *TestVersion3LoneNesting_Inner2) Reset() { *m = TestVersion3Lone func (m *TestVersion3LoneNesting_Inner2) String() string { return proto.CompactTextString(m) } func (*TestVersion3LoneNesting_Inner2) ProtoMessage() {} func (*TestVersion3LoneNesting_Inner2) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{15, 1} + return fileDescriptor_fe4560133be9209a, []int{15, 1} } func (m *TestVersion3LoneNesting_Inner2) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1778,7 +1778,7 @@ func (m *TestVersion3LoneNesting_Inner2_InnerInner) String() string { } func (*TestVersion3LoneNesting_Inner2_InnerInner) ProtoMessage() {} func (*TestVersion3LoneNesting_Inner2_InnerInner) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{15, 1, 0} + return fileDescriptor_fe4560133be9209a, []int{15, 1, 0} } func (m *TestVersion3LoneNesting_Inner2_InnerInner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1845,7 +1845,7 @@ func (m *TestVersion4LoneNesting) Reset() { *m = TestVersion4LoneNesting func (m *TestVersion4LoneNesting) String() string { return proto.CompactTextString(m) } func (*TestVersion4LoneNesting) ProtoMessage() {} func (*TestVersion4LoneNesting) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{16} + return fileDescriptor_fe4560133be9209a, []int{16} } func (m *TestVersion4LoneNesting) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1987,7 +1987,7 @@ func (m *TestVersion4LoneNesting_Inner1) Reset() { *m = TestVersion4Lone func (m *TestVersion4LoneNesting_Inner1) String() string { return proto.CompactTextString(m) } func (*TestVersion4LoneNesting_Inner1) ProtoMessage() {} func (*TestVersion4LoneNesting_Inner1) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{16, 0} + return fileDescriptor_fe4560133be9209a, []int{16, 0} } func (m *TestVersion4LoneNesting_Inner1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2050,7 +2050,7 @@ func (m *TestVersion4LoneNesting_Inner1_InnerInner) String() string { } func (*TestVersion4LoneNesting_Inner1_InnerInner) ProtoMessage() {} func (*TestVersion4LoneNesting_Inner1_InnerInner) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{16, 0, 0} + return fileDescriptor_fe4560133be9209a, []int{16, 0, 0} } func (m *TestVersion4LoneNesting_Inner1_InnerInner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2103,7 +2103,7 @@ func (m *TestVersion4LoneNesting_Inner2) Reset() { *m = TestVersion4Lone func (m *TestVersion4LoneNesting_Inner2) String() string { return proto.CompactTextString(m) } func (*TestVersion4LoneNesting_Inner2) ProtoMessage() {} func (*TestVersion4LoneNesting_Inner2) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{16, 1} + return fileDescriptor_fe4560133be9209a, []int{16, 1} } func (m *TestVersion4LoneNesting_Inner2) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2166,7 +2166,7 @@ func (m *TestVersion4LoneNesting_Inner2_InnerInner) String() string { } func (*TestVersion4LoneNesting_Inner2_InnerInner) ProtoMessage() {} func (*TestVersion4LoneNesting_Inner2_InnerInner) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{16, 1, 0} + return fileDescriptor_fe4560133be9209a, []int{16, 1, 0} } func (m *TestVersion4LoneNesting_Inner2_InnerInner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2225,7 +2225,7 @@ func (m *TestVersionFD1) Reset() { *m = TestVersionFD1{} } func (m *TestVersionFD1) String() string { return proto.CompactTextString(m) } func (*TestVersionFD1) ProtoMessage() {} func (*TestVersionFD1) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{17} + return fileDescriptor_fe4560133be9209a, []int{17} } func (m *TestVersionFD1) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2343,7 +2343,7 @@ func (m *TestVersionFD1WithExtraAny) Reset() { *m = TestVersionFD1WithEx func (m *TestVersionFD1WithExtraAny) String() string { return proto.CompactTextString(m) } func (*TestVersionFD1WithExtraAny) ProtoMessage() {} func (*TestVersionFD1WithExtraAny) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{18} + return fileDescriptor_fe4560133be9209a, []int{18} } func (m *TestVersionFD1WithExtraAny) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2455,7 +2455,7 @@ func (m *AnyWithExtra) Reset() { *m = AnyWithExtra{} } func (m *AnyWithExtra) String() string { return proto.CompactTextString(m) } func (*AnyWithExtra) ProtoMessage() {} func (*AnyWithExtra) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{19} + return fileDescriptor_fe4560133be9209a, []int{19} } func (m *AnyWithExtra) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2510,7 +2510,7 @@ func (m *TestUpdatedTxRaw) Reset() { *m = TestUpdatedTxRaw{} } func (m *TestUpdatedTxRaw) String() string { return proto.CompactTextString(m) } func (*TestUpdatedTxRaw) ProtoMessage() {} func (*TestUpdatedTxRaw) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{20} + return fileDescriptor_fe4560133be9209a, []int{20} } func (m *TestUpdatedTxRaw) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2588,7 +2588,7 @@ func (m *TestUpdatedTxBody) Reset() { *m = TestUpdatedTxBody{} } func (m *TestUpdatedTxBody) String() string { return proto.CompactTextString(m) } func (*TestUpdatedTxBody) ProtoMessage() {} func (*TestUpdatedTxBody) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{21} + return fileDescriptor_fe4560133be9209a, []int{21} } func (m *TestUpdatedTxBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2677,7 +2677,7 @@ func (m *TestUpdatedAuthInfo) Reset() { *m = TestUpdatedAuthInfo{} } func (m *TestUpdatedAuthInfo) String() string { return proto.CompactTextString(m) } func (*TestUpdatedAuthInfo) ProtoMessage() {} func (*TestUpdatedAuthInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{22} + return fileDescriptor_fe4560133be9209a, []int{22} } func (m *TestUpdatedAuthInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2742,7 +2742,7 @@ func (m *TestRepeatedUints) Reset() { *m = TestRepeatedUints{} } func (m *TestRepeatedUints) String() string { return proto.CompactTextString(m) } func (*TestRepeatedUints) ProtoMessage() {} func (*TestRepeatedUints) Descriptor() ([]byte, []int) { - return fileDescriptor_448ea787339d1228, []int{23} + return fileDescriptor_fe4560133be9209a, []int{23} } func (m *TestRepeatedUints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2779,149 +2779,149 @@ func (m *TestRepeatedUints) GetNums() []uint64 { } func init() { - proto.RegisterEnum("testdata.Customer2_City", Customer2_City_name, Customer2_City_value) - proto.RegisterType((*Customer1)(nil), "testdata.Customer1") - proto.RegisterType((*Customer2)(nil), "testdata.Customer2") - proto.RegisterType((*Nested4A)(nil), "testdata.Nested4A") - proto.RegisterType((*Nested3A)(nil), "testdata.Nested3A") - proto.RegisterMapType((map[int64]*Nested4A)(nil), "testdata.Nested3A.IndexEntry") - proto.RegisterType((*Nested2A)(nil), "testdata.Nested2A") - proto.RegisterType((*Nested1A)(nil), "testdata.Nested1A") - proto.RegisterType((*Nested4B)(nil), "testdata.Nested4B") - proto.RegisterType((*Nested3B)(nil), "testdata.Nested3B") - proto.RegisterType((*Nested2B)(nil), "testdata.Nested2B") - proto.RegisterType((*Nested1B)(nil), "testdata.Nested1B") - proto.RegisterType((*Customer3)(nil), "testdata.Customer3") - proto.RegisterType((*TestVersion1)(nil), "testdata.TestVersion1") - proto.RegisterType((*TestVersion2)(nil), "testdata.TestVersion2") - proto.RegisterType((*TestVersion3)(nil), "testdata.TestVersion3") - proto.RegisterType((*TestVersion3LoneOneOfValue)(nil), "testdata.TestVersion3LoneOneOfValue") - proto.RegisterType((*TestVersion3LoneNesting)(nil), "testdata.TestVersion3LoneNesting") - proto.RegisterType((*TestVersion3LoneNesting_Inner1)(nil), "testdata.TestVersion3LoneNesting.Inner1") - proto.RegisterType((*TestVersion3LoneNesting_Inner1_InnerInner)(nil), "testdata.TestVersion3LoneNesting.Inner1.InnerInner") - proto.RegisterType((*TestVersion3LoneNesting_Inner2)(nil), "testdata.TestVersion3LoneNesting.Inner2") - proto.RegisterType((*TestVersion3LoneNesting_Inner2_InnerInner)(nil), "testdata.TestVersion3LoneNesting.Inner2.InnerInner") - proto.RegisterType((*TestVersion4LoneNesting)(nil), "testdata.TestVersion4LoneNesting") - proto.RegisterType((*TestVersion4LoneNesting_Inner1)(nil), "testdata.TestVersion4LoneNesting.Inner1") - proto.RegisterType((*TestVersion4LoneNesting_Inner1_InnerInner)(nil), "testdata.TestVersion4LoneNesting.Inner1.InnerInner") - proto.RegisterType((*TestVersion4LoneNesting_Inner2)(nil), "testdata.TestVersion4LoneNesting.Inner2") - proto.RegisterType((*TestVersion4LoneNesting_Inner2_InnerInner)(nil), "testdata.TestVersion4LoneNesting.Inner2.InnerInner") - proto.RegisterType((*TestVersionFD1)(nil), "testdata.TestVersionFD1") - proto.RegisterType((*TestVersionFD1WithExtraAny)(nil), "testdata.TestVersionFD1WithExtraAny") - proto.RegisterType((*AnyWithExtra)(nil), "testdata.AnyWithExtra") - proto.RegisterType((*TestUpdatedTxRaw)(nil), "testdata.TestUpdatedTxRaw") - proto.RegisterType((*TestUpdatedTxBody)(nil), "testdata.TestUpdatedTxBody") - proto.RegisterType((*TestUpdatedAuthInfo)(nil), "testdata.TestUpdatedAuthInfo") - proto.RegisterType((*TestRepeatedUints)(nil), "testdata.TestRepeatedUints") -} - -func init() { proto.RegisterFile("unknonwnproto.proto", fileDescriptor_448ea787339d1228) } - -var fileDescriptor_448ea787339d1228 = []byte{ - // 1644 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x70, 0x49, 0x89, 0x7c, 0xa2, 0x69, 0x66, 0x6c, 0xb4, 0x1b, 0x3a, 0x66, 0x98, 0x85, - 0xeb, 0xb0, 0x41, 0x43, 0x9a, 0x4b, 0x06, 0x28, 0x72, 0x32, 0xe9, 0x58, 0x95, 0x01, 0x57, 0x2e, - 0xa6, 0x4e, 0x5a, 0xf8, 0x42, 0x2c, 0xb9, 0x43, 0x72, 0x21, 0x72, 0x46, 0xdd, 0x99, 0xb5, 0xc8, - 0x5b, 0xd1, 0x1e, 0x7a, 0xcd, 0xa5, 0x28, 0xd0, 0x6f, 0xd0, 0x53, 0x91, 0x6f, 0xd0, 0xa3, 0x2f, - 0x05, 0x7c, 0x29, 0x50, 0xa0, 0x40, 0x50, 0xd8, 0xd7, 0x7e, 0x83, 0xa2, 0x48, 0x31, 0xb3, 0x7f, - 0xb8, 0x94, 0x44, 0x85, 0x52, 0xda, 0x18, 0x02, 0x72, 0x11, 0x67, 0xde, 0xfe, 0xe6, 0xcd, 0x7b, - 0xbf, 0xf7, 0x67, 0x77, 0x46, 0x70, 0x23, 0x60, 0x87, 0x8c, 0xb3, 0x63, 0x76, 0xe4, 0x73, 0xc9, - 0x1b, 0xfa, 0x2f, 0xce, 0x4b, 0x2a, 0xa4, 0xeb, 0x48, 0xa7, 0x72, 0x73, 0xcc, 0xc7, 0x5c, 0x0b, - 0x9b, 0x6a, 0x14, 0x3e, 0xaf, 0xbc, 0x3d, 0xe6, 0x7c, 0x3c, 0xa5, 0x4d, 0x3d, 0x1b, 0x04, 0xa3, - 0xa6, 0xc3, 0x16, 0xd1, 0xa3, 0xca, 0x90, 0x8b, 0x19, 0x17, 0x4d, 0x39, 0x6f, 0x3e, 0x6f, 0x0d, - 0xa8, 0x74, 0x5a, 0x4d, 0x39, 0x0f, 0x9f, 0x59, 0x12, 0x0a, 0x0f, 0x02, 0x21, 0xf9, 0x8c, 0xfa, - 0x2d, 0x5c, 0x82, 0x8c, 0xe7, 0x9a, 0xa8, 0x86, 0xea, 0x39, 0x92, 0xf1, 0x5c, 0x8c, 0x21, 0xcb, - 0x9c, 0x19, 0x35, 0x33, 0x35, 0x54, 0x2f, 0x10, 0x3d, 0xc6, 0x3f, 0x84, 0xb2, 0x08, 0x06, 0x62, - 0xe8, 0x7b, 0x47, 0xd2, 0xe3, 0xac, 0x3f, 0xa2, 0xd4, 0x34, 0x6a, 0xa8, 0x9e, 0x21, 0xd7, 0xd3, - 0xf2, 0x3d, 0x4a, 0xb1, 0x09, 0x3b, 0x47, 0xce, 0x62, 0x46, 0x99, 0x34, 0x77, 0xb4, 0x86, 0x78, - 0x6a, 0x7d, 0x91, 0x59, 0x6e, 0x6b, 0x9f, 0xda, 0xb6, 0x02, 0x79, 0x8f, 0xb9, 0x81, 0x90, 0xfe, - 0x42, 0x6f, 0x9d, 0x23, 0xc9, 0x3c, 0x31, 0xc9, 0x48, 0x99, 0x74, 0x13, 0x72, 0x23, 0x7a, 0x4c, - 0x7d, 0x33, 0xab, 0xed, 0x08, 0x27, 0xf8, 0x16, 0xe4, 0x7d, 0x2a, 0xa8, 0xff, 0x9c, 0xba, 0xe6, - 0x1f, 0xf2, 0x35, 0x54, 0x37, 0x48, 0x22, 0xc0, 0x3f, 0x82, 0xec, 0xd0, 0x93, 0x0b, 0x73, 0xbb, - 0x86, 0xea, 0x25, 0xdb, 0x6c, 0xc4, 0xe4, 0x36, 0x12, 0xab, 0x1a, 0x0f, 0x3c, 0xb9, 0x20, 0x1a, - 0x85, 0x3f, 0x86, 0x6b, 0x33, 0x4f, 0x0c, 0xe9, 0x74, 0xea, 0x30, 0xca, 0x03, 0x61, 0x42, 0x0d, - 0xd5, 0x77, 0xed, 0x9b, 0x8d, 0x90, 0xf3, 0x46, 0xcc, 0x79, 0xa3, 0xcb, 0x16, 0x64, 0x15, 0x6a, - 0xfd, 0x04, 0xb2, 0x4a, 0x13, 0xce, 0x43, 0xf6, 0xb1, 0xc3, 0x45, 0x79, 0x0b, 0x97, 0x00, 0x1e, - 0x73, 0xd1, 0x65, 0x63, 0x3a, 0xa5, 0xa2, 0x8c, 0x70, 0x11, 0xf2, 0x3f, 0x73, 0xa6, 0xbc, 0x3b, - 0x95, 0xbc, 0x9c, 0xc1, 0x00, 0xdb, 0x3f, 0xe5, 0x62, 0xc8, 0x8f, 0xcb, 0x06, 0xde, 0x85, 0x9d, - 0x03, 0xc7, 0xf3, 0xf9, 0xc0, 0x2b, 0x67, 0xad, 0x06, 0xe4, 0x0f, 0xa8, 0x90, 0xd4, 0xed, 0x74, - 0x37, 0x09, 0x94, 0xf5, 0x37, 0x14, 0x2f, 0x68, 0x6f, 0xb4, 0x00, 0x5b, 0x90, 0x71, 0x3a, 0x66, - 0xb6, 0x66, 0xd4, 0x77, 0x6d, 0xbc, 0x64, 0x24, 0xde, 0x94, 0x64, 0x9c, 0x0e, 0x6e, 0x43, 0xce, - 0x63, 0x2e, 0x9d, 0x9b, 0x39, 0x0d, 0xbb, 0x7d, 0x12, 0xd6, 0xee, 0x36, 0x1e, 0xa9, 0xe7, 0x0f, - 0x99, 0xf4, 0x17, 0x24, 0xc4, 0x56, 0x1e, 0x03, 0x2c, 0x85, 0xb8, 0x0c, 0xc6, 0x21, 0x5d, 0x68, - 0x5b, 0x0c, 0xa2, 0x86, 0xb8, 0x0e, 0xb9, 0xe7, 0xce, 0x34, 0x08, 0xad, 0x39, 0x7b, 0xef, 0x10, - 0xf0, 0x71, 0xe6, 0xc7, 0xc8, 0x7a, 0x16, 0xbb, 0x65, 0x6f, 0xe6, 0xd6, 0x07, 0xb0, 0xcd, 0x34, - 0x5e, 0xe7, 0xcc, 0x19, 0xea, 0xdb, 0x5d, 0x12, 0x21, 0xac, 0xbd, 0x58, 0x77, 0xeb, 0xb4, 0xee, - 0xa5, 0x9e, 0x35, 0x66, 0xda, 0x4b, 0x3d, 0xf7, 0x93, 0x58, 0xf5, 0x4e, 0xe9, 0x29, 0x83, 0xe1, - 0x8c, 0x69, 0x94, 0xd8, 0x6a, 0x78, 0x56, 0x4e, 0x5b, 0x6e, 0x12, 0xbc, 0x4b, 0x6a, 0x50, 0xe1, - 0x1c, 0xac, 0x0f, 0x67, 0x8f, 0x64, 0x06, 0x1d, 0x8b, 0x25, 0x5c, 0x9e, 0xb9, 0x8b, 0xaa, 0x6d, - 0xb5, 0x0b, 0x22, 0x6a, 0xb8, 0x01, 0x93, 0xbd, 0x98, 0x01, 0x55, 0x93, 0x3e, 0x0f, 0x24, 0xd5, - 0x35, 0x59, 0x20, 0xe1, 0xc4, 0xfa, 0x65, 0xc2, 0x6f, 0xef, 0x12, 0xfc, 0x2e, 0xb5, 0x47, 0x0c, - 0x18, 0x09, 0x03, 0xd6, 0x6f, 0x52, 0x1d, 0xa5, 0xbd, 0x51, 0x5e, 0x94, 0x20, 0x23, 0x46, 0x51, - 0xeb, 0xca, 0x88, 0x11, 0x7e, 0x07, 0x0a, 0x22, 0xf0, 0x87, 0x13, 0xc7, 0x1f, 0xd3, 0xa8, 0x93, - 0x2c, 0x05, 0xb8, 0x06, 0xbb, 0x2e, 0x15, 0xd2, 0x63, 0x8e, 0xea, 0x6e, 0x66, 0x4e, 0x2b, 0x4a, - 0x8b, 0xf0, 0x5d, 0x28, 0x0d, 0x7d, 0xea, 0x7a, 0xb2, 0x3f, 0x74, 0x7c, 0xb7, 0xcf, 0x78, 0xd8, - 0xf4, 0xf6, 0xb7, 0x48, 0x31, 0x94, 0x3f, 0x70, 0x7c, 0xf7, 0x80, 0xe3, 0xdb, 0x50, 0x18, 0x4e, - 0xe8, 0xaf, 0x02, 0xaa, 0x20, 0xf9, 0x08, 0x92, 0x0f, 0x45, 0x07, 0x1c, 0x37, 0x21, 0xcf, 0x7d, - 0x6f, 0xec, 0x31, 0x67, 0x6a, 0x16, 0x34, 0x11, 0x37, 0x4e, 0x77, 0xa7, 0x16, 0x49, 0x40, 0xbd, - 0x42, 0xd2, 0x65, 0xad, 0x7f, 0x65, 0xa0, 0xf8, 0x94, 0x0a, 0xf9, 0x19, 0xf5, 0x85, 0xc7, 0x59, - 0x0b, 0x17, 0x01, 0xcd, 0xa3, 0x4a, 0x43, 0x73, 0x7c, 0x07, 0x90, 0x13, 0x91, 0xfb, 0xbd, 0xa5, - 0xce, 0xf4, 0x02, 0x82, 0x1c, 0x85, 0x1a, 0x44, 0x01, 0x5e, 0x8b, 0x1a, 0x28, 0xd4, 0x30, 0x4a, - 0xae, 0xb5, 0xa8, 0x21, 0xfe, 0x00, 0x90, 0x1b, 0xb5, 0x8a, 0x35, 0xa8, 0x5e, 0xf6, 0xc5, 0x97, - 0xef, 0x6e, 0x11, 0xe4, 0xe2, 0x12, 0x20, 0xaa, 0xfb, 0x71, 0x6e, 0x7f, 0x8b, 0x20, 0x8a, 0xef, - 0x02, 0x1a, 0x69, 0x0a, 0xd7, 0xae, 0x55, 0xb8, 0x11, 0xb6, 0x00, 0x8d, 0x35, 0x8f, 0xeb, 0x1a, - 0x32, 0x1a, 0x2b, 0x6b, 0x27, 0x66, 0xe1, 0x7c, 0x6b, 0x27, 0xf8, 0x7d, 0x40, 0x87, 0x66, 0x71, - 0x2d, 0xe7, 0xbd, 0xec, 0xcb, 0x2f, 0xdf, 0x45, 0x04, 0x1d, 0xf6, 0x72, 0x60, 0x88, 0x60, 0x66, - 0xfd, 0xd6, 0x58, 0xa1, 0xdb, 0xbe, 0x28, 0xdd, 0xf6, 0x46, 0x74, 0xdb, 0x1b, 0xd1, 0x6d, 0x2b, - 0xba, 0xef, 0x7c, 0x1d, 0xdd, 0xf6, 0xa5, 0x88, 0xb6, 0xdf, 0x14, 0xd1, 0xf8, 0x16, 0x14, 0x18, - 0x3d, 0xee, 0x8f, 0x3c, 0x3a, 0x75, 0xcd, 0xb7, 0x6b, 0xa8, 0x9e, 0x25, 0x79, 0x46, 0x8f, 0xf7, - 0xd4, 0x3c, 0x8e, 0xc2, 0xef, 0x57, 0xa3, 0xd0, 0xbe, 0x68, 0x14, 0xda, 0x1b, 0x45, 0xa1, 0xbd, - 0x51, 0x14, 0xda, 0x1b, 0x45, 0xa1, 0x7d, 0xa9, 0x28, 0xb4, 0xdf, 0x58, 0x14, 0x3e, 0x04, 0xcc, - 0x38, 0xeb, 0x0f, 0x7d, 0x4f, 0x7a, 0x43, 0x67, 0x1a, 0x85, 0xe3, 0x77, 0xba, 0x77, 0x91, 0x32, - 0xe3, 0xec, 0x41, 0xf4, 0x64, 0x25, 0x2e, 0xff, 0xce, 0x40, 0x25, 0x6d, 0xfe, 0x63, 0xce, 0xe8, - 0x13, 0x46, 0x9f, 0x8c, 0x3e, 0x53, 0xaf, 0xf2, 0x2b, 0x1a, 0xa5, 0x2b, 0xc3, 0xfe, 0x7f, 0xb6, - 0xe1, 0xfb, 0x27, 0xd9, 0x3f, 0xd0, 0x6f, 0xab, 0xf1, 0x15, 0xa1, 0xbe, 0xb5, 0x2c, 0x88, 0xf7, - 0xce, 0x46, 0xa5, 0x7c, 0xba, 0x22, 0xb5, 0x81, 0xef, 0xc3, 0xb6, 0xc7, 0x18, 0xf5, 0x5b, 0x66, - 0x49, 0x2b, 0xaf, 0x7f, 0xad, 0x67, 0x8d, 0x47, 0x1a, 0x4f, 0xa2, 0x75, 0x89, 0x06, 0xdb, 0xbc, - 0x7e, 0x21, 0x0d, 0x76, 0xa4, 0xc1, 0xae, 0xfc, 0x09, 0xc1, 0x76, 0xa8, 0x34, 0xf5, 0x9d, 0x64, - 0xac, 0xfd, 0x4e, 0x7a, 0xa4, 0x3e, 0xf9, 0x19, 0xf5, 0xa3, 0xe8, 0xb7, 0x37, 0xb5, 0x38, 0xfc, - 0xd1, 0x7f, 0x48, 0xa8, 0xa1, 0x72, 0x4f, 0x1d, 0x04, 0x62, 0x61, 0x6a, 0xf3, 0x42, 0xbc, 0xb9, - 0x3e, 0x93, 0x45, 0x9b, 0xab, 0x71, 0xe5, 0xcf, 0xb1, 0xad, 0xf6, 0x29, 0xb8, 0x09, 0x3b, 0x43, - 0x1e, 0xb0, 0xf8, 0x90, 0x58, 0x20, 0xf1, 0xf4, 0xb2, 0x16, 0xdb, 0xff, 0x0b, 0x8b, 0xe3, 0xfa, - 0xfb, 0x6a, 0xb5, 0xfe, 0x3a, 0xdf, 0xd5, 0xdf, 0x15, 0xaa, 0xbf, 0xce, 0x37, 0xae, 0xbf, 0xce, - 0xb7, 0x5c, 0x7f, 0x9d, 0x6f, 0x54, 0x7f, 0xc6, 0xda, 0xfa, 0xfb, 0xe2, 0xff, 0x56, 0x7f, 0x9d, - 0x8d, 0xea, 0xcf, 0x3e, 0xb7, 0xfe, 0x6e, 0xa6, 0x2f, 0x0e, 0x8c, 0xe8, 0x92, 0x20, 0xae, 0xc0, - 0xbf, 0x22, 0x28, 0xa5, 0xf6, 0xdb, 0xfb, 0xe4, 0x72, 0xc7, 0xa1, 0x37, 0x7e, 0x2c, 0x89, 0xfd, - 0xf9, 0x07, 0x5a, 0xf9, 0x9e, 0xda, 0xfb, 0xa4, 0xf5, 0x0b, 0x4f, 0x4e, 0x1e, 0xce, 0xa5, 0xef, - 0x74, 0xd9, 0xe2, 0x5b, 0xf5, 0xed, 0xce, 0xd2, 0xb7, 0x14, 0xae, 0xcb, 0x16, 0x89, 0x45, 0x17, - 0xf6, 0xee, 0x29, 0x14, 0xd3, 0xeb, 0x71, 0x5d, 0x39, 0x80, 0xd6, 0xd3, 0x17, 0x77, 0x00, 0x47, - 0x39, 0x1e, 0x76, 0x46, 0x43, 0x75, 0xc0, 0x62, 0xd8, 0x01, 0xf5, 0x6c, 0x68, 0xfd, 0x05, 0x41, - 0x59, 0x6d, 0xf8, 0xe9, 0x91, 0xeb, 0x48, 0xea, 0x3e, 0x9d, 0x13, 0xe7, 0x18, 0xdf, 0x06, 0x18, - 0x70, 0x77, 0xd1, 0x1f, 0x2c, 0x24, 0x15, 0x7a, 0x8f, 0x22, 0x29, 0x28, 0x49, 0x4f, 0x09, 0xf0, - 0x5d, 0xb8, 0xee, 0x04, 0x72, 0xd2, 0xf7, 0xd8, 0x88, 0x47, 0x98, 0x8c, 0xc6, 0x5c, 0x53, 0xe2, - 0x47, 0x6c, 0xc4, 0x43, 0x5c, 0x15, 0x40, 0x78, 0x63, 0xe6, 0xc8, 0xc0, 0xa7, 0xc2, 0x34, 0x6a, - 0x46, 0xbd, 0x48, 0x52, 0x12, 0x5c, 0x85, 0xdd, 0xe4, 0xec, 0xd2, 0xff, 0x48, 0xdf, 0x18, 0x14, - 0x49, 0x21, 0x3e, 0xbd, 0x7c, 0x84, 0x7f, 0x00, 0xa5, 0xe5, 0xf3, 0xd6, 0x3d, 0xbb, 0x63, 0xfe, - 0x3a, 0xaf, 0x31, 0xc5, 0x18, 0xa3, 0x84, 0xd6, 0xe7, 0x06, 0xbc, 0xb5, 0xe2, 0x42, 0x8f, 0xbb, - 0x0b, 0x7c, 0x0f, 0xf2, 0x33, 0x2a, 0x84, 0x33, 0xd6, 0x1e, 0x18, 0x6b, 0x93, 0x2c, 0x41, 0xa9, - 0xea, 0x9e, 0xd1, 0x19, 0x8f, 0xab, 0x5b, 0x8d, 0x95, 0x09, 0xd2, 0x9b, 0x51, 0x1e, 0xc8, 0xfe, - 0x84, 0x7a, 0xe3, 0x89, 0x8c, 0x78, 0xbc, 0x16, 0x49, 0xf7, 0xb5, 0x10, 0xdf, 0x81, 0x92, 0xe0, - 0x33, 0xda, 0x5f, 0x1e, 0xc5, 0xb2, 0xfa, 0x28, 0x56, 0x54, 0xd2, 0x83, 0xc8, 0x58, 0xbc, 0x0f, - 0xef, 0xad, 0xa2, 0xfa, 0x67, 0x34, 0xe6, 0x3f, 0x86, 0x8d, 0xf9, 0x9d, 0xf4, 0xca, 0x83, 0x93, - 0x4d, 0xba, 0x07, 0x6f, 0xd1, 0xb9, 0xa4, 0x4c, 0xe5, 0x48, 0x9f, 0xeb, 0xeb, 0x64, 0x61, 0x7e, - 0xb5, 0x73, 0x8e, 0x9b, 0xe5, 0x04, 0xff, 0x24, 0x84, 0xe3, 0x67, 0x50, 0x5d, 0xd9, 0xfe, 0x0c, - 0x85, 0xd7, 0xcf, 0x51, 0x78, 0x2b, 0xf5, 0xe6, 0x78, 0x78, 0x42, 0xb7, 0xf5, 0x02, 0xc1, 0x8d, - 0x54, 0x48, 0xba, 0x51, 0x5a, 0xe0, 0xfb, 0x50, 0x54, 0xf1, 0xa7, 0xbe, 0xce, 0x9d, 0x38, 0x30, - 0xb7, 0x1b, 0xe1, 0xf5, 0x7b, 0x43, 0xce, 0x1b, 0xd1, 0xf5, 0x7b, 0xe3, 0xe7, 0x1a, 0xa6, 0x16, - 0x91, 0x5d, 0x91, 0x8c, 0x05, 0xae, 0x2f, 0xef, 0xdc, 0x54, 0xd1, 0x9c, 0x5e, 0xb8, 0x47, 0x69, - 0x78, 0x17, 0xb7, 0x92, 0x5d, 0x6d, 0x1d, 0xb7, 0x54, 0x76, 0xb5, 0x37, 0xcd, 0xae, 0xf7, 0xc3, - 0xe4, 0x22, 0xf4, 0x88, 0x2a, 0x57, 0x3e, 0xf5, 0x98, 0xd4, 0xa9, 0xc2, 0x82, 0x59, 0x68, 0x7f, - 0x96, 0xe8, 0x71, 0x6f, 0xff, 0xc5, 0xab, 0x2a, 0x7a, 0xf9, 0xaa, 0x8a, 0xfe, 0xf9, 0xaa, 0x8a, - 0x3e, 0x7f, 0x5d, 0xdd, 0x7a, 0xf9, 0xba, 0xba, 0xf5, 0xf7, 0xd7, 0xd5, 0xad, 0x67, 0x8d, 0xb1, - 0x27, 0x27, 0xc1, 0xa0, 0x31, 0xe4, 0xb3, 0x66, 0xf4, 0x8f, 0x86, 0xf0, 0xe7, 0x43, 0xe1, 0x1e, - 0x36, 0x55, 0xdd, 0x07, 0xd2, 0x9b, 0x36, 0xe3, 0x06, 0x30, 0xd8, 0xd6, 0x44, 0xb7, 0xff, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0xa6, 0x69, 0x10, 0x33, 0xe6, 0x18, 0x00, 0x00, + proto.RegisterEnum("testpb.Customer2_City", Customer2_City_name, Customer2_City_value) + proto.RegisterType((*Customer1)(nil), "testpb.Customer1") + proto.RegisterType((*Customer2)(nil), "testpb.Customer2") + proto.RegisterType((*Nested4A)(nil), "testpb.Nested4A") + proto.RegisterType((*Nested3A)(nil), "testpb.Nested3A") + proto.RegisterMapType((map[int64]*Nested4A)(nil), "testpb.Nested3A.IndexEntry") + proto.RegisterType((*Nested2A)(nil), "testpb.Nested2A") + proto.RegisterType((*Nested1A)(nil), "testpb.Nested1A") + proto.RegisterType((*Nested4B)(nil), "testpb.Nested4B") + proto.RegisterType((*Nested3B)(nil), "testpb.Nested3B") + proto.RegisterType((*Nested2B)(nil), "testpb.Nested2B") + proto.RegisterType((*Nested1B)(nil), "testpb.Nested1B") + proto.RegisterType((*Customer3)(nil), "testpb.Customer3") + proto.RegisterType((*TestVersion1)(nil), "testpb.TestVersion1") + proto.RegisterType((*TestVersion2)(nil), "testpb.TestVersion2") + proto.RegisterType((*TestVersion3)(nil), "testpb.TestVersion3") + proto.RegisterType((*TestVersion3LoneOneOfValue)(nil), "testpb.TestVersion3LoneOneOfValue") + proto.RegisterType((*TestVersion3LoneNesting)(nil), "testpb.TestVersion3LoneNesting") + proto.RegisterType((*TestVersion3LoneNesting_Inner1)(nil), "testpb.TestVersion3LoneNesting.Inner1") + proto.RegisterType((*TestVersion3LoneNesting_Inner1_InnerInner)(nil), "testpb.TestVersion3LoneNesting.Inner1.InnerInner") + proto.RegisterType((*TestVersion3LoneNesting_Inner2)(nil), "testpb.TestVersion3LoneNesting.Inner2") + proto.RegisterType((*TestVersion3LoneNesting_Inner2_InnerInner)(nil), "testpb.TestVersion3LoneNesting.Inner2.InnerInner") + proto.RegisterType((*TestVersion4LoneNesting)(nil), "testpb.TestVersion4LoneNesting") + proto.RegisterType((*TestVersion4LoneNesting_Inner1)(nil), "testpb.TestVersion4LoneNesting.Inner1") + proto.RegisterType((*TestVersion4LoneNesting_Inner1_InnerInner)(nil), "testpb.TestVersion4LoneNesting.Inner1.InnerInner") + proto.RegisterType((*TestVersion4LoneNesting_Inner2)(nil), "testpb.TestVersion4LoneNesting.Inner2") + proto.RegisterType((*TestVersion4LoneNesting_Inner2_InnerInner)(nil), "testpb.TestVersion4LoneNesting.Inner2.InnerInner") + proto.RegisterType((*TestVersionFD1)(nil), "testpb.TestVersionFD1") + proto.RegisterType((*TestVersionFD1WithExtraAny)(nil), "testpb.TestVersionFD1WithExtraAny") + proto.RegisterType((*AnyWithExtra)(nil), "testpb.AnyWithExtra") + proto.RegisterType((*TestUpdatedTxRaw)(nil), "testpb.TestUpdatedTxRaw") + proto.RegisterType((*TestUpdatedTxBody)(nil), "testpb.TestUpdatedTxBody") + proto.RegisterType((*TestUpdatedAuthInfo)(nil), "testpb.TestUpdatedAuthInfo") + proto.RegisterType((*TestRepeatedUints)(nil), "testpb.TestRepeatedUints") +} + +func init() { proto.RegisterFile("testpb/unknonwnproto.proto", fileDescriptor_fe4560133be9209a) } + +var fileDescriptor_fe4560133be9209a = []byte{ + // 1641 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4f, 0x8f, 0x1a, 0xc9, + 0x15, 0x9f, 0xa2, 0x81, 0x81, 0x37, 0x18, 0xe3, 0xca, 0x68, 0xd3, 0x8b, 0xd7, 0x98, 0xb4, 0x76, + 0x1d, 0x12, 0xc9, 0x60, 0x1a, 0x56, 0x8a, 0xf6, 0x10, 0x2d, 0xd8, 0x9e, 0x1d, 0x47, 0xce, 0x38, + 0xea, 0x78, 0x9d, 0x68, 0x2f, 0xa8, 0xe9, 0x2e, 0xa0, 0x35, 0x50, 0x35, 0xe9, 0xaa, 0xf6, 0xc0, + 0x6d, 0x6f, 0x7b, 0xdd, 0x5b, 0xa4, 0x7c, 0x81, 0x9c, 0xa2, 0xfd, 0x0a, 0xb9, 0xc5, 0xb7, 0x58, + 0xca, 0x25, 0x27, 0x2b, 0xb2, 0x0f, 0x51, 0x4e, 0x39, 0xe5, 0x9c, 0xa8, 0xaa, 0xff, 0xd0, 0x78, + 0x60, 0x96, 0x99, 0x4d, 0xe2, 0xb5, 0xb4, 0x17, 0xa8, 0x7a, 0xf5, 0xab, 0x57, 0xef, 0xfd, 0xde, + 0x9f, 0xee, 0x6a, 0xa8, 0x0a, 0xc2, 0xc5, 0xc9, 0xb0, 0x15, 0xd0, 0x63, 0xca, 0xe8, 0x29, 0x3d, + 0xf1, 0x99, 0x60, 0x4d, 0xf5, 0x8b, 0xf3, 0xe1, 0x5a, 0x75, 0x7f, 0xcc, 0xc6, 0x4c, 0x89, 0x5a, + 0x72, 0x14, 0xae, 0x56, 0xdf, 0x1d, 0x33, 0x36, 0x9e, 0x92, 0x96, 0x9a, 0x0d, 0x83, 0x51, 0xcb, + 0xa6, 0x8b, 0x68, 0xa9, 0xea, 0x30, 0x3e, 0x63, 0xbc, 0x25, 0xe6, 0xad, 0xa7, 0xed, 0x21, 0x11, + 0x76, 0xbb, 0x25, 0xe6, 0xe1, 0x9a, 0x21, 0xa0, 0x78, 0x37, 0xe0, 0x82, 0xcd, 0x88, 0xdf, 0xc6, + 0x65, 0xc8, 0x78, 0xae, 0x8e, 0xea, 0xa8, 0x91, 0xb3, 0x32, 0x9e, 0x8b, 0x31, 0x64, 0xa9, 0x3d, + 0x23, 0x7a, 0xa6, 0x8e, 0x1a, 0x45, 0x4b, 0x8d, 0xf1, 0x8f, 0xa0, 0xc2, 0x83, 0x21, 0x77, 0x7c, + 0xef, 0x44, 0x78, 0x8c, 0x0e, 0x46, 0x84, 0xe8, 0x5a, 0x1d, 0x35, 0x32, 0xd6, 0xd5, 0xb4, 0xfc, + 0x80, 0x10, 0xac, 0xc3, 0xee, 0x89, 0xbd, 0x98, 0x11, 0x2a, 0xf4, 0x5d, 0xa5, 0x21, 0x9e, 0x1a, + 0x5f, 0x65, 0x96, 0xc7, 0x9a, 0x67, 0x8e, 0xad, 0x42, 0xc1, 0xa3, 0x6e, 0xc0, 0x85, 0xbf, 0x50, + 0x47, 0xe7, 0xac, 0x64, 0x9e, 0x98, 0xa4, 0xa5, 0x4c, 0xda, 0x87, 0xdc, 0x88, 0x9c, 0x12, 0x5f, + 0xcf, 0x2a, 0x3b, 0xc2, 0x09, 0xbe, 0x0e, 0x05, 0x9f, 0x70, 0xe2, 0x3f, 0x25, 0xae, 0xfe, 0xdb, + 0x42, 0x1d, 0x35, 0x34, 0x2b, 0x11, 0xe0, 0x1f, 0x43, 0xd6, 0xf1, 0xc4, 0x42, 0xcf, 0xd7, 0x51, + 0xa3, 0x6c, 0xbe, 0xd3, 0x0c, 0xa9, 0x6d, 0x26, 0x36, 0x35, 0xef, 0x7a, 0x62, 0x61, 0x29, 0x0c, + 0xfe, 0x08, 0xae, 0xcc, 0x3c, 0xee, 0x90, 0xe9, 0xd4, 0xa6, 0x84, 0x05, 0x5c, 0x87, 0x3a, 0x6a, + 0xec, 0x99, 0xfb, 0xcd, 0x90, 0xf1, 0x66, 0xcc, 0x78, 0xb3, 0x47, 0x17, 0xd6, 0x2a, 0xd4, 0xf8, + 0x04, 0xb2, 0x52, 0x13, 0x2e, 0x40, 0xf6, 0xa1, 0xcd, 0x78, 0x65, 0x07, 0x97, 0x01, 0x1e, 0x32, + 0xde, 0xa3, 0x63, 0x32, 0x25, 0xbc, 0x82, 0x70, 0x09, 0x0a, 0xbf, 0xb0, 0xa7, 0xac, 0x37, 0x15, + 0xac, 0x92, 0xc1, 0x00, 0xf9, 0x9f, 0x33, 0xee, 0xb0, 0xd3, 0x8a, 0x86, 0xf7, 0x60, 0xf7, 0xc8, + 0xf6, 0x7c, 0x36, 0xf4, 0x2a, 0x59, 0xa3, 0x09, 0x85, 0x23, 0xc2, 0x05, 0x71, 0xbb, 0xbd, 0x6d, + 0xc2, 0x64, 0xfc, 0x19, 0xc5, 0x1b, 0x3a, 0x5b, 0x6d, 0xc0, 0x75, 0xc8, 0xd8, 0x5d, 0x3d, 0x5b, + 0xd7, 0x1a, 0x7b, 0x66, 0x25, 0xe6, 0x23, 0x3e, 0xd2, 0xca, 0xd8, 0x5d, 0xdc, 0x86, 0x9c, 0x47, + 0x5d, 0x32, 0xd7, 0x73, 0x0a, 0x74, 0x7d, 0x15, 0xd4, 0xe9, 0x35, 0x1f, 0xc8, 0xd5, 0xfb, 0x54, + 0xf8, 0x0b, 0x2b, 0x44, 0x56, 0x7f, 0x06, 0xb0, 0x14, 0xe2, 0x0a, 0x68, 0xc7, 0x64, 0xa1, 0xec, + 0xd0, 0x2c, 0x39, 0xc4, 0xb7, 0x20, 0xf7, 0xd4, 0x9e, 0x06, 0xa1, 0x25, 0xeb, 0xce, 0x0d, 0x97, + 0x3f, 0xca, 0xfc, 0x04, 0x19, 0xbf, 0x8e, 0x1d, 0x32, 0xb7, 0x73, 0xa8, 0x01, 0x79, 0xaa, 0xf0, + 0x2a, 0x57, 0xce, 0x28, 0xef, 0xf4, 0xac, 0x68, 0xdd, 0xb8, 0x17, 0x6b, 0x6e, 0x9f, 0xd5, 0xbc, + 0xd4, 0xb2, 0xd6, 0x44, 0x73, 0xa9, 0xe5, 0xe3, 0x24, 0x42, 0xfd, 0x33, 0x5a, 0x2a, 0xa0, 0xd9, + 0x63, 0x12, 0x25, 0xb3, 0x1c, 0xae, 0xcb, 0x63, 0x63, 0x98, 0x84, 0xec, 0x92, 0x1a, 0x64, 0x10, + 0x87, 0x9b, 0x82, 0xd8, 0xb7, 0x32, 0xc3, 0xae, 0x31, 0x4d, 0x58, 0x5c, 0x7b, 0x86, 0xac, 0x66, + 0x79, 0x06, 0xb2, 0xe4, 0xf0, 0x6b, 0x39, 0xec, 0xc7, 0xde, 0xcb, 0x1a, 0xf4, 0x59, 0x20, 0x88, + 0xaa, 0xc1, 0xa2, 0x15, 0x4e, 0x8c, 0x27, 0x09, 0xb3, 0xfd, 0x0b, 0x33, 0xbb, 0xd4, 0x1d, 0xf9, + 0xae, 0x25, 0xbe, 0x1b, 0x9f, 0xa7, 0xfa, 0x47, 0x67, 0xab, 0x6c, 0x28, 0x43, 0x86, 0x8f, 0xa2, + 0x46, 0x95, 0xe1, 0x23, 0xfc, 0x1e, 0x14, 0x79, 0xe0, 0x3b, 0x13, 0xdb, 0x1f, 0x93, 0xa8, 0x6f, + 0x2c, 0x05, 0xb8, 0x0e, 0x7b, 0x2e, 0xe1, 0xc2, 0xa3, 0xb6, 0xec, 0x65, 0x7a, 0x4e, 0x29, 0x4a, + 0x8b, 0xf0, 0x2d, 0x28, 0x3b, 0x3e, 0x71, 0x3d, 0x31, 0x70, 0x6c, 0xdf, 0x1d, 0x50, 0x16, 0xb6, + 0xb8, 0xc3, 0x1d, 0xab, 0x14, 0xca, 0xef, 0xda, 0xbe, 0x7b, 0xc4, 0xf0, 0x0d, 0x28, 0x3a, 0x13, + 0xf2, 0x9b, 0x80, 0x48, 0x48, 0x21, 0x82, 0x14, 0x42, 0xd1, 0x11, 0xc3, 0xb7, 0xa1, 0xc0, 0x7c, + 0x6f, 0xec, 0x51, 0x7b, 0xaa, 0x17, 0x15, 0x0d, 0xd7, 0x5e, 0xef, 0x45, 0x6d, 0x2b, 0x81, 0xf4, + 0x8b, 0x49, 0x47, 0x35, 0x5e, 0x64, 0xa0, 0xf4, 0x98, 0x70, 0xf1, 0x84, 0xf8, 0xdc, 0x63, 0xb4, + 0x8d, 0x4b, 0x80, 0xe6, 0x51, 0x6d, 0xa1, 0x39, 0x36, 0x00, 0xd9, 0x11, 0xb1, 0xfb, 0xb1, 0xc6, + 0x34, 0xdc, 0x42, 0xb6, 0xc4, 0x0c, 0xa3, 0xc0, 0x6e, 0xc0, 0x0c, 0x25, 0xc6, 0x89, 0x12, 0x6a, + 0x03, 0xc6, 0xc1, 0x0d, 0x40, 0x6e, 0xd4, 0x14, 0xd6, 0x62, 0xfa, 0xd9, 0x67, 0x2f, 0x6e, 0xee, + 0x58, 0xc8, 0xc5, 0x65, 0x40, 0x44, 0xf5, 0xdc, 0xdc, 0xe1, 0x8e, 0x85, 0x08, 0x7e, 0x1f, 0xd0, + 0x48, 0x11, 0xb7, 0x61, 0xa7, 0x44, 0x8d, 0xa4, 0x0d, 0x63, 0xc5, 0xdd, 0xa6, 0xa6, 0x8b, 0xc6, + 0x12, 0x33, 0xd1, 0x8b, 0xe7, 0xd9, 0x39, 0xc1, 0x1f, 0x00, 0x3a, 0xd6, 0x4b, 0x1b, 0x58, 0xee, + 0x67, 0x9f, 0xbf, 0xb8, 0x89, 0x2c, 0x74, 0xdc, 0xcf, 0x81, 0xc6, 0x83, 0x99, 0xf1, 0xaf, 0x55, + 0x82, 0xcd, 0x8b, 0x11, 0x6c, 0x6e, 0x41, 0xb0, 0xb9, 0x05, 0xc1, 0xa6, 0x24, 0xd8, 0x38, 0x9f, + 0x60, 0xf3, 0x12, 0xd4, 0x9a, 0x6f, 0x82, 0x5a, 0x7c, 0x1d, 0x8a, 0x94, 0x9c, 0x0e, 0x46, 0x1e, + 0x99, 0xba, 0xfa, 0xbb, 0x75, 0xd4, 0xc8, 0x5a, 0x05, 0x4a, 0x4e, 0x0f, 0xe4, 0x3c, 0xe6, 0xfd, + 0x0b, 0x6d, 0x85, 0xf7, 0xce, 0xc5, 0x78, 0xef, 0x6c, 0xc1, 0x7b, 0x67, 0x0b, 0xde, 0x3b, 0x5b, + 0xf0, 0xde, 0xb9, 0x04, 0xef, 0x9d, 0x37, 0xc2, 0xfb, 0x6d, 0xc0, 0x94, 0xd1, 0x81, 0xe3, 0x7b, + 0xc2, 0x73, 0xec, 0x69, 0x14, 0x80, 0x2f, 0x54, 0x3f, 0xb2, 0x2a, 0x94, 0xd1, 0xbb, 0xd1, 0xca, + 0x4a, 0x24, 0xfe, 0x99, 0x81, 0x6a, 0xda, 0xf4, 0x87, 0x8c, 0x92, 0x47, 0x94, 0x3c, 0x1a, 0x3d, + 0x91, 0x0f, 0xe5, 0xb7, 0x2c, 0x2e, 0x6f, 0x05, 0xe3, 0x7f, 0xcf, 0xc3, 0xf7, 0x5f, 0x67, 0xfc, + 0x48, 0x3d, 0x75, 0xc6, 0xdf, 0x72, 0xba, 0x5b, 0xcb, 0xb4, 0xbf, 0xb9, 0x0e, 0x93, 0xf2, 0xe4, + 0x2d, 0xa8, 0x00, 0xfc, 0x53, 0xc8, 0x7b, 0x94, 0x12, 0xbf, 0xad, 0x97, 0x95, 0xea, 0x5b, 0x5f, + 0xe3, 0x53, 0xf3, 0x81, 0x42, 0x5b, 0xd1, 0xae, 0x64, 0xbf, 0xa9, 0x5f, 0xbd, 0xc0, 0x7e, 0x33, + 0xda, 0x6f, 0x56, 0x7f, 0x8f, 0x20, 0x1f, 0xaa, 0x4c, 0xbd, 0xdd, 0x68, 0x1b, 0xdf, 0x6e, 0x3e, + 0x91, 0xaf, 0xe6, 0x94, 0xf8, 0x51, 0xb4, 0xdb, 0xdb, 0x59, 0x1b, 0xfe, 0xa9, 0x1f, 0x2b, 0xdc, + 0x5f, 0xbd, 0x23, 0x5f, 0xd8, 0x63, 0x61, 0xea, 0xe8, 0x62, 0x7c, 0xb4, 0xba, 0x35, 0x45, 0x47, + 0xcb, 0x71, 0xf5, 0x0f, 0xb1, 0xa5, 0xe6, 0x19, 0xb8, 0x0e, 0xbb, 0x0e, 0x0b, 0x68, 0x7c, 0x8d, + 0x2b, 0x5a, 0xf1, 0xf4, 0x72, 0xf6, 0x9a, 0xff, 0x0d, 0x7b, 0xe3, 0x4a, 0xfb, 0xc7, 0x6a, 0xa5, + 0x75, 0xbf, 0xab, 0xb4, 0x6f, 0x71, 0xa5, 0x75, 0xbf, 0x61, 0xa5, 0x75, 0xff, 0xaf, 0x95, 0xd6, + 0xfd, 0x46, 0x95, 0xa6, 0x6d, 0xac, 0xb4, 0xaf, 0xfe, 0x47, 0x95, 0xd6, 0xdd, 0xaa, 0xd2, 0xcc, + 0x73, 0x2b, 0x6d, 0x3f, 0x7d, 0x91, 0xd7, 0xa2, 0x6b, 0x7b, 0x5c, 0x6b, 0x7f, 0x42, 0x50, 0x4e, + 0x9d, 0x77, 0x70, 0xef, 0x32, 0x97, 0x95, 0x37, 0x7a, 0x75, 0x88, 0x3d, 0xf9, 0x0b, 0x5a, 0x79, + 0x23, 0x3a, 0xb8, 0xd7, 0xfe, 0x95, 0x27, 0x26, 0xf7, 0xe7, 0xc2, 0xb7, 0x7b, 0x74, 0xf1, 0x66, + 0xbc, 0x8a, 0x50, 0x3d, 0xba, 0x48, 0x6c, 0xb9, 0xa0, 0x57, 0x8f, 0xa1, 0x94, 0xde, 0x2d, 0xef, + 0x73, 0xb6, 0x72, 0x63, 0x03, 0x69, 0x71, 0xad, 0xdb, 0xd2, 0xe1, 0xb0, 0xef, 0x69, 0xb2, 0xc3, + 0x95, 0xc2, 0x0e, 0xa7, 0x66, 0x8e, 0xf1, 0x47, 0x04, 0x15, 0x79, 0xe0, 0xa7, 0x27, 0xae, 0x2d, + 0x88, 0xfb, 0x78, 0x6e, 0xd9, 0xa7, 0xf8, 0x06, 0xc0, 0x90, 0xb9, 0x8b, 0xc1, 0x70, 0x21, 0x08, + 0x57, 0x67, 0x94, 0xac, 0xa2, 0x94, 0xf4, 0xa5, 0x00, 0xdf, 0x82, 0xab, 0x76, 0x20, 0x26, 0x03, + 0x8f, 0x8e, 0x58, 0x84, 0xc9, 0x28, 0xcc, 0x15, 0x29, 0x7e, 0x40, 0x47, 0x2c, 0xc4, 0xd5, 0x00, + 0xb8, 0x37, 0xa6, 0xb6, 0x08, 0x7c, 0xc2, 0x75, 0xad, 0xae, 0x35, 0x4a, 0x56, 0x4a, 0x82, 0x6b, + 0xb0, 0x97, 0xdc, 0x33, 0x06, 0x1f, 0xaa, 0xfb, 0x7b, 0xc9, 0x2a, 0xc6, 0x37, 0x8d, 0x0f, 0xf1, + 0x07, 0x50, 0x5e, 0xae, 0xb7, 0xef, 0x98, 0x5d, 0xfd, 0xf3, 0x82, 0xc2, 0x94, 0x62, 0x8c, 0x14, + 0x1a, 0x5f, 0x6a, 0x70, 0x6d, 0xc5, 0x85, 0x3e, 0x73, 0x17, 0xf8, 0x0e, 0x14, 0x66, 0x84, 0x73, + 0x7b, 0xac, 0x3c, 0xd0, 0x36, 0xa6, 0x56, 0x82, 0x92, 0xd5, 0x3c, 0x23, 0x33, 0x16, 0x57, 0xb3, + 0x1c, 0x4b, 0x13, 0x84, 0x37, 0x23, 0x2c, 0x10, 0x83, 0x09, 0xf1, 0xc6, 0x13, 0x11, 0xf1, 0x78, + 0x25, 0x92, 0x1e, 0x2a, 0x21, 0x7e, 0x1f, 0xca, 0x9c, 0xcd, 0xc8, 0x60, 0x79, 0x6d, 0xca, 0xaa, + 0x6b, 0x53, 0x49, 0x4a, 0x8f, 0x22, 0x63, 0xf1, 0x21, 0xfc, 0x60, 0x15, 0x35, 0x58, 0xd3, 0x82, + 0x7f, 0x17, 0xb6, 0xe0, 0xf7, 0xd2, 0x3b, 0x8f, 0x5e, 0x6f, 0xc7, 0x7d, 0xb8, 0x46, 0xe6, 0x82, + 0x50, 0x99, 0x23, 0x03, 0xa6, 0x3e, 0xe5, 0x72, 0xfd, 0xdf, 0xbb, 0xe7, 0xb8, 0x59, 0x49, 0xf0, + 0x8f, 0x42, 0x38, 0xfe, 0x0c, 0x6a, 0x2b, 0xc7, 0xaf, 0x51, 0x78, 0xf5, 0x1c, 0x85, 0xd7, 0x53, + 0xcf, 0x88, 0xfb, 0xaf, 0xe9, 0x36, 0x9e, 0x21, 0xf8, 0x5e, 0x2a, 0x24, 0xbd, 0x28, 0x2d, 0xf0, + 0xc7, 0x50, 0x92, 0xf1, 0x27, 0xbe, 0xca, 0x9d, 0x38, 0x30, 0x37, 0x9a, 0xe1, 0xa7, 0xef, 0xa6, + 0x98, 0x37, 0xa3, 0x4f, 0xdf, 0xcd, 0x5f, 0x2a, 0x98, 0xdc, 0x64, 0xed, 0xf1, 0x64, 0xcc, 0x71, + 0x63, 0xf9, 0xf5, 0x6b, 0xcf, 0x7c, 0x67, 0xcd, 0xc6, 0x03, 0x42, 0xc2, 0xaf, 0x62, 0x2b, 0xd9, + 0xd5, 0x51, 0x71, 0x4b, 0x65, 0x57, 0x67, 0xdb, 0xec, 0xfa, 0x61, 0x98, 0x5c, 0x16, 0x39, 0x21, + 0xd2, 0x95, 0x4f, 0x3d, 0x2a, 0x54, 0xaa, 0xd0, 0x60, 0x16, 0xda, 0x9f, 0xb5, 0xd4, 0xb8, 0x7f, + 0xf8, 0xec, 0x65, 0x0d, 0x3d, 0x7f, 0x59, 0x43, 0x7f, 0x7b, 0x59, 0x43, 0x5f, 0xbe, 0xaa, 0xed, + 0x3c, 0x7f, 0x55, 0xdb, 0xf9, 0xeb, 0xab, 0xda, 0xce, 0x67, 0xcd, 0xb1, 0x27, 0x26, 0xc1, 0xb0, + 0xe9, 0xb0, 0x59, 0x2b, 0xfa, 0xc8, 0x1f, 0xfe, 0xdd, 0xe6, 0xee, 0x71, 0x4b, 0x56, 0x7d, 0x20, + 0xbc, 0xa9, 0x1a, 0xb8, 0xb6, 0xb0, 0x87, 0x79, 0x45, 0x74, 0xe7, 0x3f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x3a, 0xea, 0x0d, 0xa7, 0x67, 0x18, 0x00, 0x00, } func (m *Customer1) Marshal() (dAtA []byte, err error) { diff --git a/types/tx_msg_test.go b/types/tx_msg_test.go index 0366d4fb14..23e3bcf87b 100644 --- a/types/tx_msg_test.go +++ b/types/tx_msg_test.go @@ -32,14 +32,14 @@ func (s *testMsgSuite) TestMsg() { } func (s *testMsgSuite) TestMsgTypeURL() { - s.Require().Equal("/testdata.TestMsg", sdk.MsgTypeURL(new(testdata.TestMsg))) + s.Require().Equal("/testpb.TestMsg", sdk.MsgTypeURL(new(testdata.TestMsg))) } func (s *testMsgSuite) TestGetMsgFromTypeURL() { msg := new(testdata.TestMsg) cdc := codec.NewProtoCodec(testdata.NewTestInterfaceRegistry()) - result, err := sdk.GetMsgFromTypeURL(cdc, "/testdata.TestMsg") + result, err := sdk.GetMsgFromTypeURL(cdc, "/testpb.TestMsg") s.Require().NoError(err) s.Require().Equal(msg, result) } diff --git a/x/auth/tx/encode_decode_test.go b/x/auth/tx/encode_decode_test.go index db6c3d995e..ec637940ed 100644 --- a/x/auth/tx/encode_decode_test.go +++ b/x/auth/tx/encode_decode_test.go @@ -32,7 +32,7 @@ func TestDefaultTxDecoderError(t *testing.T) { require.NoError(t, err) _, err = decoder(txBz) - require.EqualError(t, err, "unable to resolve type URL /testdata.TestMsg: tx parse error") + require.EqualError(t, err, "unable to resolve type URL /testpb.TestMsg: tx parse error") testdata.RegisterInterfaces(registry) _, err = decoder(txBz) diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 947b5d10b4..0510eb691d 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -1392,670 +1392,690 @@ func (this *Pool) Description() (desc *github_com_cosmos_gogoproto_protoc_gen_go func StakingDescription() (desc *github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_cosmos_gogoproto_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 10603 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x7d, 0x7b, 0x70, 0x24, 0xc7, - 0x79, 0x1f, 0xf6, 0xbd, 0xfb, 0xed, 0x6b, 0xd0, 0x00, 0xef, 0x70, 0x7b, 0x24, 0x00, 0x0e, 0x45, - 0xde, 0x83, 0x24, 0x8e, 0x3c, 0xf2, 0x8e, 0x24, 0x4e, 0x14, 0xbd, 0xbb, 0xd8, 0xbb, 0xc3, 0x11, - 0x2f, 0xcd, 0x02, 0xc7, 0x87, 0x63, 0x8d, 0x07, 0xbb, 0x0d, 0x60, 0x78, 0xbb, 0x33, 0xa3, 0x99, - 0xd9, 0x3b, 0x80, 0xe5, 0x4a, 0xd1, 0x56, 0xec, 0xc8, 0x17, 0xc7, 0x91, 0xed, 0x94, 0x2d, 0x3f, - 0xce, 0x91, 0xfc, 0x94, 0x1d, 0x3b, 0x91, 0x2d, 0x45, 0x91, 0xe3, 0x8a, 0x23, 0xa7, 0xe2, 0x44, - 0x76, 0xa5, 0x12, 0xc9, 0x95, 0x4a, 0x5c, 0x2e, 0x87, 0x71, 0x28, 0x55, 0xa4, 0xc8, 0x72, 0x6c, - 0xcb, 0x74, 0x25, 0x29, 0x95, 0x93, 0x54, 0xbf, 0xe6, 0xb1, 0x0f, 0xcc, 0xe2, 0x44, 0xd2, 0x4e, - 0xe9, 0x9f, 0xbb, 0x9d, 0xee, 0xef, 0xfb, 0x4d, 0xf7, 0xd7, 0x5f, 0x7f, 0xfd, 0x7d, 0x5f, 0xf7, - 0x34, 0xe0, 0xcf, 0x2f, 0xc1, 0xfc, 0xae, 0x69, 0xee, 0x76, 0xf0, 0x39, 0xcb, 0x36, 0x5d, 0x73, - 0xbb, 0xb7, 0x73, 0xae, 0x8d, 0x9d, 0x96, 0xad, 0x5b, 0xae, 0x69, 0x2f, 0xd0, 0x32, 0x54, 0x66, - 0x14, 0x0b, 0x82, 0x42, 0x5e, 0x85, 0xc9, 0xcb, 0x7a, 0x07, 0x2f, 0x79, 0x84, 0x4d, 0xec, 0xa2, - 0xa7, 0x21, 0xb9, 0xa3, 0x77, 0xf0, 0x4c, 0x6c, 0x3e, 0x71, 0x3a, 0x7f, 0xfe, 0x5d, 0x0b, 0x7d, - 0x4c, 0x0b, 0x61, 0x8e, 0x0d, 0x52, 0xac, 0x50, 0x0e, 0xf9, 0x8b, 0x49, 0x98, 0x1a, 0x52, 0x8b, - 0x10, 0x24, 0x0d, 0xad, 0x4b, 0x10, 0x63, 0xa7, 0x73, 0x0a, 0xfd, 0x8d, 0x66, 0x20, 0x63, 0x69, - 0xad, 0x1b, 0xda, 0x2e, 0x9e, 0x89, 0xd3, 0x62, 0xf1, 0x88, 0x66, 0x01, 0xda, 0xd8, 0xc2, 0x46, - 0x1b, 0x1b, 0xad, 0x83, 0x99, 0xc4, 0x7c, 0xe2, 0x74, 0x4e, 0x09, 0x94, 0xa0, 0x87, 0x61, 0xd2, - 0xea, 0x6d, 0x77, 0xf4, 0x96, 0x1a, 0x20, 0x83, 0xf9, 0xc4, 0xe9, 0x94, 0x22, 0xb1, 0x8a, 0x25, - 0x9f, 0xf8, 0x14, 0x94, 0x6f, 0x61, 0xed, 0x46, 0x90, 0x34, 0x4f, 0x49, 0x4b, 0xa4, 0x38, 0x40, - 0x58, 0x87, 0x42, 0x17, 0x3b, 0x8e, 0xb6, 0x8b, 0x55, 0xf7, 0xc0, 0xc2, 0x33, 0x49, 0xda, 0xfb, - 0xf9, 0x81, 0xde, 0xf7, 0xf7, 0x3c, 0xcf, 0xb9, 0x36, 0x0f, 0x2c, 0x8c, 0xaa, 0x90, 0xc3, 0x46, - 0xaf, 0xcb, 0x10, 0x52, 0x23, 0xe4, 0xd7, 0x30, 0x7a, 0xdd, 0x7e, 0x94, 0x2c, 0x61, 0xe3, 0x10, - 0x19, 0x07, 0xdb, 0x37, 0xf5, 0x16, 0x9e, 0x49, 0x53, 0x80, 0x53, 0x03, 0x00, 0x4d, 0x56, 0xdf, - 0x8f, 0x21, 0xf8, 0x50, 0x1d, 0x72, 0x78, 0xdf, 0xc5, 0x86, 0xa3, 0x9b, 0xc6, 0x4c, 0x86, 0x82, - 0x3c, 0x38, 0x64, 0x14, 0x71, 0xa7, 0xdd, 0x0f, 0xe1, 0xf3, 0xa1, 0x8b, 0x90, 0x31, 0x2d, 0x57, - 0x37, 0x0d, 0x67, 0x26, 0x3b, 0x1f, 0x3b, 0x9d, 0x3f, 0x7f, 0xef, 0x50, 0x45, 0x58, 0x67, 0x34, - 0x8a, 0x20, 0x46, 0xcb, 0x20, 0x39, 0x66, 0xcf, 0x6e, 0x61, 0xb5, 0x65, 0xb6, 0xb1, 0xaa, 0x1b, - 0x3b, 0xe6, 0x4c, 0x8e, 0x02, 0xcc, 0x0d, 0x76, 0x84, 0x12, 0xd6, 0xcd, 0x36, 0x5e, 0x36, 0x76, - 0x4c, 0xa5, 0xe4, 0x84, 0x9e, 0xd1, 0x31, 0x48, 0x3b, 0x07, 0x86, 0xab, 0xed, 0xcf, 0x14, 0xa8, - 0x86, 0xf0, 0x27, 0xf9, 0xd7, 0xd2, 0x50, 0x1e, 0x47, 0xc5, 0x2e, 0x41, 0x6a, 0x87, 0xf4, 0x72, - 0x26, 0x7e, 0x14, 0x19, 0x30, 0x9e, 0xb0, 0x10, 0xd3, 0x77, 0x29, 0xc4, 0x2a, 0xe4, 0x0d, 0xec, - 0xb8, 0xb8, 0xcd, 0x34, 0x22, 0x31, 0xa6, 0x4e, 0x01, 0x63, 0x1a, 0x54, 0xa9, 0xe4, 0x5d, 0xa9, - 0xd4, 0x8b, 0x50, 0xf6, 0x9a, 0xa4, 0xda, 0x9a, 0xb1, 0x2b, 0x74, 0xf3, 0x5c, 0x54, 0x4b, 0x16, - 0x1a, 0x82, 0x4f, 0x21, 0x6c, 0x4a, 0x09, 0x87, 0x9e, 0xd1, 0x12, 0x80, 0x69, 0x60, 0x73, 0x47, - 0x6d, 0xe3, 0x56, 0x67, 0x26, 0x3b, 0x42, 0x4a, 0xeb, 0x84, 0x64, 0x40, 0x4a, 0x26, 0x2b, 0x6d, - 0x75, 0xd0, 0x33, 0xbe, 0xaa, 0x65, 0x46, 0x68, 0xca, 0x2a, 0x9b, 0x64, 0x03, 0xda, 0xb6, 0x05, - 0x25, 0x1b, 0x13, 0xbd, 0xc7, 0x6d, 0xde, 0xb3, 0x1c, 0x6d, 0xc4, 0x42, 0x64, 0xcf, 0x14, 0xce, - 0xc6, 0x3a, 0x56, 0xb4, 0x83, 0x8f, 0xe8, 0x01, 0xf0, 0x0a, 0x54, 0xaa, 0x56, 0x40, 0xad, 0x50, - 0x41, 0x14, 0xae, 0x69, 0x5d, 0x5c, 0x79, 0x15, 0x4a, 0x61, 0xf1, 0xa0, 0x69, 0x48, 0x39, 0xae, - 0x66, 0xbb, 0x54, 0x0b, 0x53, 0x0a, 0x7b, 0x40, 0x12, 0x24, 0xb0, 0xd1, 0xa6, 0x56, 0x2e, 0xa5, - 0x90, 0x9f, 0xe8, 0x5b, 0xfc, 0x0e, 0x27, 0x68, 0x87, 0x1f, 0x1a, 0x1c, 0xd1, 0x10, 0x72, 0x7f, - 0xbf, 0x2b, 0x4f, 0x41, 0x31, 0xd4, 0x81, 0x71, 0x5f, 0x2d, 0x7f, 0x07, 0xdc, 0x33, 0x14, 0x1a, - 0xbd, 0x08, 0xd3, 0x3d, 0x43, 0x37, 0x5c, 0x6c, 0x5b, 0x36, 0x26, 0x1a, 0xcb, 0x5e, 0x35, 0xf3, - 0xa5, 0xcc, 0x08, 0x9d, 0xdb, 0x0a, 0x52, 0x33, 0x14, 0x65, 0xaa, 0x37, 0x58, 0x78, 0x36, 0x97, - 0xfd, 0x72, 0x46, 0x7a, 0xed, 0xb5, 0xd7, 0x5e, 0x8b, 0xcb, 0xbf, 0x99, 0x86, 0xe9, 0x61, 0x73, - 0x66, 0xe8, 0xf4, 0x3d, 0x06, 0x69, 0xa3, 0xd7, 0xdd, 0xc6, 0x36, 0x15, 0x52, 0x4a, 0xe1, 0x4f, - 0xa8, 0x0a, 0xa9, 0x8e, 0xb6, 0x8d, 0x3b, 0x33, 0xc9, 0xf9, 0xd8, 0xe9, 0xd2, 0xf9, 0x87, 0xc7, - 0x9a, 0x95, 0x0b, 0x2b, 0x84, 0x45, 0x61, 0x9c, 0xe8, 0x3d, 0x90, 0xe4, 0x26, 0x9a, 0x20, 0x9c, - 0x1d, 0x0f, 0x81, 0xcc, 0x25, 0x85, 0xf2, 0xa1, 0x93, 0x90, 0x23, 0xff, 0x33, 0xdd, 0x48, 0xd3, - 0x36, 0x67, 0x49, 0x01, 0xd1, 0x0b, 0x54, 0x81, 0x2c, 0x9d, 0x26, 0x6d, 0x2c, 0x96, 0x36, 0xef, - 0x99, 0x28, 0x56, 0x1b, 0xef, 0x68, 0xbd, 0x8e, 0xab, 0xde, 0xd4, 0x3a, 0x3d, 0x4c, 0x15, 0x3e, - 0xa7, 0x14, 0x78, 0xe1, 0x75, 0x52, 0x86, 0xe6, 0x20, 0xcf, 0x66, 0x95, 0x6e, 0xb4, 0xf1, 0x3e, - 0xb5, 0x9e, 0x29, 0x85, 0x4d, 0xb4, 0x65, 0x52, 0x42, 0x5e, 0xff, 0x8a, 0x63, 0x1a, 0x42, 0x35, - 0xe9, 0x2b, 0x48, 0x01, 0x7d, 0xfd, 0x53, 0xfd, 0x86, 0xfb, 0xbe, 0xe1, 0xdd, 0x1b, 0x98, 0x4b, - 0xa7, 0xa0, 0x4c, 0x29, 0x9e, 0xe0, 0x43, 0xaf, 0x75, 0x66, 0x26, 0xe7, 0x63, 0xa7, 0xb3, 0x4a, - 0x89, 0x15, 0xaf, 0xf3, 0x52, 0xf9, 0x53, 0x71, 0x48, 0x52, 0xc3, 0x52, 0x86, 0xfc, 0xe6, 0x4b, - 0x1b, 0x0d, 0x75, 0x69, 0x7d, 0xab, 0xb6, 0xd2, 0x90, 0x62, 0xa8, 0x04, 0x40, 0x0b, 0x2e, 0xaf, - 0xac, 0x57, 0x37, 0xa5, 0xb8, 0xf7, 0xbc, 0xbc, 0xb6, 0x79, 0xf1, 0x49, 0x29, 0xe1, 0x31, 0x6c, - 0xb1, 0x82, 0x64, 0x90, 0xe0, 0x89, 0xf3, 0x52, 0x0a, 0x49, 0x50, 0x60, 0x00, 0xcb, 0x2f, 0x36, - 0x96, 0x2e, 0x3e, 0x29, 0xa5, 0xc3, 0x25, 0x4f, 0x9c, 0x97, 0x32, 0xa8, 0x08, 0x39, 0x5a, 0x52, - 0x5b, 0x5f, 0x5f, 0x91, 0xb2, 0x1e, 0x66, 0x73, 0x53, 0x59, 0x5e, 0xbb, 0x22, 0xe5, 0x3c, 0xcc, - 0x2b, 0xca, 0xfa, 0xd6, 0x86, 0x04, 0x1e, 0xc2, 0x6a, 0xa3, 0xd9, 0xac, 0x5e, 0x69, 0x48, 0x79, - 0x8f, 0xa2, 0xf6, 0xd2, 0x66, 0xa3, 0x29, 0x15, 0x42, 0xcd, 0x7a, 0xe2, 0xbc, 0x54, 0xf4, 0x5e, - 0xd1, 0x58, 0xdb, 0x5a, 0x95, 0x4a, 0x68, 0x12, 0x8a, 0xec, 0x15, 0xa2, 0x11, 0xe5, 0xbe, 0xa2, - 0x8b, 0x4f, 0x4a, 0x92, 0xdf, 0x10, 0x86, 0x32, 0x19, 0x2a, 0xb8, 0xf8, 0xa4, 0x84, 0xe4, 0x3a, - 0xa4, 0xa8, 0x1a, 0x22, 0x04, 0xa5, 0x95, 0x6a, 0xad, 0xb1, 0xa2, 0xae, 0x6f, 0x6c, 0x2e, 0xaf, - 0xaf, 0x55, 0x57, 0xa4, 0x98, 0x5f, 0xa6, 0x34, 0xde, 0xbb, 0xb5, 0xac, 0x34, 0x96, 0xa4, 0x78, - 0xb0, 0x6c, 0xa3, 0x51, 0xdd, 0x6c, 0x2c, 0x49, 0x09, 0xb9, 0x05, 0xd3, 0xc3, 0x0c, 0xea, 0xd0, - 0x29, 0x14, 0xd0, 0x85, 0xf8, 0x08, 0x5d, 0xa0, 0x58, 0xfd, 0xba, 0x20, 0x7f, 0x21, 0x0e, 0x53, - 0x43, 0x16, 0x95, 0xa1, 0x2f, 0x79, 0x0e, 0x52, 0x4c, 0x97, 0xd9, 0x32, 0x7b, 0x66, 0xe8, 0xea, - 0x44, 0x35, 0x7b, 0x60, 0xa9, 0xa5, 0x7c, 0x41, 0x57, 0x23, 0x31, 0xc2, 0xd5, 0x20, 0x10, 0x03, - 0x0a, 0xfb, 0x6d, 0x03, 0xc6, 0x9f, 0xad, 0x8f, 0x17, 0xc7, 0x59, 0x1f, 0x69, 0xd9, 0xd1, 0x16, - 0x81, 0xd4, 0x90, 0x45, 0xe0, 0x12, 0x4c, 0x0e, 0x00, 0x8d, 0x6d, 0x8c, 0x3f, 0x10, 0x83, 0x99, - 0x51, 0xc2, 0x89, 0x30, 0x89, 0xf1, 0x90, 0x49, 0xbc, 0xd4, 0x2f, 0xc1, 0xfb, 0x47, 0x0f, 0xc2, - 0xc0, 0x58, 0xff, 0x7c, 0x0c, 0x8e, 0x0d, 0x77, 0x29, 0x87, 0xb6, 0xe1, 0x3d, 0x90, 0xee, 0x62, - 0x77, 0xcf, 0x14, 0x6e, 0xd5, 0x43, 0x43, 0x16, 0x6b, 0x52, 0xdd, 0x3f, 0xd8, 0x9c, 0x2b, 0xb8, - 0xda, 0x27, 0x46, 0xf9, 0x85, 0xac, 0x35, 0x03, 0x2d, 0xfd, 0xde, 0x38, 0xdc, 0x33, 0x14, 0x7c, - 0x68, 0x43, 0xef, 0x03, 0xd0, 0x0d, 0xab, 0xe7, 0x32, 0xd7, 0x89, 0x59, 0xe2, 0x1c, 0x2d, 0xa1, - 0xc6, 0x8b, 0x58, 0xd9, 0x9e, 0xeb, 0xd5, 0x27, 0x68, 0x3d, 0xb0, 0x22, 0x4a, 0xf0, 0xb4, 0xdf, - 0xd0, 0x24, 0x6d, 0xe8, 0xec, 0x88, 0x9e, 0x0e, 0x28, 0xe6, 0x63, 0x20, 0xb5, 0x3a, 0x3a, 0x36, - 0x5c, 0xd5, 0x71, 0x6d, 0xac, 0x75, 0x75, 0x63, 0x97, 0x2e, 0x35, 0xd9, 0xc5, 0xd4, 0x8e, 0xd6, - 0x71, 0xb0, 0x52, 0x66, 0xd5, 0x4d, 0x51, 0x4b, 0x38, 0xa8, 0x02, 0xd9, 0x01, 0x8e, 0x74, 0x88, - 0x83, 0x55, 0x7b, 0x1c, 0xf2, 0x0f, 0xe4, 0x20, 0x1f, 0x70, 0xc0, 0xd1, 0xfd, 0x50, 0x78, 0x45, - 0xbb, 0xa9, 0xa9, 0x22, 0xa8, 0x62, 0x92, 0xc8, 0x93, 0xb2, 0x0d, 0x1e, 0x58, 0x3d, 0x06, 0xd3, - 0x94, 0xc4, 0xec, 0xb9, 0xd8, 0x56, 0x5b, 0x1d, 0xcd, 0x71, 0xa8, 0xd0, 0xb2, 0x94, 0x14, 0x91, - 0xba, 0x75, 0x52, 0x55, 0x17, 0x35, 0xe8, 0x02, 0x4c, 0x51, 0x8e, 0x6e, 0xaf, 0xe3, 0xea, 0x56, - 0x07, 0xab, 0x24, 0xcc, 0x73, 0xe8, 0x92, 0xe3, 0xb5, 0x6c, 0x92, 0x50, 0xac, 0x72, 0x02, 0xd2, - 0x22, 0x07, 0x2d, 0xc1, 0x7d, 0x94, 0x6d, 0x17, 0x1b, 0xd8, 0xd6, 0x5c, 0xac, 0xe2, 0xf7, 0xf7, - 0xb4, 0x8e, 0xa3, 0x6a, 0x46, 0x5b, 0xdd, 0xd3, 0x9c, 0xbd, 0x99, 0x69, 0x02, 0x50, 0x8b, 0xcf, - 0xc4, 0x94, 0x13, 0x84, 0xf0, 0x0a, 0xa7, 0x6b, 0x50, 0xb2, 0xaa, 0xd1, 0xbe, 0xaa, 0x39, 0x7b, - 0x68, 0x11, 0x8e, 0x51, 0x14, 0xc7, 0xb5, 0x75, 0x63, 0x57, 0x6d, 0xed, 0xe1, 0xd6, 0x0d, 0xb5, - 0xe7, 0xee, 0x3c, 0x3d, 0x73, 0x32, 0xf8, 0x7e, 0xda, 0xc2, 0x26, 0xa5, 0xa9, 0x13, 0x92, 0x2d, - 0x77, 0xe7, 0x69, 0xd4, 0x84, 0x02, 0x19, 0x8c, 0xae, 0xfe, 0x2a, 0x56, 0x77, 0x4c, 0x9b, 0xae, - 0xa1, 0xa5, 0x21, 0xa6, 0x29, 0x20, 0xc1, 0x85, 0x75, 0xce, 0xb0, 0x6a, 0xb6, 0xf1, 0x62, 0xaa, - 0xb9, 0xd1, 0x68, 0x2c, 0x29, 0x79, 0x81, 0x72, 0xd9, 0xb4, 0x89, 0x42, 0xed, 0x9a, 0x9e, 0x80, - 0xf3, 0x4c, 0xa1, 0x76, 0x4d, 0x21, 0xde, 0x0b, 0x30, 0xd5, 0x6a, 0xb1, 0x3e, 0xeb, 0x2d, 0x95, - 0x07, 0x63, 0xce, 0x8c, 0x14, 0x12, 0x56, 0xab, 0x75, 0x85, 0x11, 0x70, 0x1d, 0x77, 0xd0, 0x33, - 0x70, 0x8f, 0x2f, 0xac, 0x20, 0xe3, 0xe4, 0x40, 0x2f, 0xfb, 0x59, 0x2f, 0xc0, 0x94, 0x75, 0x30, - 0xc8, 0x88, 0x42, 0x6f, 0xb4, 0x0e, 0xfa, 0xd9, 0x9e, 0x82, 0x69, 0x6b, 0xcf, 0x1a, 0xe4, 0x3b, - 0x1b, 0xe4, 0x43, 0xd6, 0x9e, 0xd5, 0xcf, 0xf8, 0x20, 0x8d, 0xcc, 0x6d, 0xdc, 0xd2, 0x5c, 0xdc, - 0x9e, 0x39, 0x1e, 0x24, 0x0f, 0x54, 0xa0, 0x05, 0x90, 0x5a, 0x2d, 0x15, 0x1b, 0xda, 0x76, 0x07, - 0xab, 0x9a, 0x8d, 0x0d, 0xcd, 0x99, 0x99, 0xa3, 0xc4, 0x49, 0xd7, 0xee, 0x61, 0xa5, 0xd4, 0x6a, - 0x35, 0x68, 0x65, 0x95, 0xd6, 0xa1, 0xb3, 0x30, 0x69, 0x6e, 0xbf, 0xd2, 0x62, 0x1a, 0xa9, 0x5a, - 0x36, 0xde, 0xd1, 0xf7, 0x67, 0xde, 0x45, 0xc5, 0x5b, 0x26, 0x15, 0x54, 0x1f, 0x37, 0x68, 0x31, - 0x3a, 0x03, 0x52, 0xcb, 0xd9, 0xd3, 0x6c, 0x8b, 0x9a, 0x64, 0xc7, 0xd2, 0x5a, 0x78, 0xe6, 0x41, - 0x46, 0xca, 0xca, 0xd7, 0x44, 0x31, 0x99, 0x11, 0xce, 0x2d, 0x7d, 0xc7, 0x15, 0x88, 0xa7, 0xd8, - 0x8c, 0xa0, 0x65, 0x1c, 0xed, 0x34, 0x48, 0x44, 0x12, 0xa1, 0x17, 0x9f, 0xa6, 0x64, 0x25, 0x6b, - 0xcf, 0x0a, 0xbe, 0xf7, 0x01, 0x28, 0x12, 0x4a, 0xff, 0xa5, 0x67, 0x98, 0xe3, 0x66, 0xed, 0x05, - 0xde, 0xf8, 0x24, 0x1c, 0x23, 0x44, 0x5d, 0xec, 0x6a, 0x6d, 0xcd, 0xd5, 0x02, 0xd4, 0x8f, 0x50, - 0x6a, 0x22, 0xf6, 0x55, 0x5e, 0x19, 0x6a, 0xa7, 0xdd, 0xdb, 0x3e, 0xf0, 0x14, 0xeb, 0x51, 0xd6, - 0x4e, 0x52, 0x26, 0x54, 0xeb, 0x6d, 0x73, 0xce, 0xe5, 0x45, 0x28, 0x04, 0xf5, 0x1e, 0xe5, 0x80, - 0x69, 0xbe, 0x14, 0x23, 0x4e, 0x50, 0x7d, 0x7d, 0x89, 0xb8, 0x2f, 0x2f, 0x37, 0xa4, 0x38, 0x71, - 0xa3, 0x56, 0x96, 0x37, 0x1b, 0xaa, 0xb2, 0xb5, 0xb6, 0xb9, 0xbc, 0xda, 0x90, 0x12, 0x01, 0xc7, - 0xfe, 0x5a, 0x32, 0xfb, 0x90, 0x74, 0x8a, 0x78, 0x0d, 0xa5, 0x70, 0xa4, 0x86, 0xde, 0x0d, 0xc7, - 0x45, 0x5a, 0xc5, 0xc1, 0xae, 0x7a, 0x4b, 0xb7, 0xe9, 0x84, 0xec, 0x6a, 0x6c, 0x71, 0xf4, 0xf4, - 0x67, 0x9a, 0x53, 0x35, 0xb1, 0xfb, 0x82, 0x6e, 0x93, 0xe9, 0xd6, 0xd5, 0x5c, 0xb4, 0x02, 0x73, - 0x86, 0xa9, 0x3a, 0xae, 0x66, 0xb4, 0x35, 0xbb, 0xad, 0xfa, 0x09, 0x2d, 0x55, 0x6b, 0xb5, 0xb0, - 0xe3, 0x98, 0x6c, 0x21, 0xf4, 0x50, 0xee, 0x35, 0xcc, 0x26, 0x27, 0xf6, 0x57, 0x88, 0x2a, 0x27, - 0xed, 0x53, 0xdf, 0xc4, 0x28, 0xf5, 0x3d, 0x09, 0xb9, 0xae, 0x66, 0xa9, 0xd8, 0x70, 0xed, 0x03, - 0xea, 0x9f, 0x67, 0x95, 0x6c, 0x57, 0xb3, 0x1a, 0xe4, 0xf9, 0x1d, 0x09, 0x93, 0xae, 0x25, 0xb3, - 0x49, 0x29, 0x75, 0x2d, 0x99, 0x4d, 0x49, 0xe9, 0x6b, 0xc9, 0x6c, 0x5a, 0xca, 0x5c, 0x4b, 0x66, - 0xb3, 0x52, 0xee, 0x5a, 0x32, 0x9b, 0x93, 0x40, 0xfe, 0xc1, 0x24, 0x14, 0x82, 0x1e, 0x3c, 0x09, - 0x88, 0x5a, 0x74, 0x0d, 0x8b, 0x51, 0x2b, 0xf7, 0xc0, 0xa1, 0xfe, 0xfe, 0x42, 0x9d, 0x2c, 0x6e, - 0x8b, 0x69, 0xe6, 0x2e, 0x2b, 0x8c, 0x93, 0x38, 0x16, 0x44, 0xfd, 0x30, 0x73, 0x4f, 0xb2, 0x0a, - 0x7f, 0x42, 0x57, 0x20, 0xfd, 0x8a, 0x43, 0xb1, 0xd3, 0x14, 0xfb, 0x5d, 0x87, 0x63, 0x5f, 0x6b, - 0x52, 0xf0, 0xdc, 0xb5, 0xa6, 0xba, 0xb6, 0xae, 0xac, 0x56, 0x57, 0x14, 0xce, 0x8e, 0x4e, 0x40, - 0xb2, 0xa3, 0xbd, 0x7a, 0x10, 0x5e, 0x06, 0x69, 0x11, 0x5a, 0x80, 0x72, 0xcf, 0xb8, 0x89, 0x6d, - 0x7d, 0x47, 0xc7, 0x6d, 0x95, 0x52, 0x95, 0x83, 0x54, 0x25, 0xbf, 0x76, 0x85, 0xd0, 0x8f, 0x39, - 0x8c, 0x27, 0x20, 0x79, 0x0b, 0x6b, 0x37, 0xc2, 0x8b, 0x15, 0x2d, 0x7a, 0x1b, 0xa7, 0xd3, 0x39, - 0x48, 0x51, 0xf9, 0x22, 0x00, 0x2e, 0x61, 0x69, 0x02, 0x65, 0x21, 0x59, 0x5f, 0x57, 0xc8, 0x94, - 0x92, 0xa0, 0xc0, 0x4a, 0xd5, 0x8d, 0xe5, 0x46, 0xbd, 0x21, 0xc5, 0xe5, 0x0b, 0x90, 0x66, 0x42, - 0x23, 0xd3, 0xcd, 0x13, 0x9b, 0x34, 0xc1, 0x1f, 0x39, 0x46, 0x4c, 0xd4, 0x6e, 0xad, 0xd6, 0x1a, - 0x8a, 0x14, 0x1f, 0x50, 0x16, 0xd9, 0x81, 0x42, 0xd0, 0x93, 0x7f, 0x67, 0xc2, 0xf9, 0xcf, 0xc4, - 0x20, 0x1f, 0xf0, 0xcc, 0x89, 0x4b, 0xa5, 0x75, 0x3a, 0xe6, 0x2d, 0x55, 0xeb, 0xe8, 0x9a, 0xc3, - 0x55, 0x09, 0x68, 0x51, 0x95, 0x94, 0x8c, 0x3b, 0x74, 0xef, 0xd0, 0x24, 0x4b, 0x49, 0x69, 0xf9, - 0x27, 0x63, 0x20, 0xf5, 0xbb, 0xc6, 0x7d, 0xcd, 0x8c, 0xfd, 0x55, 0x36, 0x53, 0xfe, 0x89, 0x18, - 0x94, 0xc2, 0xfe, 0x70, 0x5f, 0xf3, 0xee, 0xff, 0x2b, 0x6d, 0xde, 0x1f, 0xc6, 0xa1, 0x18, 0xf2, - 0x82, 0xc7, 0x6d, 0xdd, 0xfb, 0x61, 0x52, 0x6f, 0xe3, 0xae, 0x65, 0xba, 0xd8, 0x68, 0x1d, 0xa8, - 0x1d, 0x7c, 0x13, 0x77, 0x66, 0x64, 0x6a, 0x64, 0xce, 0x1d, 0xee, 0x67, 0x2f, 0x2c, 0xfb, 0x7c, - 0x2b, 0x84, 0x6d, 0x71, 0x6a, 0x79, 0xa9, 0xb1, 0xba, 0xb1, 0xbe, 0xd9, 0x58, 0xab, 0xbf, 0xa4, - 0x6e, 0xad, 0x3d, 0xbf, 0xb6, 0xfe, 0xc2, 0x9a, 0x22, 0xe9, 0x7d, 0x64, 0x6f, 0xe3, 0xb4, 0xdf, - 0x00, 0xa9, 0xbf, 0x51, 0xe8, 0x38, 0x0c, 0x6b, 0x96, 0x34, 0x81, 0xa6, 0xa0, 0xbc, 0xb6, 0xae, - 0x36, 0x97, 0x97, 0x1a, 0x6a, 0xe3, 0xf2, 0xe5, 0x46, 0x7d, 0xb3, 0xc9, 0x32, 0x27, 0x1e, 0xf5, - 0x66, 0x68, 0x82, 0xcb, 0x3f, 0x96, 0x80, 0xa9, 0x21, 0x2d, 0x41, 0x55, 0x1e, 0xf3, 0xb0, 0x30, - 0xec, 0xd1, 0x71, 0x5a, 0xbf, 0x40, 0xbc, 0x8e, 0x0d, 0xcd, 0x76, 0x79, 0x88, 0x74, 0x06, 0x88, - 0x94, 0x0c, 0x97, 0x18, 0x57, 0x9b, 0x67, 0xa4, 0x58, 0x20, 0x54, 0xf6, 0xcb, 0x59, 0x52, 0xea, - 0x11, 0x40, 0x96, 0xe9, 0xe8, 0xae, 0x7e, 0x13, 0xab, 0xba, 0x21, 0xd2, 0x57, 0x24, 0x30, 0x4a, - 0x2a, 0x92, 0xa8, 0x59, 0x36, 0x5c, 0x8f, 0xda, 0xc0, 0xbb, 0x5a, 0x1f, 0x35, 0x31, 0xfe, 0x09, - 0x45, 0x12, 0x35, 0x1e, 0xf5, 0xfd, 0x50, 0x68, 0x9b, 0x3d, 0xe2, 0x2d, 0x32, 0x3a, 0xb2, 0xd6, - 0xc4, 0x94, 0x3c, 0x2b, 0xf3, 0x48, 0x78, 0x1c, 0xe0, 0xe7, 0xcd, 0x0a, 0x4a, 0x9e, 0x95, 0x31, - 0x92, 0x53, 0x50, 0xd6, 0x76, 0x77, 0x6d, 0x02, 0x2e, 0x80, 0x58, 0x64, 0x53, 0xf2, 0x8a, 0x29, - 0x61, 0xe5, 0x1a, 0x64, 0x85, 0x1c, 0xc8, 0x62, 0x4f, 0x24, 0xa1, 0x5a, 0x2c, 0x5c, 0x8f, 0x9f, - 0xce, 0x29, 0x59, 0x43, 0x54, 0xde, 0x0f, 0x05, 0xdd, 0x51, 0xfd, 0x6d, 0x80, 0xf8, 0x7c, 0xfc, - 0x74, 0x56, 0xc9, 0xeb, 0x8e, 0x97, 0x42, 0x95, 0x7f, 0x3e, 0x0e, 0xa5, 0xf0, 0x36, 0x06, 0x5a, - 0x82, 0x6c, 0xc7, 0x6c, 0x69, 0x54, 0xb5, 0xd8, 0x1e, 0xda, 0xe9, 0x88, 0x9d, 0x8f, 0x85, 0x15, - 0x4e, 0xaf, 0x78, 0x9c, 0x95, 0x7f, 0x17, 0x83, 0xac, 0x28, 0x46, 0xc7, 0x20, 0x69, 0x69, 0xee, - 0x1e, 0x85, 0x4b, 0xd5, 0xe2, 0x52, 0x4c, 0xa1, 0xcf, 0xa4, 0xdc, 0xb1, 0x34, 0x83, 0xaa, 0x00, - 0x2f, 0x27, 0xcf, 0x64, 0x5c, 0x3b, 0x58, 0x6b, 0xd3, 0xb0, 0xc9, 0xec, 0x76, 0xb1, 0xe1, 0x3a, - 0x62, 0x5c, 0x79, 0x79, 0x9d, 0x17, 0xa3, 0x87, 0x61, 0xd2, 0xb5, 0x35, 0xbd, 0x13, 0xa2, 0x4d, - 0x52, 0x5a, 0x49, 0x54, 0x78, 0xc4, 0x8b, 0x70, 0x42, 0xe0, 0xb6, 0xb1, 0xab, 0xb5, 0xf6, 0x70, - 0xdb, 0x67, 0x4a, 0xd3, 0xf4, 0xc8, 0x71, 0x4e, 0xb0, 0xc4, 0xeb, 0x05, 0xaf, 0xfc, 0xf9, 0x18, - 0x4c, 0x8a, 0x40, 0xaf, 0xed, 0x09, 0x6b, 0x15, 0x40, 0x33, 0x0c, 0xd3, 0x0d, 0x8a, 0x6b, 0x50, - 0x95, 0x07, 0xf8, 0x16, 0xaa, 0x1e, 0x93, 0x12, 0x00, 0xa8, 0x74, 0x01, 0xfc, 0x9a, 0x91, 0x62, - 0x9b, 0x83, 0x3c, 0xdf, 0xa3, 0xa2, 0x1b, 0x9d, 0x2c, 0x35, 0x00, 0xac, 0x88, 0x44, 0x84, 0x68, - 0x1a, 0x52, 0xdb, 0x78, 0x57, 0x37, 0x78, 0xe6, 0x99, 0x3d, 0x88, 0x04, 0x4e, 0xd2, 0x4b, 0xe0, - 0xd4, 0xfe, 0x26, 0x4c, 0xb5, 0xcc, 0x6e, 0x7f, 0x73, 0x6b, 0x52, 0x5f, 0x7a, 0xc2, 0xb9, 0x1a, - 0x7b, 0xf9, 0x51, 0x4e, 0xb4, 0x6b, 0x76, 0x34, 0x63, 0x77, 0xc1, 0xb4, 0x77, 0xfd, 0x8d, 0x5a, - 0xe2, 0x21, 0x39, 0x81, 0xed, 0x5a, 0x6b, 0xfb, 0x7f, 0xc5, 0x62, 0x3f, 0x15, 0x4f, 0x5c, 0xd9, - 0xa8, 0xfd, 0x62, 0xbc, 0x72, 0x85, 0x31, 0x6e, 0x08, 0x61, 0x28, 0x78, 0xa7, 0x83, 0x5b, 0xa4, - 0x83, 0xf0, 0xc7, 0x0f, 0xc3, 0xf4, 0xae, 0xb9, 0x6b, 0x52, 0xa4, 0x73, 0xe4, 0x17, 0xdf, 0xe9, - 0xcd, 0x79, 0xa5, 0x95, 0xc8, 0x6d, 0xe1, 0xc5, 0x35, 0x98, 0xe2, 0xc4, 0x2a, 0xdd, 0x6a, 0x62, - 0x81, 0x10, 0x3a, 0x34, 0x0b, 0x37, 0xf3, 0x2b, 0x5f, 0xa4, 0xcb, 0xb7, 0x32, 0xc9, 0x59, 0x49, - 0x1d, 0x8b, 0x95, 0x16, 0x15, 0xb8, 0x27, 0x84, 0xc7, 0x26, 0x29, 0xb6, 0x23, 0x10, 0x7f, 0x8b, - 0x23, 0x4e, 0x05, 0x10, 0x9b, 0x9c, 0x75, 0xb1, 0x0e, 0xc5, 0xa3, 0x60, 0xfd, 0x6b, 0x8e, 0x55, - 0xc0, 0x41, 0x90, 0x2b, 0x50, 0xa6, 0x20, 0xad, 0x9e, 0xe3, 0x9a, 0x5d, 0x6a, 0x01, 0x0f, 0x87, - 0xf9, 0x37, 0x5f, 0x64, 0xb3, 0xa6, 0x44, 0xd8, 0xea, 0x1e, 0xd7, 0xe2, 0x22, 0xd0, 0xdd, 0xb5, - 0x36, 0x6e, 0x75, 0x22, 0x10, 0x3e, 0xcb, 0x1b, 0xe2, 0xd1, 0x2f, 0x5e, 0x87, 0x69, 0xf2, 0x9b, - 0x1a, 0xa8, 0x60, 0x4b, 0xa2, 0x53, 0x76, 0x33, 0x9f, 0xff, 0x00, 0x9b, 0x98, 0x53, 0x1e, 0x40, - 0xa0, 0x4d, 0x81, 0x51, 0xdc, 0xc5, 0xae, 0x8b, 0x6d, 0x47, 0xd5, 0x3a, 0xc3, 0x9a, 0x17, 0xc8, - 0x79, 0xcc, 0xfc, 0xe8, 0x57, 0xc3, 0xa3, 0x78, 0x85, 0x71, 0x56, 0x3b, 0x9d, 0xc5, 0x2d, 0x38, - 0x3e, 0x44, 0x2b, 0xc6, 0xc0, 0xfc, 0x31, 0x8e, 0x39, 0x3d, 0xa0, 0x19, 0x04, 0x76, 0x03, 0x44, - 0xb9, 0x37, 0x96, 0x63, 0x60, 0xfe, 0x38, 0xc7, 0x44, 0x9c, 0x57, 0x0c, 0x29, 0x41, 0xbc, 0x06, - 0x93, 0x37, 0xb1, 0xbd, 0x6d, 0x3a, 0x3c, 0xcf, 0x34, 0x06, 0xdc, 0x4f, 0x70, 0xb8, 0x32, 0x67, - 0xa4, 0x89, 0x27, 0x82, 0xf5, 0x0c, 0x64, 0x77, 0xb4, 0x16, 0x1e, 0x03, 0xe2, 0x0e, 0x87, 0xc8, - 0x10, 0x7a, 0xc2, 0x5a, 0x85, 0xc2, 0xae, 0xc9, 0xd7, 0xa8, 0x68, 0xf6, 0x9f, 0xe4, 0xec, 0x79, - 0xc1, 0xc3, 0x21, 0x2c, 0xd3, 0xea, 0x75, 0xc8, 0x02, 0x16, 0x0d, 0xf1, 0x0f, 0x04, 0x84, 0xe0, - 0xe1, 0x10, 0x47, 0x10, 0xeb, 0x47, 0x04, 0x84, 0x13, 0x90, 0xe7, 0x73, 0x90, 0x37, 0x8d, 0xce, - 0x81, 0x69, 0x8c, 0xd3, 0x88, 0x8f, 0x72, 0x04, 0xe0, 0x2c, 0x04, 0xe0, 0x12, 0xe4, 0xc6, 0x1d, - 0x88, 0x9f, 0xfd, 0xaa, 0x98, 0x1e, 0x62, 0x04, 0xae, 0x40, 0x59, 0x18, 0x28, 0xdd, 0x34, 0xc6, - 0x80, 0xf8, 0x39, 0x0e, 0x51, 0x0a, 0xb0, 0xf1, 0x6e, 0xb8, 0xd8, 0x71, 0x77, 0xf1, 0x38, 0x20, - 0x3f, 0x2f, 0xba, 0xc1, 0x59, 0xb8, 0x28, 0xb7, 0xb1, 0xd1, 0xda, 0x1b, 0x0f, 0xe1, 0x63, 0x42, - 0x94, 0x82, 0x87, 0x40, 0xd4, 0xa1, 0xd8, 0xd5, 0x6c, 0x67, 0x4f, 0xeb, 0x8c, 0x35, 0x1c, 0xbf, - 0xc0, 0x31, 0x0a, 0x1e, 0x13, 0x97, 0x48, 0xcf, 0x38, 0x0a, 0xcc, 0x2f, 0x0a, 0x89, 0x04, 0xd8, - 0xf8, 0xd4, 0x73, 0x5c, 0x9a, 0x94, 0x3b, 0x0a, 0xda, 0x3f, 0x14, 0x53, 0x8f, 0xf1, 0xae, 0x06, - 0x11, 0x2f, 0x41, 0xce, 0xd1, 0x5f, 0x1d, 0x0b, 0xe6, 0x97, 0xc4, 0x48, 0x53, 0x06, 0xc2, 0xfc, - 0x12, 0x9c, 0x18, 0xba, 0x4c, 0x8c, 0x01, 0xf6, 0xcb, 0x1c, 0xec, 0xd8, 0x90, 0xa5, 0x82, 0x9b, - 0x84, 0xa3, 0x42, 0xfe, 0x23, 0x61, 0x12, 0x70, 0x1f, 0xd6, 0x06, 0x89, 0x1a, 0x1c, 0x6d, 0xe7, - 0x68, 0x52, 0xfb, 0xc7, 0x42, 0x6a, 0x8c, 0x37, 0x24, 0xb5, 0x4d, 0x38, 0xc6, 0x11, 0x8f, 0x36, - 0xae, 0x1f, 0x17, 0x86, 0x95, 0x71, 0x6f, 0x85, 0x47, 0xf7, 0x5b, 0xa1, 0xe2, 0x89, 0x53, 0xb8, - 0xa7, 0x8e, 0xda, 0xd5, 0xac, 0x31, 0x90, 0x7f, 0x85, 0x23, 0x0b, 0x8b, 0xef, 0xf9, 0xb7, 0xce, - 0xaa, 0x66, 0x11, 0xf0, 0x17, 0x61, 0x46, 0x80, 0xf7, 0x0c, 0x1b, 0xb7, 0xcc, 0x5d, 0x43, 0x7f, - 0x15, 0xb7, 0xc7, 0x80, 0xfe, 0xd5, 0xbe, 0xa1, 0xda, 0x0a, 0xb0, 0x13, 0xe4, 0x65, 0x90, 0x3c, - 0x5f, 0x45, 0xd5, 0xbb, 0x96, 0x69, 0xbb, 0x11, 0x88, 0x9f, 0x10, 0x23, 0xe5, 0xf1, 0x2d, 0x53, - 0xb6, 0xc5, 0x06, 0xb0, 0x9d, 0xea, 0x71, 0x55, 0xf2, 0x93, 0x1c, 0xa8, 0xe8, 0x73, 0x71, 0xc3, - 0xd1, 0x32, 0xbb, 0x96, 0x66, 0x8f, 0x63, 0xff, 0xfe, 0x89, 0x30, 0x1c, 0x9c, 0x85, 0x1b, 0x0e, - 0xe2, 0xd1, 0x91, 0xd5, 0x7e, 0x0c, 0x84, 0x4f, 0x09, 0xc3, 0x21, 0x78, 0x38, 0x84, 0x70, 0x18, - 0xc6, 0x80, 0xf8, 0xa7, 0x02, 0x42, 0xf0, 0x10, 0x88, 0xf7, 0xfa, 0x0b, 0xad, 0x8d, 0x77, 0x75, - 0xc7, 0xb5, 0x99, 0x53, 0x7c, 0x38, 0xd4, 0xa7, 0xbf, 0x1a, 0x76, 0xc2, 0x94, 0x00, 0x2b, 0xb1, - 0x44, 0x3c, 0x4d, 0x4b, 0x63, 0xa6, 0xe8, 0x86, 0xfd, 0x9a, 0xb0, 0x44, 0x01, 0x36, 0xd2, 0xb6, - 0x80, 0x87, 0x48, 0xc4, 0xde, 0x22, 0x91, 0xc2, 0x18, 0x70, 0xff, 0xac, 0xaf, 0x71, 0x4d, 0xc1, - 0x4b, 0x30, 0x03, 0xfe, 0x4f, 0xcf, 0xb8, 0x81, 0x0f, 0xc6, 0xd2, 0xce, 0x5f, 0xef, 0xf3, 0x7f, - 0xb6, 0x18, 0x27, 0xb3, 0x21, 0xe5, 0x3e, 0x7f, 0x0a, 0x45, 0x9d, 0x4b, 0x9a, 0xf9, 0xce, 0x37, - 0x79, 0x7f, 0xc3, 0xee, 0xd4, 0xe2, 0x0a, 0x51, 0xf2, 0xb0, 0xd3, 0x13, 0x0d, 0xf6, 0x81, 0x37, - 0x3d, 0x3d, 0x0f, 0xf9, 0x3c, 0x8b, 0x97, 0xa1, 0x18, 0x72, 0x78, 0xa2, 0xa1, 0xfe, 0x16, 0x87, - 0x2a, 0x04, 0xfd, 0x9d, 0xc5, 0x0b, 0x90, 0x24, 0xce, 0x4b, 0x34, 0xfb, 0x77, 0x73, 0x76, 0x4a, - 0xbe, 0xf8, 0x2c, 0x64, 0x85, 0xd3, 0x12, 0xcd, 0xfa, 0x3d, 0x9c, 0xd5, 0x63, 0x21, 0xec, 0xc2, - 0x61, 0x89, 0x66, 0xff, 0xdb, 0x82, 0x5d, 0xb0, 0x10, 0xf6, 0xf1, 0x45, 0xf8, 0x99, 0xbf, 0x93, - 0xe4, 0x8b, 0x8e, 0x90, 0xdd, 0x25, 0xc8, 0x70, 0x4f, 0x25, 0x9a, 0xfb, 0x7b, 0xf9, 0xcb, 0x05, - 0xc7, 0xe2, 0x53, 0x90, 0x1a, 0x53, 0xe0, 0x7f, 0x97, 0xb3, 0x32, 0xfa, 0xc5, 0x3a, 0xe4, 0x03, - 0xde, 0x49, 0x34, 0xfb, 0xf7, 0x73, 0xf6, 0x20, 0x17, 0x69, 0x3a, 0xf7, 0x4e, 0xa2, 0x01, 0xfe, - 0x9e, 0x68, 0x3a, 0xe7, 0x20, 0x62, 0x13, 0x8e, 0x49, 0x34, 0xf7, 0x87, 0x84, 0xd4, 0x05, 0xcb, - 0xe2, 0x73, 0x90, 0xf3, 0x16, 0x9b, 0x68, 0xfe, 0x1f, 0xe0, 0xfc, 0x3e, 0x0f, 0x91, 0x40, 0x60, - 0xb1, 0x8b, 0x86, 0xf8, 0x41, 0x21, 0x81, 0x00, 0x17, 0x99, 0x46, 0xfd, 0x0e, 0x4c, 0x34, 0xd2, - 0x0f, 0x89, 0x69, 0xd4, 0xe7, 0xbf, 0x90, 0xd1, 0xa4, 0x36, 0x3f, 0x1a, 0xe2, 0xef, 0x8b, 0xd1, - 0xa4, 0xf4, 0xa4, 0x19, 0xfd, 0x1e, 0x41, 0x34, 0xc6, 0x8f, 0x88, 0x66, 0xf4, 0x39, 0x04, 0x8b, - 0x1b, 0x80, 0x06, 0xbd, 0x81, 0x68, 0xbc, 0x0f, 0x73, 0xbc, 0xc9, 0x01, 0x67, 0x60, 0xf1, 0x05, - 0x38, 0x36, 0xdc, 0x13, 0x88, 0x46, 0xfd, 0xd1, 0x37, 0xfb, 0x62, 0xb7, 0xa0, 0x23, 0xb0, 0xb8, - 0xe9, 0x2f, 0x29, 0x41, 0x2f, 0x20, 0x1a, 0xf6, 0xc7, 0xde, 0x0c, 0x1b, 0xee, 0xa0, 0x13, 0xb0, - 0x58, 0x05, 0xf0, 0x17, 0xe0, 0x68, 0xac, 0x9f, 0xe0, 0x58, 0x01, 0x26, 0x32, 0x35, 0xf8, 0xfa, - 0x1b, 0xcd, 0x7f, 0x47, 0x4c, 0x0d, 0xce, 0x41, 0xa6, 0x86, 0x58, 0x7a, 0xa3, 0xb9, 0x7f, 0x52, - 0x4c, 0x0d, 0xc1, 0x42, 0x34, 0x3b, 0xb0, 0xba, 0x45, 0x23, 0x7c, 0x54, 0x68, 0x76, 0x80, 0x6b, - 0x71, 0x0d, 0x26, 0x07, 0x16, 0xc4, 0x68, 0xa8, 0x9f, 0xe2, 0x50, 0x52, 0xff, 0x7a, 0x18, 0x5c, - 0xbc, 0xf8, 0x62, 0x18, 0x8d, 0xf6, 0xd3, 0x7d, 0x8b, 0x17, 0x5f, 0x0b, 0x17, 0x2f, 0x41, 0xd6, - 0xe8, 0x75, 0x3a, 0x64, 0xf2, 0xa0, 0xc3, 0xcf, 0x12, 0xce, 0xfc, 0xf7, 0xaf, 0x73, 0xe9, 0x08, - 0x86, 0xc5, 0x0b, 0x90, 0xc2, 0xdd, 0x6d, 0xdc, 0x8e, 0xe2, 0xfc, 0xca, 0xd7, 0x85, 0xc1, 0x24, - 0xd4, 0x8b, 0xcf, 0x01, 0xb0, 0xd4, 0x08, 0xdd, 0x3c, 0x8c, 0xe0, 0xfd, 0xa3, 0xaf, 0xf3, 0xc3, - 0x3b, 0x3e, 0x8b, 0x0f, 0xc0, 0x8e, 0x02, 0x1d, 0x0e, 0xf0, 0xd5, 0x30, 0x00, 0x1d, 0x91, 0x67, - 0x20, 0xf3, 0x8a, 0x63, 0x1a, 0xae, 0xb6, 0x1b, 0xc5, 0xfd, 0xc7, 0x9c, 0x5b, 0xd0, 0x13, 0x81, - 0x75, 0x4d, 0x1b, 0xbb, 0xda, 0xae, 0x13, 0xc5, 0xfb, 0x3f, 0x38, 0xaf, 0xc7, 0x40, 0x98, 0x5b, - 0x9a, 0xe3, 0x8e, 0xd3, 0xef, 0x3f, 0x11, 0xcc, 0x82, 0x81, 0x34, 0x9a, 0xfc, 0xbe, 0x81, 0x0f, - 0xa2, 0x78, 0xff, 0x54, 0x34, 0x9a, 0xd3, 0x2f, 0x3e, 0x0b, 0x39, 0xf2, 0x93, 0x9d, 0xc8, 0x8b, - 0x60, 0xfe, 0x33, 0xce, 0xec, 0x73, 0x90, 0x37, 0x3b, 0x6e, 0xdb, 0xd5, 0xa3, 0x85, 0xfd, 0x35, - 0x3e, 0xd2, 0x82, 0x7e, 0xb1, 0x0a, 0x79, 0xc7, 0x6d, 0xb7, 0x7b, 0xdc, 0x3f, 0x8d, 0x60, 0xff, - 0xf3, 0xaf, 0x7b, 0x29, 0x0b, 0x8f, 0x87, 0x8c, 0xf6, 0xad, 0x1b, 0xae, 0x65, 0xd2, 0x0d, 0x8f, - 0x28, 0x84, 0x37, 0x39, 0x42, 0x80, 0x65, 0xb1, 0x0e, 0x05, 0xd2, 0x17, 0x1b, 0x5b, 0x98, 0xee, - 0x4e, 0x45, 0x40, 0xfc, 0x05, 0x17, 0x40, 0x88, 0xa9, 0xf6, 0xed, 0x9f, 0x7d, 0x63, 0x36, 0xf6, - 0xb9, 0x37, 0x66, 0x63, 0x7f, 0xf8, 0xc6, 0x6c, 0xec, 0x43, 0x5f, 0x98, 0x9d, 0xf8, 0xdc, 0x17, - 0x66, 0x27, 0x7e, 0xef, 0x0b, 0xb3, 0x13, 0xc3, 0xb3, 0xc4, 0x70, 0xc5, 0xbc, 0x62, 0xb2, 0xfc, - 0xf0, 0xcb, 0x0f, 0xee, 0xea, 0xee, 0x5e, 0x6f, 0x7b, 0xa1, 0x65, 0x76, 0xcf, 0xb5, 0x4c, 0xa7, - 0x6b, 0x3a, 0xe7, 0xc2, 0x79, 0x5d, 0xfa, 0x0b, 0xfe, 0x32, 0x46, 0x62, 0xe6, 0x70, 0x3a, 0x57, - 0x33, 0x0e, 0x46, 0x7d, 0xde, 0x73, 0x11, 0x12, 0x55, 0xe3, 0x00, 0x9d, 0x60, 0x06, 0x4e, 0xed, - 0xd9, 0x1d, 0x7e, 0x2c, 0x2c, 0x43, 0x9e, 0xb7, 0xec, 0x0e, 0x9a, 0xf6, 0xcf, 0x6e, 0xc6, 0x4e, - 0x17, 0xf8, 0x81, 0xcc, 0xda, 0xf7, 0xc7, 0x8e, 0xd6, 0x93, 0x6c, 0xd5, 0x38, 0xa0, 0x1d, 0xd9, - 0x88, 0xbd, 0xfc, 0x48, 0x64, 0x9e, 0xfb, 0x86, 0x61, 0xde, 0x32, 0x48, 0xb3, 0xad, 0x6d, 0x91, - 0xe3, 0x9e, 0xed, 0xcf, 0x71, 0xbf, 0x80, 0x3b, 0x9d, 0xe7, 0x09, 0xdd, 0x26, 0x61, 0xd9, 0x4e, - 0xb3, 0x13, 0xc8, 0xf0, 0x43, 0x71, 0x98, 0x1d, 0x48, 0x67, 0x73, 0x25, 0x18, 0x25, 0x84, 0x45, - 0xc8, 0x2e, 0x09, 0xdd, 0x9a, 0x81, 0x8c, 0x83, 0x5b, 0xa6, 0xd1, 0x76, 0xa8, 0x20, 0x12, 0x8a, - 0x78, 0x24, 0x82, 0x30, 0x34, 0xc3, 0x74, 0xf8, 0xc1, 0x4a, 0xf6, 0x50, 0xfb, 0xf1, 0x23, 0x0a, - 0xa2, 0x28, 0xde, 0x24, 0xa4, 0xf1, 0xf8, 0x98, 0xd2, 0x10, 0x9d, 0x08, 0x65, 0xfe, 0xc7, 0x95, - 0xca, 0x8f, 0xc4, 0x61, 0xae, 0x5f, 0x2a, 0x64, 0x66, 0x39, 0xae, 0xd6, 0xb5, 0x46, 0x89, 0xe5, - 0x12, 0xe4, 0x36, 0x05, 0xcd, 0x91, 0xe5, 0x72, 0xe7, 0x88, 0x72, 0x29, 0x79, 0xaf, 0x12, 0x82, - 0x39, 0x3f, 0xa6, 0x60, 0xbc, 0x7e, 0xdc, 0x95, 0x64, 0xfe, 0x77, 0x1a, 0x4e, 0xb0, 0xe9, 0xa4, - 0xb2, 0xa9, 0xc4, 0x1e, 0xb8, 0x4c, 0x0a, 0xc1, 0xaa, 0xe8, 0x7d, 0x12, 0xf9, 0x79, 0x98, 0x5a, - 0x26, 0xd6, 0x82, 0x44, 0x41, 0xfe, 0x0e, 0xcf, 0xd0, 0xb3, 0xa7, 0xf3, 0x21, 0x87, 0x9f, 0xef, - 0x30, 0x05, 0x8b, 0xe4, 0xef, 0x8c, 0x81, 0xd4, 0x6c, 0x69, 0x1d, 0xcd, 0xfe, 0x46, 0xa1, 0xd0, - 0x53, 0x00, 0xf4, 0x9b, 0x25, 0xff, 0x23, 0xa3, 0xd2, 0xf9, 0x99, 0x85, 0x60, 0xe7, 0x16, 0xd8, - 0x9b, 0xe8, 0x17, 0x0c, 0x39, 0x4a, 0x4b, 0x7e, 0x9e, 0x7d, 0x11, 0xc0, 0xaf, 0x40, 0x27, 0xe1, - 0x78, 0xb3, 0x5e, 0x5d, 0xa9, 0x2a, 0x2a, 0x3b, 0x0c, 0xbf, 0xd6, 0xdc, 0x68, 0xd4, 0x97, 0x2f, - 0x2f, 0x37, 0x96, 0xa4, 0x09, 0x74, 0x0c, 0x50, 0xb0, 0xd2, 0x3b, 0x97, 0x72, 0x0f, 0x4c, 0x06, - 0xcb, 0xd9, 0x89, 0xfa, 0x38, 0xf1, 0x14, 0xf5, 0xae, 0xd5, 0xc1, 0x74, 0xeb, 0x4f, 0xd5, 0x85, - 0xd4, 0xa2, 0x9d, 0x90, 0xdf, 0xfe, 0x8f, 0xec, 0x94, 0xf5, 0x94, 0xcf, 0xee, 0xc9, 0x7c, 0x71, - 0x05, 0x26, 0xb5, 0x56, 0x0b, 0x5b, 0x21, 0xc8, 0x08, 0x53, 0x4d, 0x00, 0xe9, 0x66, 0x26, 0xe7, - 0xf4, 0xd1, 0x9e, 0x82, 0xb4, 0x43, 0x7b, 0x1f, 0x05, 0xf1, 0x3b, 0x1c, 0x82, 0x93, 0x2f, 0x1a, - 0x30, 0x49, 0x3c, 0x3f, 0xcd, 0xc6, 0x81, 0x66, 0x1c, 0x9e, 0x67, 0xf8, 0xe7, 0x9f, 0x78, 0x8c, - 0x6e, 0x6d, 0xde, 0x1f, 0x1e, 0x96, 0x21, 0xea, 0xa4, 0x48, 0x1c, 0xdb, 0x6f, 0x28, 0x86, 0x92, - 0x78, 0x1f, 0x6f, 0xf0, 0xe1, 0x2f, 0xfb, 0x0d, 0xfe, 0xb2, 0xd9, 0x61, 0x3a, 0x10, 0x78, 0x53, - 0x91, 0xa3, 0xb2, 0x8a, 0x5a, 0x63, 0xd4, 0x9c, 0x7e, 0xf9, 0xe1, 0xc1, 0xd5, 0x89, 0xfd, 0xf7, - 0x28, 0x45, 0xbe, 0x14, 0x7c, 0x8d, 0x37, 0xf7, 0x7e, 0x3f, 0x01, 0x93, 0x5a, 0x57, 0x37, 0xcc, - 0x73, 0xf4, 0x5f, 0x3e, 0xe7, 0x52, 0xf4, 0x61, 0x8c, 0x4d, 0xc9, 0x8b, 0x6c, 0x2a, 0x44, 0x6b, - 0xcc, 0x9f, 0x7d, 0xdf, 0xcf, 0xa5, 0xfc, 0xe9, 0xb2, 0xb8, 0x0a, 0x92, 0x38, 0x70, 0x88, 0x8d, - 0x96, 0xd9, 0x1e, 0x2b, 0x4b, 0xf1, 0x35, 0x81, 0x21, 0xf2, 0x5b, 0x0d, 0xce, 0xba, 0xf8, 0x6e, - 0xc8, 0x7a, 0x30, 0x51, 0x9e, 0x89, 0x00, 0xf1, 0x38, 0x88, 0x5f, 0xc2, 0x66, 0xe6, 0x38, 0x5e, - 0xe8, 0x9b, 0x82, 0x9f, 0xcd, 0xd0, 0x35, 0xd2, 0x9b, 0x2b, 0x50, 0x6a, 0x9b, 0x86, 0xab, 0x9a, - 0x5d, 0xdd, 0xc5, 0x5d, 0xcb, 0x8d, 0xf4, 0xeb, 0xfe, 0x82, 0x81, 0x64, 0x95, 0x22, 0xe1, 0x5b, - 0x17, 0x6c, 0x77, 0x35, 0xb8, 0x4e, 0xfb, 0x06, 0xb7, 0xc5, 0xee, 0x3e, 0x1b, 0x44, 0x6f, 0x70, - 0xff, 0x24, 0x01, 0xb3, 0x9c, 0x78, 0x5b, 0x73, 0xf0, 0xb9, 0x9b, 0x8f, 0x6f, 0x63, 0x57, 0x7b, - 0xfc, 0x5c, 0xcb, 0xd4, 0xc5, 0x42, 0x3c, 0xc5, 0x6d, 0x2d, 0xa9, 0x5f, 0xe0, 0xf5, 0x95, 0xa1, - 0xbb, 0xd5, 0x95, 0xd1, 0x36, 0xba, 0x32, 0xa8, 0x42, 0xf2, 0xcb, 0x90, 0xac, 0x9b, 0xba, 0x41, - 0x96, 0xa6, 0x36, 0x36, 0xcc, 0x2e, 0xb7, 0x96, 0xec, 0x01, 0x5d, 0x84, 0xb4, 0xd6, 0x35, 0x7b, - 0x86, 0xcb, 0x2c, 0x65, 0x6d, 0xf6, 0xb3, 0xaf, 0xcf, 0x4d, 0xfc, 0xfe, 0xeb, 0x73, 0x89, 0x65, - 0xc3, 0xfd, 0xdd, 0x4f, 0x3e, 0x0a, 0x1c, 0x7d, 0xd9, 0x70, 0x3f, 0xf6, 0xa5, 0x8f, 0x9f, 0x8d, - 0x29, 0x9c, 0x7a, 0x31, 0xf9, 0xe5, 0x8f, 0xcc, 0xc5, 0xe4, 0x17, 0x21, 0xb3, 0x84, 0x5b, 0x87, - 0xc0, 0x3f, 0xde, 0x07, 0x7f, 0x42, 0xc0, 0x2f, 0xe1, 0x56, 0x00, 0x7e, 0x09, 0xb7, 0xfa, 0x90, - 0x9f, 0x82, 0xec, 0xb2, 0xe1, 0xb2, 0xaf, 0x15, 0x1e, 0x86, 0x84, 0x6e, 0xb0, 0x03, 0xb0, 0x01, - 0x84, 0x81, 0x06, 0x2a, 0x84, 0x8a, 0x30, 0x2e, 0xe1, 0x96, 0xc7, 0xd8, 0xc6, 0xad, 0x7e, 0xc6, - 0xc1, 0x57, 0x13, 0xaa, 0xda, 0xd2, 0xef, 0xfd, 0xd7, 0xd9, 0x89, 0xd7, 0xde, 0x98, 0x9d, 0x18, - 0x39, 0xf4, 0x72, 0xf4, 0xd0, 0x7b, 0x23, 0xfe, 0x73, 0x49, 0xb8, 0x8f, 0x7e, 0xc4, 0x66, 0x77, - 0x75, 0xc3, 0x3d, 0xd7, 0xb2, 0x0f, 0x2c, 0xd7, 0x24, 0xf3, 0xd7, 0xdc, 0xe1, 0x03, 0x3e, 0xe9, - 0x57, 0x2f, 0xb0, 0xea, 0xe1, 0xc3, 0x2d, 0xef, 0x40, 0x6a, 0x83, 0xf0, 0x11, 0x11, 0xbb, 0xa6, - 0xab, 0x75, 0xb8, 0xd3, 0xc1, 0x1e, 0x48, 0x29, 0xfb, 0xf0, 0x2d, 0xce, 0x4a, 0x75, 0xf1, 0xcd, - 0x5b, 0x07, 0x6b, 0x3b, 0xec, 0xfb, 0x81, 0x04, 0xf5, 0x56, 0xb3, 0xa4, 0x80, 0x7e, 0x2a, 0x30, - 0x0d, 0x29, 0xad, 0xc7, 0x0e, 0xae, 0x24, 0x88, 0x1b, 0x4b, 0x1f, 0xe4, 0xe7, 0x21, 0xc3, 0xb7, - 0xcf, 0x91, 0x04, 0x89, 0x1b, 0xf8, 0x80, 0xbe, 0xa7, 0xa0, 0x90, 0x9f, 0x68, 0x01, 0x52, 0xb4, - 0xf1, 0xfc, 0xc3, 0xa8, 0x99, 0x85, 0x81, 0xd6, 0x2f, 0xd0, 0x46, 0x2a, 0x8c, 0x4c, 0xbe, 0x06, - 0xd9, 0x25, 0x93, 0x68, 0x61, 0x18, 0x2d, 0xc7, 0xd0, 0x68, 0x9b, 0xad, 0x1e, 0xd7, 0x0a, 0x85, - 0x3d, 0xa0, 0x63, 0x90, 0x66, 0xdf, 0x93, 0xf0, 0xc3, 0x37, 0xfc, 0x49, 0xae, 0x43, 0x86, 0x62, - 0xaf, 0x5b, 0x64, 0xc5, 0xf7, 0x8e, 0xee, 0xe6, 0xf8, 0xd7, 0x85, 0x1c, 0x3e, 0xee, 0x37, 0x16, - 0x41, 0xb2, 0xad, 0xb9, 0x1a, 0xef, 0x37, 0xfd, 0x2d, 0xbf, 0x07, 0xb2, 0x1c, 0xc4, 0x41, 0xe7, - 0x21, 0x61, 0x5a, 0x0e, 0x3f, 0x3e, 0x53, 0x19, 0xd5, 0x95, 0x75, 0xab, 0x96, 0x24, 0x3a, 0xa3, - 0x10, 0xe2, 0xda, 0xda, 0x48, 0xb5, 0x78, 0x32, 0xa4, 0x16, 0x5d, 0xec, 0x6e, 0xef, 0xb8, 0xfe, - 0x0f, 0x36, 0x9c, 0x03, 0xaa, 0xe0, 0x29, 0xca, 0x9d, 0x38, 0xcc, 0x06, 0x6a, 0x6f, 0x62, 0xdb, - 0xd1, 0x4d, 0x83, 0x69, 0x13, 0xd7, 0x14, 0x14, 0x68, 0x20, 0xaf, 0x1f, 0xa1, 0x2a, 0xcf, 0x42, - 0xa2, 0x6a, 0x59, 0xa8, 0x02, 0x59, 0xfa, 0xdc, 0x32, 0x99, 0xae, 0x24, 0x15, 0xef, 0x99, 0xd4, - 0x39, 0xe6, 0x8e, 0x7b, 0x4b, 0xb3, 0xbd, 0xcf, 0x2d, 0xc5, 0xb3, 0xfc, 0x0c, 0xe4, 0xea, 0xa6, - 0xe1, 0x60, 0xc3, 0xe9, 0x51, 0x57, 0x76, 0xbb, 0x63, 0xb6, 0x6e, 0x70, 0x04, 0xf6, 0x40, 0x84, - 0xad, 0x59, 0x16, 0xe5, 0x4c, 0x2a, 0xe4, 0x27, 0x9b, 0xaf, 0xb5, 0xf5, 0x91, 0xe2, 0xb9, 0x70, - 0x34, 0xf1, 0xf0, 0x0e, 0xfa, 0x3e, 0x69, 0x0c, 0xee, 0x1d, 0x9c, 0x48, 0x37, 0xf0, 0x81, 0x73, - 0xd4, 0x79, 0xf4, 0x22, 0xe4, 0x36, 0xe8, 0x7d, 0x07, 0xcf, 0xe3, 0x03, 0x54, 0x81, 0x0c, 0x6e, - 0x9f, 0xbf, 0x70, 0xe1, 0xf1, 0x67, 0x98, 0x96, 0x5f, 0x9d, 0x50, 0x44, 0x01, 0x9a, 0x85, 0x9c, - 0x83, 0x5b, 0xd6, 0xf9, 0x0b, 0x17, 0x6f, 0x3c, 0xce, 0xd4, 0xea, 0xea, 0x84, 0xe2, 0x17, 0x2d, - 0x66, 0x49, 0x8f, 0xbf, 0xfc, 0xd1, 0xb9, 0x58, 0x2d, 0x05, 0x09, 0xa7, 0xd7, 0x7d, 0xdb, 0x74, - 0xe3, 0x87, 0x53, 0x30, 0x1f, 0xa8, 0x65, 0x8b, 0xcb, 0x4d, 0xad, 0xa3, 0xb7, 0x35, 0xff, 0x96, - 0x0a, 0x29, 0xd0, 0x7f, 0x4a, 0x31, 0x62, 0xd5, 0x38, 0x54, 0x8a, 0xf2, 0xaf, 0xc6, 0xa0, 0x70, - 0x5d, 0x20, 0x37, 0xb1, 0x8b, 0x2e, 0x01, 0x78, 0x6f, 0x12, 0x53, 0xe5, 0xe4, 0x42, 0xff, 0xbb, - 0x16, 0x3c, 0x1e, 0x25, 0x40, 0x8e, 0x9e, 0xa2, 0x0a, 0x68, 0x99, 0x0e, 0xff, 0xf4, 0x2e, 0x82, - 0xd5, 0x23, 0x46, 0x8f, 0x00, 0xa2, 0x56, 0x4d, 0xbd, 0x69, 0xba, 0xba, 0xb1, 0xab, 0x5a, 0xe6, - 0x2d, 0xfe, 0x41, 0x73, 0x42, 0x91, 0x68, 0xcd, 0x75, 0x5a, 0xb1, 0x41, 0xca, 0x49, 0xa3, 0x73, - 0x1e, 0x0a, 0x89, 0xca, 0xb4, 0x76, 0xdb, 0xc6, 0x8e, 0xc3, 0x0d, 0x97, 0x78, 0x44, 0x97, 0x20, - 0x63, 0xf5, 0xb6, 0x55, 0x61, 0x25, 0xf2, 0xe7, 0xef, 0x1d, 0x36, 0xe7, 0x85, 0x6e, 0xf0, 0x59, - 0x9f, 0xb6, 0x7a, 0xdb, 0x44, 0x53, 0xee, 0x87, 0xc2, 0x90, 0xc6, 0xe4, 0x6f, 0xfa, 0xed, 0xa0, - 0x57, 0x6c, 0xf0, 0x1e, 0xa8, 0x96, 0xad, 0x9b, 0xb6, 0xee, 0x1e, 0xd0, 0x73, 0x6f, 0x09, 0x45, - 0x12, 0x15, 0x1b, 0xbc, 0x5c, 0xbe, 0x01, 0xe5, 0x26, 0xf5, 0xd6, 0xfd, 0x96, 0x5f, 0xf0, 0xdb, - 0x17, 0x8b, 0x6e, 0xdf, 0xc8, 0x96, 0xc5, 0x07, 0x5a, 0x56, 0x5b, 0x1d, 0xa9, 0x99, 0x4f, 0x1c, - 0x4d, 0x33, 0xc3, 0xab, 0xdb, 0x1f, 0x9d, 0x08, 0x4d, 0x4a, 0xee, 0xf5, 0x04, 0x4c, 0xd6, 0xb8, - 0x4a, 0x19, 0x15, 0x88, 0x57, 0x0e, 0x5f, 0x44, 0x2b, 0x11, 0xa6, 0xb3, 0x12, 0x39, 0x7d, 0xe4, - 0x67, 0xa0, 0xb8, 0xa1, 0xd9, 0x6e, 0x13, 0xbb, 0x57, 0xb1, 0xd6, 0xc6, 0x76, 0x78, 0x95, 0x2d, - 0x8a, 0x55, 0x16, 0x41, 0x92, 0x2e, 0xa5, 0x6c, 0x95, 0xa1, 0xbf, 0xe5, 0x3d, 0x48, 0xd2, 0x73, - 0xaf, 0xde, 0x0a, 0xcc, 0x39, 0xd8, 0x0a, 0x4c, 0xec, 0xe7, 0x81, 0x8b, 0x1d, 0x91, 0x2b, 0xa2, - 0x0f, 0xe8, 0x49, 0xb1, 0x8e, 0x26, 0x0e, 0x5f, 0x47, 0xb9, 0x12, 0xf2, 0xd5, 0xb4, 0x03, 0x99, - 0x1a, 0x31, 0xbf, 0xcb, 0x4b, 0x5e, 0x43, 0x62, 0x7e, 0x43, 0xd0, 0x2a, 0x94, 0x2d, 0xcd, 0x76, - 0xe9, 0x27, 0x43, 0x7b, 0xb4, 0x17, 0x5c, 0xcf, 0xe7, 0x06, 0x67, 0x5d, 0xa8, 0xb3, 0xfc, 0x2d, - 0x45, 0x2b, 0x58, 0x28, 0xff, 0xb7, 0x24, 0xa4, 0xb9, 0x30, 0x9e, 0x85, 0x0c, 0x17, 0x2b, 0xd7, - 0xcc, 0xfb, 0x16, 0x06, 0x17, 0xa3, 0x05, 0x6f, 0xd1, 0xe0, 0x78, 0x82, 0x07, 0x3d, 0x04, 0xd9, - 0xd6, 0x9e, 0xa6, 0x1b, 0xaa, 0xde, 0xe6, 0x0e, 0x60, 0xfe, 0x8d, 0xd7, 0xe7, 0x32, 0x75, 0x52, - 0xb6, 0xbc, 0xa4, 0x64, 0x68, 0xe5, 0x72, 0x9b, 0xac, 0xfc, 0x7b, 0x58, 0xdf, 0xdd, 0x73, 0xf9, - 0xec, 0xe2, 0x4f, 0xe8, 0x69, 0x48, 0x12, 0x85, 0xe0, 0x1f, 0x94, 0x56, 0x06, 0x7c, 0x79, 0x2f, - 0x4f, 0x52, 0xcb, 0x92, 0x17, 0x7f, 0xe8, 0xbf, 0xcc, 0xc5, 0x14, 0xca, 0x81, 0xea, 0x50, 0xec, - 0x68, 0x8e, 0xab, 0xd2, 0x55, 0x8b, 0xbc, 0x3e, 0x45, 0x21, 0x4e, 0x0c, 0x0a, 0x84, 0x0b, 0x96, - 0x37, 0x3d, 0x4f, 0xb8, 0x58, 0x51, 0x1b, 0x9d, 0x06, 0x89, 0x82, 0xb4, 0xcc, 0x6e, 0x57, 0x77, - 0x99, 0x2f, 0x95, 0xa6, 0x72, 0x2f, 0x91, 0xf2, 0x3a, 0x2d, 0xa6, 0x1e, 0xd5, 0x49, 0xc8, 0xd1, - 0x4f, 0xd8, 0x28, 0x09, 0x3b, 0x6c, 0x9d, 0x25, 0x05, 0xb4, 0xf2, 0x14, 0x94, 0x7d, 0xdb, 0xc8, - 0x48, 0xb2, 0x0c, 0xc5, 0x2f, 0xa6, 0x84, 0x8f, 0xc1, 0xb4, 0x81, 0xf7, 0xe9, 0xf1, 0xef, 0x10, - 0x75, 0x8e, 0x52, 0x23, 0x52, 0x77, 0x3d, 0xcc, 0xf1, 0x20, 0x94, 0x5a, 0x42, 0xf8, 0x8c, 0x16, - 0x28, 0x6d, 0xd1, 0x2b, 0xa5, 0x64, 0x27, 0x20, 0xab, 0x59, 0x16, 0x23, 0xc8, 0x73, 0xdb, 0x68, - 0x59, 0xb4, 0xea, 0x2c, 0x4c, 0xd2, 0x3e, 0xda, 0xd8, 0xe9, 0x75, 0x5c, 0x0e, 0x52, 0xa0, 0x34, - 0x65, 0x52, 0xa1, 0xb0, 0x72, 0x4a, 0xfb, 0x00, 0x14, 0xf1, 0x4d, 0xbd, 0x8d, 0x8d, 0x16, 0x66, - 0x74, 0x45, 0x4a, 0x57, 0x10, 0x85, 0x94, 0xe8, 0x0c, 0x78, 0x36, 0x4f, 0x15, 0xf6, 0xb8, 0xc4, - 0xf0, 0x44, 0x79, 0x95, 0x15, 0xcb, 0x33, 0x90, 0x5c, 0xd2, 0x5c, 0x8d, 0x38, 0x15, 0xee, 0x3e, - 0x5b, 0x64, 0x0a, 0x0a, 0xf9, 0x29, 0x7f, 0x39, 0x0e, 0xc9, 0xeb, 0xa6, 0x8b, 0xd1, 0x13, 0x01, - 0x87, 0xaf, 0x34, 0x4c, 0x9f, 0x9b, 0xfa, 0xae, 0x81, 0xdb, 0xab, 0xce, 0x6e, 0xe0, 0xbe, 0x09, - 0x5f, 0x9d, 0xe2, 0x21, 0x75, 0x9a, 0x86, 0x94, 0x6d, 0xf6, 0x8c, 0xb6, 0x38, 0xa7, 0x4c, 0x1f, - 0x50, 0x03, 0xb2, 0x9e, 0x96, 0x24, 0xa3, 0xb4, 0xa4, 0x4c, 0xb4, 0x84, 0xe8, 0x30, 0x2f, 0x50, - 0x32, 0xdb, 0x5c, 0x59, 0x6a, 0x90, 0xf3, 0x8c, 0x17, 0xd7, 0xb6, 0xf1, 0x14, 0xd6, 0x67, 0x23, - 0x0b, 0x89, 0x37, 0xf6, 0x9e, 0xf0, 0x98, 0xc6, 0x49, 0x5e, 0x05, 0x97, 0x5e, 0x48, 0xad, 0xf8, - 0xdd, 0x17, 0x19, 0xda, 0x2f, 0x5f, 0xad, 0xd8, 0xfd, 0x17, 0xf7, 0x42, 0xce, 0xd1, 0x77, 0x0d, - 0xcd, 0xed, 0xd9, 0x98, 0x6b, 0x9e, 0x5f, 0x20, 0x7f, 0x26, 0x06, 0x69, 0xa6, 0xc9, 0x01, 0xb9, - 0xc5, 0x86, 0xcb, 0x2d, 0x3e, 0x4a, 0x6e, 0x89, 0xbb, 0x97, 0x5b, 0x15, 0xc0, 0x6b, 0x8c, 0xc3, - 0xaf, 0x24, 0x18, 0xe2, 0x2d, 0xb0, 0x26, 0x36, 0xf5, 0x5d, 0x3e, 0x51, 0x03, 0x4c, 0xf2, 0x7f, - 0x8e, 0x11, 0xc7, 0x95, 0xd7, 0xa3, 0x2a, 0x14, 0x45, 0xbb, 0xd4, 0x9d, 0x8e, 0xb6, 0xcb, 0x75, - 0xe7, 0xbe, 0x91, 0x8d, 0xbb, 0xdc, 0xd1, 0x76, 0x95, 0x3c, 0x6f, 0x0f, 0x79, 0x18, 0x3e, 0x0e, - 0xf1, 0x11, 0xe3, 0x10, 0x1a, 0xf8, 0xc4, 0xdd, 0x0d, 0x7c, 0x68, 0x88, 0x92, 0xfd, 0x43, 0xf4, - 0x89, 0x38, 0x0d, 0x5e, 0x2c, 0xd3, 0xd1, 0x3a, 0xef, 0xc4, 0x8c, 0x38, 0x09, 0x39, 0xcb, 0xec, - 0xa8, 0xac, 0x86, 0x9d, 0xdf, 0xcf, 0x5a, 0x66, 0x47, 0x19, 0x18, 0xf6, 0xd4, 0x5b, 0x34, 0x5d, - 0xd2, 0x6f, 0x81, 0xd4, 0x32, 0xfd, 0x52, 0xb3, 0xa1, 0xc0, 0x44, 0xc1, 0xd7, 0xb2, 0xc7, 0x88, - 0x0c, 0xe8, 0xe2, 0x18, 0x1b, 0x5c, 0x7b, 0x59, 0xb3, 0x19, 0xa5, 0xc2, 0xe9, 0x08, 0x07, 0x33, - 0xfd, 0xc3, 0xa2, 0xde, 0xa0, 0x5a, 0x2a, 0x9c, 0x4e, 0xfe, 0xe1, 0x18, 0xc0, 0x0a, 0x91, 0x2c, - 0xed, 0x2f, 0x59, 0x85, 0x1c, 0xda, 0x04, 0x35, 0xf4, 0xe6, 0xd9, 0x51, 0x83, 0xc6, 0xdf, 0x5f, - 0x70, 0x82, 0xed, 0xae, 0x43, 0xd1, 0x57, 0x46, 0x07, 0x8b, 0xc6, 0xcc, 0x1e, 0xe2, 0x51, 0x37, - 0xb1, 0xab, 0x14, 0x6e, 0x06, 0x9e, 0xe4, 0x7f, 0x19, 0x83, 0x1c, 0x6d, 0xd3, 0x2a, 0x76, 0xb5, - 0xd0, 0x18, 0xc6, 0xee, 0x7e, 0x0c, 0xef, 0x03, 0x60, 0x30, 0x8e, 0xfe, 0x2a, 0xe6, 0x9a, 0x95, - 0xa3, 0x25, 0x4d, 0xfd, 0x55, 0x8c, 0x2e, 0x7a, 0x02, 0x4f, 0x1c, 0x2e, 0x70, 0xe1, 0x71, 0x73, - 0xb1, 0x1f, 0x87, 0x0c, 0xbd, 0xc2, 0x6b, 0xdf, 0xe1, 0x4e, 0x74, 0xda, 0xe8, 0x75, 0x37, 0xf7, - 0x1d, 0xf9, 0x15, 0xc8, 0x6c, 0xee, 0xb3, 0x5c, 0xc8, 0x49, 0xc8, 0xd9, 0xa6, 0xc9, 0xd7, 0x64, - 0xe6, 0x0b, 0x65, 0x49, 0x01, 0x5d, 0x82, 0x44, 0xfc, 0x1f, 0xf7, 0xe3, 0x7f, 0x3f, 0x81, 0x91, - 0x18, 0x2b, 0x81, 0x71, 0xf6, 0x3f, 0xc5, 0x20, 0x1f, 0xb0, 0x0f, 0xe8, 0x71, 0xb8, 0xa7, 0xb6, - 0xb2, 0x5e, 0x7f, 0x5e, 0x5d, 0x5e, 0x52, 0x2f, 0xaf, 0x54, 0xaf, 0xf8, 0x5f, 0xa8, 0x55, 0x8e, - 0xdd, 0xbe, 0x33, 0x8f, 0x02, 0xb4, 0x5b, 0x06, 0xdd, 0x8c, 0x41, 0xe7, 0x60, 0x3a, 0xcc, 0x52, - 0xad, 0x35, 0x1b, 0x6b, 0x9b, 0x52, 0xac, 0x72, 0xcf, 0xed, 0x3b, 0xf3, 0x93, 0x01, 0x8e, 0xea, - 0xb6, 0x83, 0x0d, 0x77, 0x90, 0xa1, 0xbe, 0xbe, 0xba, 0xba, 0xbc, 0x29, 0xc5, 0x07, 0x18, 0xb8, - 0xc1, 0x3e, 0x03, 0x93, 0x61, 0x86, 0xb5, 0xe5, 0x15, 0x29, 0x51, 0x41, 0xb7, 0xef, 0xcc, 0x97, - 0x02, 0xd4, 0x6b, 0x7a, 0xa7, 0x92, 0xfd, 0xe0, 0x4f, 0xcf, 0x4e, 0x7c, 0xec, 0x67, 0x66, 0x63, - 0xa4, 0x67, 0xc5, 0x90, 0x8d, 0x40, 0x8f, 0xc0, 0xf1, 0xe6, 0xf2, 0x95, 0xb5, 0xc6, 0x92, 0xba, - 0xda, 0xbc, 0x22, 0xb6, 0x33, 0x44, 0xef, 0xca, 0xb7, 0xef, 0xcc, 0xe7, 0x79, 0x97, 0x46, 0x51, - 0x6f, 0x28, 0x8d, 0xeb, 0xeb, 0x9b, 0x0d, 0x29, 0xc6, 0xa8, 0x37, 0x6c, 0x7c, 0xd3, 0x74, 0xd9, - 0x1d, 0x7f, 0x8f, 0xc1, 0x89, 0x21, 0xd4, 0x5e, 0xc7, 0x26, 0x6f, 0xdf, 0x99, 0x2f, 0x6e, 0xd8, - 0x98, 0xcd, 0x1f, 0xca, 0xb1, 0x00, 0x33, 0x83, 0x1c, 0xeb, 0x1b, 0xeb, 0xcd, 0xea, 0x8a, 0x34, - 0x5f, 0x91, 0x6e, 0xdf, 0x99, 0x2f, 0x08, 0x63, 0x48, 0xe8, 0xfd, 0x9e, 0xbd, 0x5d, 0xd1, 0xce, - 0xf7, 0x64, 0x42, 0xb9, 0x3c, 0x16, 0x47, 0x58, 0x9a, 0xad, 0x75, 0x8f, 0x1a, 0xee, 0x44, 0xec, - 0xc6, 0xca, 0xaf, 0xc5, 0xa1, 0xec, 0x39, 0xd3, 0x1b, 0xf4, 0x0d, 0xe8, 0x89, 0x60, 0x1e, 0x26, - 0x3f, 0x72, 0x19, 0x63, 0xd4, 0x22, 0x4d, 0xf3, 0x6e, 0xc8, 0x0a, 0xa7, 0x8c, 0x9b, 0x8b, 0xf9, - 0x41, 0xbe, 0x06, 0xa7, 0xe0, 0xac, 0x1e, 0x07, 0x7a, 0x0e, 0x72, 0x9e, 0xf1, 0xf0, 0x6e, 0xc8, - 0x19, 0x6d, 0x6d, 0x38, 0xbf, 0xcf, 0x83, 0x9e, 0xf1, 0xc3, 0x86, 0xe4, 0xa8, 0x40, 0xe4, 0x3a, - 0x23, 0xe0, 0xcc, 0x82, 0x5e, 0x5e, 0xe6, 0xd3, 0x8e, 0xf7, 0x9e, 0xde, 0x2e, 0xb0, 0xaf, 0xb2, - 0x48, 0x8a, 0x79, 0x25, 0xd9, 0xae, 0xb6, 0x5f, 0xa3, 0xc1, 0xd4, 0x71, 0xc8, 0x90, 0xca, 0x5d, - 0xfe, 0xf1, 0x74, 0x42, 0x49, 0x77, 0xb5, 0xfd, 0x2b, 0x9a, 0x73, 0x2d, 0x99, 0x4d, 0x48, 0x49, - 0xf9, 0x17, 0x62, 0x50, 0x0a, 0xf7, 0x11, 0x3d, 0x0c, 0x88, 0x70, 0x68, 0xbb, 0x58, 0x25, 0x26, - 0x86, 0x0a, 0x4b, 0xe0, 0x96, 0xbb, 0xda, 0x7e, 0x75, 0x17, 0xaf, 0xf5, 0xba, 0xb4, 0x01, 0x0e, - 0x5a, 0x05, 0x49, 0x10, 0x8b, 0x71, 0xe2, 0xc2, 0x3c, 0x31, 0x78, 0x5f, 0x1e, 0x27, 0x60, 0x0b, - 0xd5, 0x87, 0xc9, 0x42, 0x55, 0x62, 0x78, 0xde, 0x6e, 0x7a, 0xa8, 0x2b, 0x89, 0x70, 0x57, 0xe4, - 0xe7, 0xa0, 0xdc, 0x27, 0x4f, 0x24, 0x43, 0x91, 0x67, 0x05, 0xe8, 0x4e, 0x25, 0xf3, 0x8f, 0x73, - 0x4a, 0x9e, 0x45, 0xff, 0x74, 0xe7, 0x76, 0x31, 0xfb, 0xe9, 0x8f, 0xcc, 0xc5, 0x68, 0xc2, 0xfc, - 0x61, 0x28, 0x86, 0x24, 0x2a, 0x32, 0x75, 0x31, 0x3f, 0x53, 0xe7, 0x13, 0xbf, 0x0c, 0x05, 0x62, - 0x28, 0x71, 0x9b, 0xd3, 0x3e, 0x04, 0x65, 0x66, 0xc8, 0xfb, 0x65, 0xcd, 0x3c, 0xa9, 0x55, 0x21, - 0x70, 0x59, 0xb8, 0x56, 0x61, 0xb1, 0xe7, 0x05, 0xd5, 0x15, 0xcd, 0xa9, 0xbd, 0xf7, 0x63, 0x6f, - 0xcc, 0xc6, 0xde, 0x9e, 0x89, 0xf8, 0xf9, 0xf7, 0xc2, 0xc9, 0x40, 0xa5, 0xb6, 0xdd, 0xd2, 0x43, - 0x59, 0x87, 0x72, 0x40, 0xc9, 0x48, 0x65, 0x54, 0xf6, 0xe0, 0xd0, 0x1c, 0xc6, 0xe1, 0x09, 0xb3, - 0xca, 0xe1, 0x16, 0x21, 0x3a, 0xb1, 0x31, 0x3c, 0x47, 0xf9, 0x7f, 0xb3, 0x90, 0x51, 0xf0, 0xfb, - 0x7b, 0xd8, 0x71, 0xd1, 0x79, 0x48, 0xe2, 0xd6, 0x9e, 0x39, 0x2c, 0x25, 0x44, 0x3a, 0xb7, 0xc0, - 0xe9, 0x1a, 0xad, 0x3d, 0xf3, 0xea, 0x84, 0x42, 0x69, 0xd1, 0x05, 0x48, 0xed, 0x74, 0x7a, 0x3c, - 0x4f, 0xd1, 0x67, 0x2c, 0x82, 0x4c, 0x97, 0x09, 0xd1, 0xd5, 0x09, 0x85, 0x51, 0x93, 0x57, 0xd1, - 0x9b, 0x47, 0x13, 0x87, 0xbf, 0x6a, 0xd9, 0xd8, 0xa1, 0xaf, 0x22, 0xb4, 0xa8, 0x06, 0xa0, 0x1b, - 0xba, 0xab, 0xd2, 0x18, 0x9e, 0x7b, 0x82, 0xf7, 0x8f, 0xe6, 0xd4, 0x5d, 0x1a, 0xf5, 0x5f, 0x9d, - 0x50, 0x72, 0xba, 0x78, 0x20, 0xcd, 0x7d, 0x7f, 0x0f, 0xdb, 0x07, 0xdc, 0x01, 0x1c, 0xd9, 0xdc, - 0xf7, 0x12, 0x22, 0xd2, 0x5c, 0x4a, 0x8d, 0x1a, 0x90, 0xa7, 0x9f, 0x98, 0xb2, 0xf9, 0xcb, 0x6f, - 0xc1, 0x94, 0x47, 0x31, 0xd7, 0x08, 0x29, 0x9d, 0xd2, 0x57, 0x27, 0x14, 0xd8, 0xf6, 0x9e, 0x88, - 0x91, 0x64, 0xb7, 0x24, 0xb9, 0xfb, 0xfc, 0xee, 0xbf, 0xb9, 0x51, 0x18, 0xf4, 0xaa, 0xa4, 0xcd, - 0xfd, 0xab, 0x13, 0x4a, 0xa6, 0xc5, 0x7e, 0x92, 0xfe, 0xb7, 0x71, 0x47, 0xbf, 0x89, 0x6d, 0xc2, - 0x9f, 0x3b, 0xbc, 0xff, 0x4b, 0x8c, 0x92, 0x22, 0xe4, 0xda, 0xe2, 0x81, 0x18, 0x5a, 0x6c, 0xb4, - 0x79, 0x37, 0x60, 0xd0, 0x4e, 0x87, 0xc6, 0xd9, 0x68, 0x8b, 0x4e, 0x64, 0x31, 0xff, 0x8d, 0x9e, - 0xf6, 0x3c, 0xd4, 0xfc, 0xa0, 0x53, 0x18, 0xea, 0x00, 0xcb, 0x55, 0x4c, 0x08, 0x4f, 0x15, 0xad, - 0x41, 0xa9, 0xa3, 0x3b, 0xae, 0xea, 0x18, 0x9a, 0xe5, 0xec, 0x99, 0xae, 0x43, 0x83, 0xfe, 0xfc, - 0xf9, 0x07, 0x47, 0x21, 0xac, 0xe8, 0x8e, 0xdb, 0x14, 0xc4, 0x57, 0x27, 0x94, 0x62, 0x27, 0x58, - 0x40, 0xf0, 0xcc, 0x9d, 0x1d, 0x6c, 0x7b, 0x80, 0x34, 0x39, 0x70, 0x08, 0xde, 0x3a, 0xa1, 0x16, - 0xfc, 0x04, 0xcf, 0x0c, 0x16, 0xa0, 0x6f, 0x85, 0xa9, 0x8e, 0xa9, 0xb5, 0x3d, 0x38, 0xb5, 0xb5, - 0xd7, 0x33, 0x6e, 0xd0, 0x4c, 0x42, 0xfe, 0xfc, 0x99, 0x91, 0x8d, 0x34, 0xb5, 0xb6, 0x80, 0xa8, - 0x13, 0x86, 0xab, 0x13, 0xca, 0x64, 0xa7, 0xbf, 0x10, 0xbd, 0x0f, 0xa6, 0x35, 0xcb, 0xea, 0x1c, - 0xf4, 0xa3, 0x97, 0x29, 0xfa, 0xd9, 0x51, 0xe8, 0x55, 0xc2, 0xd3, 0x0f, 0x8f, 0xb4, 0x81, 0x52, - 0xb4, 0x09, 0x92, 0x65, 0x63, 0xfa, 0x4d, 0x8c, 0xc5, 0x5d, 0x15, 0x7a, 0xb1, 0x55, 0xfe, 0xfc, - 0xa9, 0x51, 0xd8, 0x1b, 0x8c, 0x5e, 0x78, 0x36, 0x57, 0x27, 0x94, 0xb2, 0x15, 0x2e, 0x62, 0xa8, - 0x66, 0x0b, 0xd3, 0xcb, 0x97, 0x38, 0xea, 0x64, 0x14, 0x2a, 0xa5, 0x0f, 0xa3, 0x86, 0x8a, 0x6a, - 0x19, 0x7e, 0xa6, 0x8d, 0xdf, 0x8c, 0x72, 0x0a, 0xf2, 0x01, 0xc3, 0x82, 0x66, 0x20, 0xc3, 0xf7, - 0xf8, 0xc5, 0x59, 0x38, 0xfe, 0x28, 0x97, 0xa0, 0x10, 0x34, 0x26, 0xf2, 0x87, 0x62, 0x1e, 0x27, - 0xfd, 0x54, 0x7d, 0x26, 0x9c, 0x3a, 0xcc, 0xf9, 0x59, 0xc1, 0x07, 0xc4, 0x2a, 0x22, 0xea, 0xd9, - 0x6e, 0x52, 0x81, 0x16, 0xf2, 0x45, 0x0c, 0xcd, 0x41, 0xde, 0x3a, 0x6f, 0x79, 0x24, 0x09, 0x4a, - 0x02, 0xd6, 0x79, 0x4b, 0x10, 0xdc, 0x0f, 0x05, 0xd2, 0x53, 0x35, 0xe8, 0x68, 0xe4, 0x94, 0x3c, - 0x29, 0xe3, 0x24, 0xf2, 0xbf, 0x8d, 0x83, 0xd4, 0x6f, 0x80, 0xbc, 0x9c, 0x62, 0xec, 0xc8, 0x39, - 0xc5, 0x13, 0xfd, 0xd9, 0x4c, 0x3f, 0x81, 0xb9, 0x02, 0x92, 0x9f, 0x87, 0x63, 0x0b, 0xc1, 0x68, - 0xc7, 0xa9, 0xcf, 0xc3, 0x53, 0xca, 0xad, 0x3e, 0x97, 0xef, 0x72, 0x68, 0xef, 0x45, 0x5c, 0xad, - 0xdd, 0x3f, 0xc4, 0x9e, 0xbf, 0xb0, 0x65, 0xb5, 0x35, 0x17, 0x8b, 0xbc, 0x48, 0x60, 0x1b, 0xe6, - 0x21, 0x28, 0x6b, 0x96, 0xa5, 0x3a, 0xae, 0xe6, 0x62, 0xbe, 0xac, 0xa7, 0x58, 0x7a, 0x50, 0xb3, - 0xac, 0x26, 0x29, 0x65, 0xcb, 0xfa, 0x83, 0x50, 0x22, 0x36, 0x59, 0xd7, 0x3a, 0x2a, 0xcf, 0x12, - 0xa4, 0xd9, 0xea, 0xcf, 0x4b, 0xaf, 0xd2, 0x42, 0xb9, 0xed, 0x8d, 0x38, 0xb5, 0xc7, 0x5e, 0x98, - 0x15, 0x0b, 0x84, 0x59, 0x88, 0xdf, 0x21, 0xc0, 0xe4, 0x23, 0xae, 0x5d, 0x18, 0x9e, 0xdd, 0x9d, - 0xa6, 0x21, 0xd9, 0x4d, 0x96, 0xf0, 0xc8, 0x2a, 0xec, 0x41, 0xfe, 0x40, 0x1c, 0x26, 0x07, 0x2c, - 0xf7, 0xd0, 0xb4, 0xb7, 0x1f, 0x5f, 0xc6, 0x8f, 0x14, 0x5f, 0x3e, 0x1f, 0x4e, 0xeb, 0x06, 0x56, - 0xbe, 0x93, 0x03, 0x42, 0x66, 0x76, 0x93, 0x28, 0x34, 0x07, 0x09, 0x64, 0x7e, 0xa9, 0x9a, 0x6f, - 0xc1, 0xf4, 0xf6, 0xc1, 0xab, 0x9a, 0xe1, 0xea, 0x06, 0x56, 0x07, 0x46, 0x6d, 0x70, 0x29, 0x5d, - 0xd5, 0x9d, 0x6d, 0xbc, 0xa7, 0xdd, 0xd4, 0x4d, 0xd1, 0xac, 0x29, 0x8f, 0xdf, 0x4f, 0xee, 0xca, - 0x0a, 0x94, 0xc2, 0x4b, 0x0f, 0x2a, 0x41, 0xdc, 0xdd, 0xe7, 0xfd, 0x8f, 0xbb, 0xfb, 0xe8, 0x31, - 0x9e, 0x07, 0x8a, 0xd3, 0x3c, 0xd0, 0xe0, 0x8b, 0x38, 0x9f, 0x9f, 0x04, 0x92, 0x65, 0x6f, 0x36, - 0x78, 0xcb, 0x51, 0x3f, 0xaa, 0x7c, 0x06, 0xca, 0x7d, 0xeb, 0xcd, 0xa8, 0xac, 0xa0, 0x5c, 0x86, - 0x62, 0x68, 0x71, 0x91, 0x8f, 0xc1, 0xf4, 0xb0, 0xb5, 0x42, 0xde, 0xf3, 0xca, 0x43, 0x36, 0x1f, - 0x5d, 0x80, 0xac, 0xb7, 0x58, 0x0c, 0xc9, 0x42, 0xd0, 0x5e, 0x08, 0x62, 0xc5, 0x23, 0x0d, 0x25, - 0xb3, 0xe3, 0xa1, 0x64, 0xb6, 0xfc, 0xed, 0x30, 0x33, 0x6a, 0x21, 0xe8, 0xeb, 0x46, 0xd2, 0xd3, - 0xc2, 0x63, 0x90, 0xe6, 0x37, 0xac, 0xc5, 0xe9, 0xf6, 0x0d, 0x7f, 0x22, 0xda, 0xc9, 0x16, 0x85, - 0x04, 0xdb, 0xd5, 0xa1, 0x0f, 0xb2, 0x0a, 0x27, 0x46, 0x2e, 0x06, 0xa3, 0x37, 0x82, 0x18, 0x10, - 0xdf, 0x08, 0x6a, 0x89, 0xe6, 0x38, 0xb4, 0xaf, 0xe2, 0xb0, 0x03, 0x7b, 0x92, 0x3f, 0x9c, 0x80, - 0x63, 0xc3, 0x97, 0x04, 0x34, 0x0f, 0x05, 0xe2, 0x77, 0xbb, 0x61, 0x17, 0x1d, 0xba, 0xda, 0xfe, - 0x26, 0xf7, 0xcf, 0x79, 0x22, 0x3d, 0xee, 0x25, 0xd2, 0xd1, 0x16, 0x4c, 0x76, 0xcc, 0x96, 0xd6, - 0x51, 0x03, 0x1a, 0xcf, 0x95, 0xfd, 0x81, 0x01, 0x61, 0x37, 0xd8, 0xbd, 0xcb, 0xed, 0x01, 0xa5, - 0x2f, 0x53, 0x8c, 0x15, 0x4f, 0xf3, 0xd1, 0x12, 0xe4, 0xbb, 0xbe, 0x22, 0x1f, 0x41, 0xd9, 0x83, - 0x6c, 0x81, 0x21, 0x49, 0x0d, 0xdd, 0xf6, 0x49, 0x1f, 0xd9, 0x44, 0x8f, 0xda, 0x41, 0xc9, 0x8c, - 0xdc, 0x41, 0x19, 0xb6, 0x5d, 0x91, 0x1d, 0xbe, 0x5d, 0xf1, 0xc1, 0xe0, 0xd0, 0x84, 0x16, 0xd1, - 0xc1, 0x1d, 0x0c, 0xd4, 0x84, 0x69, 0xce, 0xdf, 0x0e, 0xc9, 0x3e, 0x3e, 0xae, 0xa1, 0x41, 0x82, - 0x7d, 0xb4, 0xd8, 0x13, 0x77, 0x27, 0x76, 0x61, 0x4b, 0x93, 0x01, 0x5b, 0xfa, 0xff, 0xd9, 0x50, - 0xfc, 0x87, 0x1c, 0x64, 0x15, 0xec, 0x58, 0x64, 0xe1, 0x44, 0x35, 0xc8, 0xe1, 0xfd, 0x16, 0xb6, - 0x5c, 0x7f, 0x9b, 0x72, 0x58, 0x30, 0xc0, 0xa8, 0x1b, 0x82, 0x92, 0x78, 0xe2, 0x1e, 0x1b, 0x7a, - 0x82, 0x07, 0x5b, 0xa3, 0xe3, 0x26, 0xce, 0x1e, 0x8c, 0xb6, 0x2e, 0x8a, 0x68, 0x2b, 0x31, 0xd2, - 0xf9, 0x66, 0x5c, 0x7d, 0xe1, 0xd6, 0x13, 0x3c, 0xdc, 0x4a, 0x46, 0xbc, 0x2c, 0x14, 0x6f, 0xd5, - 0x43, 0xf1, 0x56, 0x3a, 0xa2, 0x9b, 0x23, 0x02, 0xae, 0x8b, 0x22, 0xe0, 0xca, 0x44, 0xb4, 0xb8, - 0x2f, 0xe2, 0xba, 0x1c, 0x8e, 0xb8, 0xb2, 0x23, 0x0c, 0x88, 0xe0, 0x1e, 0x19, 0x72, 0x3d, 0x1b, - 0x08, 0xb9, 0x72, 0x23, 0xe3, 0x1d, 0x06, 0x32, 0x24, 0xe6, 0xaa, 0x87, 0x62, 0x2e, 0x88, 0x90, - 0xc1, 0x88, 0xa0, 0xeb, 0x5b, 0x82, 0x41, 0x57, 0x7e, 0x64, 0xdc, 0xc6, 0xc7, 0x7b, 0x58, 0xd4, - 0xf5, 0x8c, 0x17, 0x75, 0x15, 0x46, 0x86, 0x8d, 0xbc, 0x0f, 0xfd, 0x61, 0xd7, 0xfa, 0x40, 0xd8, - 0x55, 0xe4, 0x7f, 0xd2, 0x60, 0x14, 0x44, 0x44, 0xdc, 0xb5, 0x3e, 0x10, 0x77, 0x95, 0x22, 0x00, - 0x23, 0x02, 0xaf, 0xbf, 0x31, 0x3c, 0xf0, 0x1a, 0x1d, 0x1a, 0xf1, 0x66, 0x8e, 0x17, 0x79, 0xa9, - 0x23, 0x22, 0x2f, 0x16, 0x1d, 0x3d, 0x3c, 0x12, 0x7e, 0xec, 0xd0, 0x6b, 0x6b, 0x48, 0xe8, 0xc5, - 0x82, 0xa4, 0xd3, 0x23, 0xc1, 0xc7, 0x88, 0xbd, 0xb6, 0x86, 0xc4, 0x5e, 0x28, 0x12, 0xf6, 0x28, - 0xc1, 0x57, 0x4a, 0x4a, 0xcb, 0x67, 0x88, 0xeb, 0xdb, 0x67, 0xa7, 0x88, 0xff, 0x80, 0x6d, 0xdb, - 0xb4, 0xc5, 0xc9, 0x5a, 0xfa, 0x20, 0x9f, 0x26, 0xce, 0xb8, 0x6f, 0x93, 0x0e, 0x09, 0xd4, 0xa8, - 0x9f, 0x16, 0xb0, 0x43, 0xf2, 0xa7, 0x63, 0x3e, 0x2f, 0xf5, 0x61, 0x83, 0x8e, 0x7c, 0x8e, 0x3b, - 0xf2, 0x81, 0xf0, 0x2d, 0x1e, 0x0e, 0xdf, 0xe6, 0x20, 0x4f, 0xfc, 0xaf, 0xbe, 0xc8, 0x4c, 0xb3, - 0xbc, 0xc8, 0x4c, 0x1c, 0x29, 0x60, 0x41, 0x1e, 0x5f, 0x56, 0xd8, 0x4e, 0x4e, 0xd9, 0x3b, 0x5e, - 0xc1, 0x62, 0x0a, 0xf4, 0x28, 0x4c, 0x05, 0x68, 0x3d, 0xbf, 0x8e, 0x85, 0x29, 0x92, 0x47, 0x5d, - 0xe5, 0x0e, 0xde, 0xbf, 0x8a, 0xf9, 0x12, 0xf2, 0x43, 0xba, 0x61, 0xd1, 0x57, 0xec, 0x2d, 0x8a, - 0xbe, 0xe2, 0x77, 0x1d, 0x7d, 0x05, 0xfd, 0xd4, 0x44, 0xd8, 0x4f, 0xfd, 0x9f, 0x31, 0x7f, 0x4c, - 0xbc, 0x58, 0xaa, 0x65, 0xb6, 0x31, 0xf7, 0x1c, 0xe9, 0x6f, 0xe2, 0x54, 0x74, 0xcc, 0x5d, 0xee, - 0x1f, 0x92, 0x9f, 0x84, 0xca, 0x5b, 0x38, 0x72, 0x7c, 0x5d, 0xf0, 0x9c, 0xce, 0x54, 0xf0, 0xfc, - 0x2f, 0x3f, 0x14, 0x9b, 0xf6, 0x0f, 0xc5, 0x7a, 0xdf, 0xae, 0x65, 0x02, 0xdf, 0xae, 0xa1, 0xa7, - 0x21, 0x47, 0x33, 0xa2, 0xaa, 0x69, 0x89, 0x3f, 0x80, 0x71, 0x72, 0xf4, 0x81, 0x58, 0x87, 0x1e, - 0xd5, 0x63, 0x87, 0x68, 0x7d, 0x8f, 0x21, 0x17, 0xf2, 0x18, 0xee, 0x85, 0x1c, 0x69, 0x3d, 0xbb, - 0xc8, 0x19, 0xf8, 0x87, 0x8f, 0xa2, 0x40, 0x7e, 0x1f, 0xa0, 0xc1, 0x45, 0x02, 0x5d, 0x85, 0x34, - 0xbe, 0x49, 0x6f, 0xc5, 0x63, 0x07, 0x0d, 0x8f, 0x0d, 0xba, 0xa6, 0xa4, 0xba, 0x36, 0x43, 0x84, - 0xfc, 0x95, 0xd7, 0xe7, 0x24, 0x46, 0xfd, 0x88, 0x77, 0xce, 0x5f, 0xe1, 0xfc, 0xf2, 0x1f, 0xc4, - 0x49, 0x00, 0x13, 0x5a, 0x40, 0x86, 0xca, 0x76, 0xd8, 0x16, 0xe1, 0x78, 0xf2, 0x9e, 0x05, 0xd8, - 0xd5, 0x1c, 0xf5, 0x96, 0x66, 0xb8, 0xb8, 0xcd, 0x85, 0x1e, 0x28, 0x41, 0x15, 0xc8, 0x92, 0xa7, - 0x9e, 0x83, 0xdb, 0x3c, 0x8c, 0xf6, 0x9e, 0x03, 0xfd, 0xcc, 0x7c, 0x63, 0xfd, 0x0c, 0x4b, 0x39, - 0xdb, 0x27, 0xe5, 0x40, 0x70, 0x91, 0x0b, 0x06, 0x17, 0xec, 0x60, 0x30, 0x3f, 0x9f, 0x08, 0xac, - 0x6d, 0xe2, 0x19, 0x3d, 0x00, 0xc5, 0x2e, 0xee, 0x5a, 0xa6, 0xd9, 0x51, 0x99, 0xb9, 0x61, 0x37, - 0xb6, 0x17, 0x78, 0x61, 0x83, 0x5a, 0x9d, 0xef, 0x8e, 0xfb, 0xf3, 0xcf, 0x0f, 0x22, 0xbf, 0xe9, - 0x04, 0x2c, 0x7f, 0x1f, 0xcd, 0x2c, 0x85, 0x5d, 0x04, 0xd4, 0x0c, 0x9e, 0x1a, 0xe9, 0x51, 0xb3, - 0x20, 0x14, 0x7a, 0x5c, 0xfb, 0xe1, 0x9f, 0x2e, 0x61, 0xc5, 0x0e, 0x7a, 0x09, 0x8e, 0xf7, 0xd9, - 0x36, 0x0f, 0x3a, 0x3e, 0xae, 0x89, 0xbb, 0x27, 0x6c, 0xe2, 0x04, 0xb4, 0x2f, 0xac, 0xc4, 0x37, - 0x38, 0xeb, 0x96, 0xa1, 0x14, 0xf6, 0x78, 0x86, 0x0e, 0x3f, 0xfd, 0x0b, 0x21, 0xae, 0xa6, 0x1b, - 0x6a, 0x28, 0x1d, 0x54, 0x60, 0x85, 0x3c, 0xc9, 0xb4, 0x01, 0xf7, 0x0c, 0xf5, 0x7c, 0xd0, 0x53, - 0x90, 0xf3, 0x9d, 0x26, 0x26, 0xd5, 0x43, 0xd2, 0x05, 0x3e, 0xad, 0xfc, 0x1b, 0x31, 0x1f, 0x32, - 0x9c, 0x80, 0x68, 0x40, 0x9a, 0x1d, 0x7b, 0xe3, 0x87, 0x69, 0x1e, 0x1d, 0xcf, 0x67, 0x5a, 0x60, - 0x67, 0xe2, 0x14, 0xce, 0x2c, 0xbf, 0x0f, 0xd2, 0xac, 0x04, 0xe5, 0x21, 0xe3, 0x5f, 0x5c, 0x0b, - 0x90, 0xae, 0xd6, 0xeb, 0x8d, 0x8d, 0x4d, 0x29, 0x86, 0x72, 0x90, 0xaa, 0xd6, 0xd6, 0x95, 0x4d, - 0x29, 0x4e, 0x8a, 0x95, 0xc6, 0xb5, 0x46, 0x7d, 0x53, 0x4a, 0xa0, 0x49, 0x28, 0xb2, 0xdf, 0xea, - 0xe5, 0x75, 0x65, 0xb5, 0xba, 0x29, 0x25, 0x03, 0x45, 0xcd, 0xc6, 0xda, 0x52, 0x43, 0x91, 0x52, - 0xf2, 0xe3, 0x70, 0x62, 0xa4, 0x97, 0xe5, 0x67, 0x17, 0x62, 0x81, 0xec, 0x82, 0xfc, 0xe1, 0x38, - 0x54, 0x46, 0xbb, 0x4e, 0xe8, 0x5a, 0x5f, 0xc7, 0xcf, 0x1f, 0xc1, 0xef, 0xea, 0xeb, 0x3d, 0x7a, - 0x10, 0x4a, 0x36, 0xde, 0xc1, 0x6e, 0x6b, 0x8f, 0xb9, 0x72, 0x6c, 0xc9, 0x2c, 0x2a, 0x45, 0x5e, - 0x4a, 0x99, 0x1c, 0x46, 0xf6, 0x0a, 0x6e, 0xb9, 0x2a, 0xb3, 0x45, 0x0e, 0xff, 0x53, 0x85, 0x45, - 0x56, 0xda, 0x64, 0x85, 0xf2, 0xb7, 0x1f, 0x49, 0x96, 0x39, 0x48, 0x29, 0x8d, 0x4d, 0xe5, 0x25, - 0x29, 0x81, 0x10, 0x94, 0xe8, 0x4f, 0xb5, 0xb9, 0x56, 0xdd, 0x68, 0x5e, 0x5d, 0x27, 0xb2, 0x9c, - 0x82, 0xb2, 0x90, 0xa5, 0x28, 0x4c, 0xc9, 0x0f, 0xc3, 0xf1, 0x11, 0x7e, 0xdf, 0x90, 0x73, 0x88, - 0x1f, 0x8d, 0x05, 0xa9, 0xc3, 0x31, 0xff, 0x3a, 0xa4, 0x1d, 0x57, 0x73, 0x7b, 0x0e, 0x17, 0xe2, - 0x53, 0xe3, 0x3a, 0x82, 0x0b, 0xe2, 0x47, 0x93, 0xb2, 0x2b, 0x1c, 0x46, 0xbe, 0x00, 0xa5, 0x70, - 0xcd, 0x68, 0x19, 0xf8, 0x4a, 0x14, 0x97, 0x5f, 0x02, 0x08, 0xe4, 0x23, 0xbd, 0x13, 0x5d, 0xb1, - 0xe0, 0x89, 0xae, 0x0b, 0x90, 0xba, 0x69, 0x32, 0x9b, 0x31, 0x7c, 0xe2, 0x5c, 0x37, 0x5d, 0x1c, - 0x48, 0x3e, 0x30, 0x6a, 0x59, 0x07, 0x34, 0x98, 0x13, 0x1a, 0xf1, 0x8a, 0x67, 0xc3, 0xaf, 0xb8, - 0x7f, 0x64, 0x76, 0x69, 0xf8, 0xab, 0x5e, 0x85, 0x14, 0xb5, 0x36, 0x43, 0x3f, 0xf1, 0xf9, 0x36, - 0x00, 0xcd, 0x75, 0x6d, 0x7d, 0xbb, 0xe7, 0xbf, 0x60, 0x6e, 0xb8, 0xb5, 0xaa, 0x0a, 0xba, 0xda, - 0xbd, 0xdc, 0x6c, 0x4d, 0xfb, 0xac, 0x01, 0xd3, 0x15, 0x00, 0x94, 0xd7, 0xa0, 0x14, 0xe6, 0x1d, - 0xfe, 0xc9, 0x92, 0xff, 0xe9, 0x7f, 0x4e, 0xb8, 0x4f, 0x9e, 0xf3, 0xc5, 0xaf, 0xe3, 0xa0, 0x0f, - 0xf2, 0xed, 0x18, 0x64, 0x37, 0xf7, 0xb9, 0x1e, 0x1f, 0x72, 0xa8, 0xd2, 0xff, 0x6e, 0xcb, 0x4b, - 0x16, 0xb2, 0x7c, 0x6c, 0xc2, 0xcb, 0xf2, 0x7e, 0x8b, 0x37, 0x53, 0x93, 0xe3, 0x46, 0xbb, 0x22, - 0xdb, 0xcd, 0xad, 0xd3, 0xa5, 0xf1, 0xbe, 0x91, 0x98, 0x86, 0x54, 0xf0, 0xfb, 0x06, 0xf6, 0x20, - 0xb7, 0x03, 0xc7, 0x12, 0xd8, 0xb2, 0x11, 0xfc, 0x98, 0x22, 0x76, 0xe4, 0x8f, 0x29, 0xbc, 0xb7, - 0xc4, 0x83, 0x6f, 0xb9, 0x09, 0x59, 0xa1, 0x14, 0xe8, 0x3d, 0xc1, 0xb3, 0x27, 0x62, 0x8f, 0x66, - 0xe4, 0xe2, 0xc9, 0xe1, 0x03, 0x47, 0x4f, 0xce, 0xc2, 0x24, 0x3f, 0x72, 0xe7, 0xc7, 0x15, 0xfc, - 0x6a, 0xfd, 0x32, 0xab, 0x58, 0x11, 0x41, 0x85, 0xfc, 0xb3, 0x31, 0x90, 0xfa, 0xb5, 0xf2, 0x9d, - 0x6c, 0x00, 0x31, 0x8a, 0x44, 0xfb, 0x03, 0x77, 0x66, 0xb3, 0x91, 0x2f, 0x92, 0x52, 0xff, 0xd6, - 0xec, 0x0f, 0xc4, 0x21, 0x1f, 0xc8, 0xe9, 0xa1, 0x27, 0x43, 0x47, 0x40, 0xe7, 0x0f, 0xcb, 0xff, - 0x05, 0xce, 0x80, 0x86, 0x3a, 0x16, 0x3f, 0x7a, 0xc7, 0xde, 0xfa, 0x43, 0xfa, 0xc3, 0xbf, 0xf6, - 0x49, 0x8d, 0xf8, 0xda, 0xe7, 0xbb, 0x62, 0x90, 0xf5, 0x96, 0xee, 0xa3, 0x66, 0xf3, 0x8f, 0x41, - 0x9a, 0xaf, 0x4e, 0x2c, 0x9d, 0xcf, 0x9f, 0x86, 0xe6, 0x42, 0x2b, 0x90, 0x15, 0x7f, 0x93, 0x86, - 0x07, 0xa2, 0xde, 0xf3, 0xd9, 0x67, 0x20, 0x1f, 0xd8, 0x58, 0x21, 0x76, 0x62, 0xad, 0xf1, 0x82, - 0x34, 0x51, 0xc9, 0xdc, 0xbe, 0x33, 0x9f, 0x58, 0xc3, 0xb7, 0xc8, 0x0c, 0x53, 0x1a, 0xf5, 0xab, - 0x8d, 0xfa, 0xf3, 0x52, 0xac, 0x92, 0xbf, 0x7d, 0x67, 0x3e, 0xa3, 0x60, 0x9a, 0xbe, 0x3a, 0xfb, - 0x3c, 0x94, 0xfb, 0x06, 0x26, 0x6c, 0xdf, 0x11, 0x94, 0x96, 0xb6, 0x36, 0x56, 0x96, 0xeb, 0xd5, - 0xcd, 0x86, 0xca, 0x8e, 0xd3, 0xa1, 0xe3, 0x30, 0xb5, 0xb2, 0x7c, 0xe5, 0xea, 0xa6, 0x5a, 0x5f, - 0x59, 0x6e, 0xac, 0x6d, 0xaa, 0xd5, 0xcd, 0xcd, 0x6a, 0xfd, 0x79, 0x29, 0x7e, 0xfe, 0xeb, 0x00, - 0xe5, 0x6a, 0xad, 0xbe, 0x4c, 0xd6, 0x67, 0x9d, 0x5f, 0x7b, 0x5e, 0x87, 0x24, 0x4d, 0x05, 0x1c, - 0x7a, 0x54, 0xa4, 0x72, 0x78, 0x6e, 0x13, 0x5d, 0x86, 0x14, 0xcd, 0x12, 0xa0, 0xc3, 0xcf, 0x8e, - 0x54, 0x22, 0x92, 0x9d, 0xa4, 0x31, 0x74, 0x3a, 0x1d, 0x7a, 0x98, 0xa4, 0x72, 0x78, 0xee, 0x13, - 0x29, 0x90, 0xf3, 0xa3, 0x8c, 0xe8, 0xc3, 0x15, 0x95, 0x31, 0xac, 0x23, 0x5a, 0x81, 0x8c, 0x08, - 0x0c, 0xa3, 0x8e, 0x7b, 0x54, 0x22, 0x93, 0x93, 0x44, 0x5c, 0x2c, 0x80, 0x3f, 0xfc, 0xec, 0x4a, - 0x25, 0x22, 0xd3, 0x8a, 0x96, 0xbd, 0x43, 0xf8, 0x11, 0x47, 0x38, 0x2a, 0x51, 0xc9, 0x46, 0x22, - 0x34, 0x3f, 0x35, 0x12, 0x7d, 0x22, 0xa7, 0x32, 0x46, 0x12, 0x19, 0x6d, 0x01, 0x04, 0xc2, 0xf5, - 0x31, 0x8e, 0xda, 0x54, 0xc6, 0x49, 0x0e, 0xa3, 0x75, 0xc8, 0x7a, 0xd1, 0x53, 0xe4, 0xc1, 0x97, - 0x4a, 0x74, 0x96, 0x16, 0xbd, 0x0f, 0x8a, 0xe1, 0xa8, 0x61, 0xbc, 0xe3, 0x2c, 0x95, 0x31, 0xd3, - 0xaf, 0x04, 0x3f, 0x1c, 0x42, 0x8c, 0x77, 0xbc, 0xa5, 0x32, 0x66, 0x36, 0x16, 0xbd, 0x02, 0x93, - 0x83, 0x2e, 0xfe, 0xf8, 0xa7, 0x5d, 0x2a, 0x47, 0xc8, 0xcf, 0xa2, 0x2e, 0xa0, 0x21, 0xa1, 0xc1, - 0x11, 0x0e, 0xbf, 0x54, 0x8e, 0x92, 0xae, 0x45, 0x6d, 0x28, 0xf7, 0xfb, 0xdb, 0xe3, 0x1e, 0x86, - 0xa9, 0x8c, 0x9d, 0xba, 0x65, 0x6f, 0x09, 0xfb, 0xe9, 0xe3, 0x1e, 0x8e, 0xa9, 0x8c, 0x9d, 0xc9, - 0xad, 0x55, 0x47, 0x9e, 0x6f, 0x3c, 0x75, 0xe8, 0xf9, 0x46, 0xff, 0xc4, 0xa2, 0x77, 0xa6, 0xf1, - 0x3b, 0x1f, 0x87, 0x77, 0xf1, 0xcb, 0x04, 0x1c, 0x57, 0xbb, 0xa1, 0x1b, 0xbb, 0xde, 0xed, 0x10, - 0xfc, 0x99, 0x1f, 0x6e, 0x3c, 0xc6, 0x2f, 0x2c, 0x10, 0xa5, 0x11, 0x77, 0x44, 0x8c, 0xbc, 0xf7, - 0x2a, 0xea, 0x10, 0x72, 0xf4, 0xd1, 0xc5, 0x43, 0xee, 0x9f, 0x88, 0xb8, 0xe5, 0x62, 0xc8, 0xfd, - 0x14, 0x11, 0x87, 0x30, 0x0f, 0x3b, 0xef, 0x29, 0xff, 0x50, 0x0c, 0x4a, 0x57, 0x75, 0xc7, 0x35, - 0x6d, 0xbd, 0xa5, 0x75, 0xe8, 0x8a, 0x71, 0x69, 0xdc, 0x8f, 0x3c, 0x6a, 0x39, 0xe2, 0x8c, 0xf0, - 0x4b, 0x2d, 0xf8, 0xc1, 0x90, 0x25, 0x48, 0xdf, 0xd4, 0x3a, 0xec, 0x13, 0x8b, 0xe0, 0xf5, 0x33, - 0xfd, 0x32, 0x0f, 0x78, 0x49, 0x41, 0x14, 0xc6, 0x2b, 0xff, 0x12, 0x3d, 0xc4, 0xdd, 0xed, 0xea, - 0x0e, 0xfb, 0xab, 0xd1, 0x2e, 0x76, 0xd0, 0x06, 0x24, 0x6d, 0xcd, 0xe5, 0x41, 0x4d, 0xed, 0xdd, - 0xfc, 0x2a, 0x8a, 0x87, 0xa2, 0x2f, 0x94, 0x58, 0x18, 0xbc, 0xad, 0x82, 0x22, 0xa1, 0x17, 0x20, - 0xdb, 0xd5, 0xf6, 0x55, 0x8a, 0x1a, 0x7f, 0x0b, 0x50, 0x33, 0x5d, 0x6d, 0x9f, 0xb4, 0x95, 0xcc, - 0x20, 0x02, 0xdc, 0xda, 0xd3, 0x8c, 0x5d, 0xcc, 0xf0, 0x13, 0x6f, 0x01, 0x7e, 0xb1, 0xab, 0xed, - 0xd7, 0x29, 0x26, 0x79, 0xcb, 0x62, 0xf6, 0xc3, 0x1f, 0x99, 0x9b, 0xa0, 0x67, 0x91, 0x7f, 0x2b, - 0xc6, 0xe3, 0x57, 0x2a, 0x2e, 0xa4, 0x81, 0xd4, 0xf2, 0x9e, 0xe8, 0xeb, 0x45, 0x2e, 0xff, 0xd4, - 0xa8, 0xd1, 0xe8, 0x13, 0x76, 0xad, 0x48, 0x1a, 0xfa, 0xb9, 0xd7, 0xe7, 0x62, 0x6c, 0x5c, 0xca, - 0xad, 0xbe, 0xc1, 0xb8, 0x06, 0x79, 0x96, 0x42, 0x53, 0xa9, 0xdf, 0x1a, 0x8f, 0xf4, 0x5b, 0x8b, - 0xc2, 0x6f, 0x65, 0x80, 0xc0, 0xb8, 0x49, 0x7d, 0xa0, 0x1f, 0xbf, 0x14, 0x83, 0xfc, 0x52, 0xe0, - 0x9a, 0xa9, 0x19, 0xc8, 0x74, 0x4d, 0x43, 0xbf, 0x81, 0x6d, 0x6f, 0x43, 0x86, 0x3d, 0x12, 0xff, - 0x92, 0xfd, 0xb9, 0x20, 0xf7, 0x40, 0x5c, 0xc1, 0x20, 0x9e, 0x09, 0xd7, 0x2d, 0xbc, 0xed, 0xe8, - 0x42, 0xea, 0x8a, 0x78, 0x44, 0x67, 0x40, 0x72, 0x70, 0xab, 0x67, 0xeb, 0xee, 0x81, 0xda, 0x32, - 0x0d, 0x57, 0x6b, 0xb9, 0x3c, 0x6d, 0x5a, 0x16, 0xe5, 0x75, 0x56, 0x4c, 0x40, 0xda, 0xd8, 0xd5, - 0xf4, 0x0e, 0x3b, 0xef, 0x95, 0x53, 0xc4, 0x63, 0xa0, 0xb9, 0xbf, 0x9e, 0x09, 0xc6, 0x85, 0x75, - 0x90, 0x4c, 0x0b, 0xdb, 0xa1, 0xef, 0xdd, 0x98, 0xae, 0xce, 0xfc, 0xee, 0x27, 0x1f, 0x9d, 0xe6, - 0x82, 0xe7, 0xbb, 0xef, 0xec, 0x66, 0x65, 0xa5, 0x2c, 0x38, 0xc4, 0x87, 0x70, 0x2f, 0x85, 0xb6, - 0x61, 0x7a, 0xdb, 0xfe, 0xf7, 0xf6, 0xd3, 0x03, 0xc2, 0xad, 0x1a, 0x07, 0xb5, 0x99, 0xdf, 0xf1, - 0xa1, 0xfd, 0xb8, 0xf1, 0x79, 0x7c, 0x10, 0xdc, 0x93, 0xa1, 0x30, 0xc4, 0x7d, 0x7f, 0x45, 0xd3, - 0x3b, 0xe2, 0xaf, 0xa0, 0x29, 0xfc, 0x09, 0x2d, 0x7a, 0x39, 0x18, 0xf6, 0xd7, 0xcd, 0xe5, 0x51, - 0x3a, 0x52, 0x33, 0x8d, 0x76, 0x38, 0xdd, 0x82, 0x36, 0x21, 0xed, 0x9a, 0x37, 0xb0, 0xc1, 0x85, - 0x74, 0x24, 0xfd, 0x1e, 0xbc, 0x7c, 0x86, 0x63, 0xa1, 0x5d, 0x90, 0xda, 0xb8, 0x83, 0x77, 0xd9, - 0xd7, 0x5a, 0x7b, 0x9a, 0x8d, 0xd9, 0x17, 0x9c, 0xdf, 0xe8, 0xfc, 0x29, 0x7b, 0xa8, 0x4d, 0x0a, - 0x8a, 0x36, 0xc2, 0x17, 0x9d, 0x65, 0xf8, 0x96, 0xfc, 0x88, 0xfe, 0x07, 0x34, 0x33, 0x68, 0xb3, - 0x42, 0x17, 0xa3, 0x9d, 0x01, 0xa9, 0x67, 0x6c, 0x9b, 0x06, 0xfd, 0x83, 0x45, 0x3c, 0xba, 0xca, - 0xb2, 0x6d, 0x3b, 0xaf, 0x9c, 0x6f, 0xdb, 0x6d, 0x40, 0xc9, 0x27, 0xa5, 0xb3, 0x28, 0x77, 0xd4, - 0x59, 0x54, 0xf4, 0x00, 0x08, 0x09, 0x5a, 0x05, 0xf0, 0xe7, 0xa9, 0xb7, 0xb5, 0x1f, 0x39, 0xe3, - 0x83, 0x9d, 0x09, 0x00, 0xa0, 0x0e, 0x4c, 0x75, 0x75, 0x43, 0x75, 0x70, 0x67, 0x47, 0xe5, 0x92, - 0x23, 0xb8, 0xf9, 0xb7, 0x60, 0xa4, 0x27, 0xbb, 0xba, 0xd1, 0xc4, 0x9d, 0x9d, 0x25, 0x0f, 0x16, - 0xbd, 0x1b, 0x4e, 0xfa, 0xe2, 0x30, 0x0d, 0x75, 0xcf, 0xec, 0xb4, 0x55, 0x1b, 0xef, 0xa8, 0x2d, - 0x7a, 0xf7, 0x51, 0x81, 0x0a, 0xf1, 0xb8, 0x47, 0xb2, 0x6e, 0x5c, 0x35, 0x3b, 0x6d, 0x05, 0xef, - 0xd4, 0x49, 0x35, 0x7a, 0x00, 0x7c, 0x59, 0xa8, 0x7a, 0xdb, 0x99, 0x29, 0xce, 0x27, 0x4e, 0x27, - 0x95, 0x82, 0x57, 0xb8, 0xdc, 0x76, 0x16, 0x0b, 0x1f, 0xfc, 0xc8, 0xdc, 0x04, 0x9f, 0xbd, 0x13, - 0xf2, 0x06, 0xbd, 0xad, 0x83, 0x4f, 0x3c, 0xec, 0xa0, 0x8b, 0x90, 0xd3, 0xc4, 0x03, 0xfb, 0x4e, - 0xe4, 0x90, 0x89, 0xeb, 0x93, 0x32, 0x7b, 0xf0, 0xda, 0x1f, 0xcc, 0xc7, 0xe4, 0x9f, 0x89, 0x41, - 0x7a, 0xe9, 0xfa, 0x86, 0xa6, 0xdb, 0xa8, 0x01, 0x93, 0xbe, 0x0a, 0x8f, 0x6b, 0x0d, 0x7c, 0xad, - 0x17, 0xe6, 0xa0, 0x31, 0xea, 0x23, 0xda, 0x43, 0x61, 0xfa, 0x3f, 0xaf, 0xed, 0xeb, 0xf8, 0x35, - 0xc8, 0xb0, 0x56, 0x3a, 0xe8, 0x39, 0x48, 0x59, 0xe4, 0x07, 0xdf, 0x0c, 0x98, 0x1d, 0xa9, 0xfa, - 0x94, 0x3e, 0xa8, 0x28, 0x8c, 0x4f, 0xfe, 0xcb, 0x18, 0xc0, 0xd2, 0xf5, 0xeb, 0x9b, 0xb6, 0x6e, - 0x75, 0xb0, 0xfb, 0x56, 0x75, 0x7b, 0x05, 0xee, 0x09, 0x7c, 0xae, 0x69, 0xb7, 0xc6, 0xee, 0xfa, - 0x94, 0xff, 0xc1, 0xa6, 0xdd, 0x1a, 0x8a, 0xd6, 0x76, 0x5c, 0x0f, 0x2d, 0x31, 0x36, 0xda, 0x92, - 0xe3, 0x0e, 0x97, 0xe5, 0x8b, 0x90, 0xf7, 0xbb, 0xef, 0xa0, 0x65, 0xc8, 0xba, 0xfc, 0x37, 0x17, - 0xa9, 0x3c, 0x5a, 0xa4, 0x82, 0x2d, 0x28, 0x56, 0x8f, 0x5d, 0xfe, 0x3f, 0x44, 0xb2, 0xfe, 0xf4, - 0xf8, 0x6b, 0xa5, 0x50, 0xc4, 0xee, 0x73, 0xbb, 0xfc, 0x56, 0xf8, 0x35, 0x1c, 0xab, 0x4f, 0xb4, - 0x1f, 0x8c, 0xc3, 0xd4, 0x96, 0x98, 0xbe, 0x7f, 0x6d, 0x25, 0xb1, 0x05, 0x19, 0x6c, 0xb8, 0xb6, - 0x8e, 0xc5, 0x0e, 0xe0, 0x63, 0xa3, 0x06, 0x7c, 0x48, 0x5f, 0xe8, 0x1f, 0xf8, 0x0d, 0x0e, 0xbf, - 0xc0, 0xea, 0x13, 0xc5, 0x6f, 0x26, 0x60, 0x66, 0x14, 0x3b, 0x3a, 0x05, 0xe5, 0x96, 0x8d, 0x69, - 0x81, 0x1a, 0xca, 0x92, 0x97, 0x44, 0x31, 0x5f, 0x70, 0x14, 0x20, 0x6e, 0x1c, 0xd1, 0x2e, 0x42, - 0x7a, 0x77, 0x7e, 0x5b, 0xc9, 0x47, 0xa0, 0x4b, 0x0e, 0x86, 0xb2, 0x38, 0xf6, 0xbe, 0xad, 0x75, - 0x34, 0xa3, 0x75, 0x37, 0x9e, 0xee, 0xe0, 0xfa, 0x20, 0xce, 0xd2, 0xd7, 0x18, 0x26, 0xba, 0x0e, - 0x19, 0x01, 0x9f, 0x7c, 0x0b, 0xe0, 0x05, 0x18, 0xba, 0x1f, 0x0a, 0xc1, 0x65, 0x83, 0x7a, 0x31, - 0x49, 0x25, 0x1f, 0x58, 0x35, 0xa2, 0xd6, 0xa5, 0xf4, 0xa1, 0xeb, 0x52, 0xc0, 0x59, 0xfc, 0x17, - 0x09, 0x98, 0x54, 0x70, 0xfb, 0x9b, 0x70, 0xf0, 0xbe, 0x15, 0x80, 0x4d, 0x70, 0x62, 0x7c, 0xef, - 0x62, 0xfc, 0x06, 0x0d, 0x46, 0x8e, 0xe1, 0x2d, 0x39, 0xee, 0x3b, 0x39, 0x82, 0xff, 0x3e, 0x0e, - 0x85, 0xe0, 0x08, 0x7e, 0x13, 0xac, 0x76, 0x68, 0xcd, 0x37, 0x6f, 0xec, 0x80, 0xfa, 0x99, 0x51, - 0xe6, 0x6d, 0x40, 0xb7, 0xc7, 0xb0, 0x6b, 0x3f, 0x92, 0x80, 0x34, 0x3f, 0x31, 0xb6, 0x3e, 0xe0, - 0x0d, 0xc7, 0xa2, 0x3e, 0x13, 0x2e, 0x8a, 0xcf, 0x84, 0x87, 0x3a, 0xc3, 0x0f, 0x42, 0x89, 0xc4, - 0xe0, 0xa1, 0x63, 0x68, 0xb1, 0xd3, 0x45, 0x1a, 0x44, 0xfb, 0x87, 0xa6, 0xd1, 0x1c, 0xe4, 0x09, - 0x99, 0x6f, 0xc3, 0x09, 0x0d, 0x74, 0xb5, 0xfd, 0x06, 0x2b, 0x41, 0x8f, 0x02, 0xda, 0xf3, 0xf2, - 0x23, 0xaa, 0x2f, 0x0c, 0x42, 0x37, 0xe9, 0xd7, 0x08, 0xf2, 0xfb, 0x00, 0x48, 0x2b, 0x54, 0x76, - 0x91, 0x27, 0xbf, 0x5d, 0x95, 0x94, 0x2c, 0xd1, 0xcb, 0x3c, 0xbf, 0x83, 0xf9, 0xd4, 0x7d, 0xe1, - 0x39, 0x8f, 0x6e, 0x56, 0x8e, 0x36, 0x29, 0xbe, 0xf6, 0xfa, 0x5c, 0xe5, 0x40, 0xeb, 0x76, 0x16, - 0xe5, 0x21, 0x90, 0x32, 0xf5, 0xb1, 0xc3, 0x61, 0xfd, 0xe2, 0x69, 0xa1, 0xcb, 0xb7, 0xbf, 0xf4, - 0xf1, 0xb3, 0x27, 0x03, 0x98, 0xfb, 0x5e, 0xe2, 0x8c, 0x0d, 0x87, 0xfc, 0xcb, 0x31, 0x40, 0xfe, - 0x42, 0xe3, 0x1d, 0x13, 0x5f, 0xa5, 0x87, 0x87, 0x45, 0x24, 0x10, 0x3b, 0x3c, 0xc2, 0xf0, 0xf9, - 0x43, 0x11, 0x46, 0x60, 0x02, 0xbd, 0xc7, 0x37, 0xeb, 0xe2, 0xa3, 0xf0, 0x21, 0x57, 0xb8, 0x2e, - 0xd4, 0x4d, 0x3d, 0x04, 0x21, 0x98, 0xbc, 0xb9, 0x39, 0x21, 0xbf, 0x1e, 0x83, 0x13, 0x03, 0x1a, - 0xe8, 0x35, 0xbb, 0x05, 0xc8, 0x0e, 0x54, 0xf2, 0x3f, 0xb4, 0x1f, 0xe3, 0xdf, 0x41, 0xde, 0x8d, - 0x42, 0x4f, 0xda, 0x03, 0xa6, 0xfc, 0x6d, 0x5a, 0xa3, 0xf8, 0x65, 0xae, 0xbf, 0x1d, 0x83, 0xe9, - 0x60, 0x8b, 0xbc, 0xbe, 0x35, 0xa1, 0x10, 0x6c, 0x0b, 0xef, 0xd5, 0xbb, 0xc6, 0xe9, 0x55, 0xb0, - 0x43, 0x21, 0x10, 0xd2, 0x17, 0xa1, 0xe9, 0x2c, 0x8d, 0xf7, 0xf8, 0xd8, 0x52, 0xf2, 0xb6, 0x28, - 0x86, 0x4d, 0xff, 0x24, 0x1d, 0xac, 0xef, 0x8f, 0x43, 0x72, 0xc3, 0x34, 0x3b, 0xe8, 0xbb, 0x62, - 0x30, 0x69, 0x98, 0xae, 0x4a, 0xe6, 0x07, 0x6e, 0xab, 0x3c, 0x95, 0xc0, 0x2c, 0xe8, 0xf5, 0xa3, - 0x49, 0xef, 0x2b, 0xaf, 0xcf, 0x0d, 0x42, 0x0d, 0xbb, 0x7d, 0xb7, 0x6c, 0x98, 0x6e, 0x8d, 0x12, - 0x6d, 0xb2, 0x6c, 0xc3, 0x2d, 0x28, 0x86, 0xdf, 0xcf, 0xcc, 0xae, 0x72, 0xe4, 0xf7, 0x17, 0x23, - 0xdf, 0x5d, 0xd8, 0x0e, 0xbc, 0x98, 0xdd, 0x81, 0xf9, 0xa7, 0x64, 0x70, 0x5f, 0x02, 0xe9, 0x7a, - 0xff, 0xa1, 0xb5, 0x06, 0x64, 0x8e, 0x7a, 0xfe, 0x2d, 0x28, 0x71, 0xce, 0x7b, 0xf6, 0x53, 0x31, - 0x00, 0x3f, 0x71, 0x83, 0x1e, 0x81, 0xe3, 0xb5, 0xf5, 0xb5, 0x25, 0xb5, 0xb9, 0x59, 0xdd, 0xdc, - 0x6a, 0x86, 0x6f, 0x5c, 0x17, 0xd7, 0x94, 0x38, 0x16, 0x6e, 0xe9, 0x3b, 0x3a, 0x6e, 0xa3, 0x87, - 0x60, 0x3a, 0x4c, 0x4d, 0x9e, 0x1a, 0x4b, 0x52, 0xac, 0x52, 0xb8, 0x7d, 0x67, 0x3e, 0xcb, 0x5c, - 0x52, 0xdc, 0x46, 0xa7, 0xe1, 0x9e, 0x41, 0xba, 0xe5, 0xb5, 0x2b, 0x52, 0xbc, 0x52, 0xbc, 0x7d, - 0x67, 0x3e, 0xe7, 0xf9, 0xae, 0x48, 0x06, 0x14, 0xa4, 0xe4, 0x78, 0x89, 0x0a, 0xdc, 0xbe, 0x33, - 0x9f, 0x66, 0xc3, 0x52, 0x49, 0x7e, 0xf0, 0xa7, 0x67, 0x27, 0xce, 0x7e, 0x1b, 0xc0, 0xb2, 0xb1, - 0x63, 0x6b, 0xf4, 0xcf, 0x0e, 0xa3, 0x0a, 0x1c, 0x5b, 0x5e, 0xbb, 0xac, 0x54, 0xeb, 0x9b, 0xcb, - 0xeb, 0x6b, 0x7d, 0x17, 0xc5, 0x87, 0xeb, 0x96, 0xd6, 0xb7, 0x6a, 0x2b, 0x0d, 0xb5, 0xb9, 0x7c, - 0x65, 0x8d, 0x6d, 0xfe, 0x86, 0xea, 0x5e, 0x58, 0xdb, 0x5c, 0x5e, 0x6d, 0x48, 0xf1, 0xda, 0xe5, - 0x91, 0xdb, 0x0f, 0x8f, 0x1c, 0x3a, 0xe0, 0xbe, 0xa5, 0x0c, 0xed, 0x41, 0xfc, 0xbf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x4f, 0x0b, 0xba, 0x8e, 0x0e, 0x97, 0x00, 0x00, + // 10916 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x7d, 0x7b, 0x90, 0x1c, 0xc7, + 0x79, 0xdf, 0xed, 0xe3, 0xf6, 0xf1, 0xed, 0x6b, 0xae, 0xef, 0x00, 0x1c, 0x16, 0xe4, 0xdd, 0x71, + 0x28, 0x12, 0x0f, 0x92, 0x07, 0x12, 0x24, 0x40, 0xf2, 0x20, 0x8a, 0xde, 0xdd, 0x5b, 0x1c, 0x16, + 0xb8, 0x97, 0x66, 0xf7, 0xc0, 0x87, 0x63, 0x8d, 0xe7, 0x66, 0xfb, 0xee, 0x86, 0xd8, 0x9d, 0x59, + 0xcd, 0xcc, 0x02, 0x77, 0x2c, 0x57, 0x8a, 0xb6, 0x62, 0x47, 0x46, 0x1c, 0x47, 0x8e, 0x53, 0x36, + 0xfd, 0x80, 0x23, 0xf9, 0x29, 0x3b, 0x76, 0xe2, 0x87, 0x22, 0xcb, 0x51, 0xc5, 0xb1, 0x53, 0x71, + 0x22, 0xbb, 0x52, 0x89, 0xec, 0x4a, 0x25, 0x2e, 0x97, 0xc3, 0xd8, 0x94, 0x2b, 0x52, 0x24, 0x39, + 0xb6, 0x15, 0xba, 0x92, 0x94, 0xca, 0x4e, 0xaa, 0x5f, 0xf3, 0xd8, 0xc7, 0xed, 0x1e, 0x44, 0x32, + 0x4a, 0xe9, 0x1f, 0x60, 0xa7, 0xfb, 0xfb, 0x7e, 0xd3, 0xfd, 0xf5, 0xd7, 0x5f, 0x7f, 0xdf, 0xd7, + 0x3d, 0x7d, 0xf0, 0xc7, 0x65, 0x58, 0xd8, 0xb5, 0xac, 0xdd, 0x16, 0x3e, 0xdf, 0xb1, 0x2d, 0xd7, + 0xda, 0xee, 0xee, 0x9c, 0x6f, 0x62, 0x47, 0xb7, 0x8d, 0x8e, 0x6b, 0xd9, 0x8b, 0xb4, 0x0c, 0x15, + 0x18, 0xc5, 0xa2, 0xa0, 0x90, 0xd7, 0x60, 0xea, 0x8a, 0xd1, 0xc2, 0xcb, 0x1e, 0x61, 0x1d, 0xbb, + 0xe8, 0x19, 0x88, 0xef, 0x18, 0x2d, 0x3c, 0x1b, 0x59, 0x88, 0x9d, 0xc9, 0x5c, 0x78, 0xcf, 0x62, + 0x0f, 0xd3, 0x62, 0x98, 0x63, 0x93, 0x14, 0x2b, 0x94, 0x43, 0xfe, 0xeb, 0x38, 0x4c, 0x0f, 0xa8, + 0x45, 0x08, 0xe2, 0xa6, 0xd6, 0x26, 0x88, 0x91, 0x33, 0x69, 0x85, 0xfe, 0x46, 0xb3, 0x90, 0xec, + 0x68, 0xfa, 0x4d, 0x6d, 0x17, 0xcf, 0x46, 0x69, 0xb1, 0x78, 0x44, 0x73, 0x00, 0x4d, 0xdc, 0xc1, + 0x66, 0x13, 0x9b, 0xfa, 0xc1, 0x6c, 0x6c, 0x21, 0x76, 0x26, 0xad, 0x04, 0x4a, 0xd0, 0x23, 0x30, + 0xd5, 0xe9, 0x6e, 0xb7, 0x0c, 0x5d, 0x0d, 0x90, 0xc1, 0x42, 0xec, 0xcc, 0xa4, 0x22, 0xb1, 0x8a, + 0x65, 0x9f, 0xf8, 0x34, 0x14, 0x6e, 0x63, 0xed, 0x66, 0x90, 0x34, 0x43, 0x49, 0xf3, 0xa4, 0x38, + 0x40, 0x58, 0x81, 0x6c, 0x1b, 0x3b, 0x8e, 0xb6, 0x8b, 0x55, 0xf7, 0xa0, 0x83, 0x67, 0xe3, 0xb4, + 0xf7, 0x0b, 0x7d, 0xbd, 0xef, 0xed, 0x79, 0x86, 0x73, 0x35, 0x0e, 0x3a, 0x18, 0x95, 0x20, 0x8d, + 0xcd, 0x6e, 0x9b, 0x21, 0x4c, 0x0e, 0x91, 0x5f, 0xd5, 0xec, 0xb6, 0x7b, 0x51, 0x52, 0x84, 0x8d, + 0x43, 0x24, 0x1d, 0x6c, 0xdf, 0x32, 0x74, 0x3c, 0x9b, 0xa0, 0x00, 0xa7, 0xfb, 0x00, 0xea, 0xac, + 0xbe, 0x17, 0x43, 0xf0, 0xa1, 0x0a, 0xa4, 0xf1, 0xbe, 0x8b, 0x4d, 0xc7, 0xb0, 0xcc, 0xd9, 0x24, + 0x05, 0x79, 0x68, 0xc0, 0x28, 0xe2, 0x56, 0xb3, 0x17, 0xc2, 0xe7, 0x43, 0x97, 0x20, 0x69, 0x75, + 0x5c, 0xc3, 0x32, 0x9d, 0xd9, 0xd4, 0x42, 0xe4, 0x4c, 0xe6, 0xc2, 0x7d, 0x03, 0x15, 0x61, 0x83, + 0xd1, 0x28, 0x82, 0x18, 0xd5, 0x40, 0x72, 0xac, 0xae, 0xad, 0x63, 0x55, 0xb7, 0x9a, 0x58, 0x35, + 0xcc, 0x1d, 0x6b, 0x36, 0x4d, 0x01, 0xe6, 0xfb, 0x3b, 0x42, 0x09, 0x2b, 0x56, 0x13, 0xd7, 0xcc, + 0x1d, 0x4b, 0xc9, 0x3b, 0xa1, 0x67, 0x74, 0x1c, 0x12, 0xce, 0x81, 0xe9, 0x6a, 0xfb, 0xb3, 0x59, + 0xaa, 0x21, 0xfc, 0x89, 0xa8, 0x0e, 0x6e, 0x1a, 0xe4, 0x75, 0xb3, 0x39, 0xa6, 0x3a, 0xfc, 0x51, + 0xfe, 0xb5, 0x04, 0x14, 0xc6, 0x51, 0xbe, 0xcb, 0x30, 0xb9, 0x43, 0xfa, 0x3f, 0x1b, 0x3d, 0x8a, + 0x74, 0x18, 0x4f, 0x58, 0xbc, 0x89, 0x7b, 0x14, 0x6f, 0x09, 0x32, 0x26, 0x76, 0x5c, 0xdc, 0x64, + 0xba, 0x12, 0x1b, 0x53, 0xdb, 0x80, 0x31, 0xf5, 0x2b, 0x5b, 0xfc, 0x9e, 0x94, 0xed, 0x45, 0x28, + 0x78, 0x4d, 0x52, 0x6d, 0xcd, 0xdc, 0x15, 0x5a, 0x7b, 0x7e, 0x54, 0x4b, 0x16, 0xab, 0x82, 0x4f, + 0x21, 0x6c, 0x4a, 0x1e, 0x87, 0x9e, 0xd1, 0x32, 0x80, 0x65, 0x62, 0x6b, 0x47, 0x6d, 0x62, 0xbd, + 0x35, 0x9b, 0x1a, 0x22, 0xa5, 0x0d, 0x42, 0xd2, 0x27, 0x25, 0x8b, 0x95, 0xea, 0x2d, 0xf4, 0xac, + 0xaf, 0x84, 0xc9, 0x21, 0x3a, 0xb4, 0xc6, 0xa6, 0x5f, 0x9f, 0x1e, 0x6e, 0x41, 0xde, 0xc6, 0x64, + 0x46, 0xe0, 0x26, 0xef, 0x59, 0x9a, 0x36, 0x62, 0x71, 0x64, 0xcf, 0x14, 0xce, 0xc6, 0x3a, 0x96, + 0xb3, 0x83, 0x8f, 0xe8, 0x41, 0xf0, 0x0a, 0x54, 0xaa, 0x56, 0x40, 0xed, 0x53, 0x56, 0x14, 0xae, + 0x6b, 0x6d, 0x5c, 0x7c, 0x15, 0xf2, 0x61, 0xf1, 0xa0, 0x19, 0x98, 0x74, 0x5c, 0xcd, 0x76, 0xa9, + 0x16, 0x4e, 0x2a, 0xec, 0x01, 0x49, 0x10, 0xc3, 0x66, 0x93, 0xda, 0xbf, 0x49, 0x85, 0xfc, 0x44, + 0xdf, 0xe4, 0x77, 0x38, 0x46, 0x3b, 0xfc, 0x70, 0xff, 0x88, 0x86, 0x90, 0x7b, 0xfb, 0x5d, 0x7c, + 0x1a, 0x72, 0xa1, 0x0e, 0x8c, 0xfb, 0x6a, 0xf9, 0xdb, 0xe0, 0xd8, 0x40, 0x68, 0xf4, 0x22, 0xcc, + 0x74, 0x4d, 0xc3, 0x74, 0xb1, 0xdd, 0xb1, 0x31, 0xd1, 0x58, 0xf6, 0xaa, 0xd9, 0xcf, 0x27, 0x87, + 0xe8, 0xdc, 0x56, 0x90, 0x9a, 0xa1, 0x28, 0xd3, 0xdd, 0xfe, 0xc2, 0x73, 0xe9, 0xd4, 0x17, 0x92, + 0xd2, 0x6b, 0xaf, 0xbd, 0xf6, 0x5a, 0x54, 0xfe, 0xcd, 0x04, 0xcc, 0x0c, 0x9a, 0x33, 0x03, 0xa7, + 0xef, 0x71, 0x48, 0x98, 0xdd, 0xf6, 0x36, 0xb6, 0xa9, 0x90, 0x26, 0x15, 0xfe, 0x84, 0x4a, 0x30, + 0xd9, 0xd2, 0xb6, 0x71, 0x6b, 0x36, 0xbe, 0x10, 0x39, 0x93, 0xbf, 0xf0, 0xc8, 0x58, 0xb3, 0x72, + 0x71, 0x95, 0xb0, 0x28, 0x8c, 0x13, 0xbd, 0x0f, 0xe2, 0xdc, 0x78, 0x13, 0x84, 0x73, 0xe3, 0x21, + 0x90, 0xb9, 0xa4, 0x50, 0x3e, 0x74, 0x0a, 0xd2, 0xe4, 0x7f, 0xa6, 0x1b, 0x09, 0xda, 0xe6, 0x14, + 0x29, 0x20, 0x7a, 0x81, 0x8a, 0x90, 0xa2, 0xd3, 0xa4, 0x89, 0xc5, 0xa2, 0xe7, 0x3d, 0x13, 0xc5, + 0x6a, 0xe2, 0x1d, 0xad, 0xdb, 0x72, 0xd5, 0x5b, 0x5a, 0xab, 0x8b, 0xa9, 0xc2, 0xa7, 0x95, 0x2c, + 0x2f, 0xbc, 0x41, 0xca, 0xd0, 0x3c, 0x64, 0xd8, 0xac, 0x32, 0xcc, 0x26, 0xde, 0xa7, 0x76, 0x75, + 0x52, 0x61, 0x13, 0xad, 0x46, 0x4a, 0xc8, 0xeb, 0x5f, 0x71, 0x2c, 0x53, 0xa8, 0x26, 0x7d, 0x05, + 0x29, 0xa0, 0xaf, 0x7f, 0xba, 0xd7, 0xa4, 0xdf, 0x3f, 0xb8, 0x7b, 0x7d, 0x73, 0xe9, 0x34, 0x14, + 0x28, 0xc5, 0x93, 0x7c, 0xe8, 0xb5, 0xd6, 0xec, 0xd4, 0x42, 0xe4, 0x4c, 0x4a, 0xc9, 0xb3, 0xe2, + 0x0d, 0x5e, 0x2a, 0x7f, 0x32, 0x0a, 0x71, 0x6a, 0x58, 0x0a, 0x90, 0x69, 0xbc, 0xb4, 0x59, 0x55, + 0x97, 0x37, 0xb6, 0xca, 0xab, 0x55, 0x29, 0x82, 0xf2, 0x00, 0xb4, 0xe0, 0xca, 0xea, 0x46, 0xa9, + 0x21, 0x45, 0xbd, 0xe7, 0xda, 0x7a, 0xe3, 0xd2, 0x53, 0x52, 0xcc, 0x63, 0xd8, 0x62, 0x05, 0xf1, + 0x20, 0xc1, 0x93, 0x17, 0xa4, 0x49, 0x24, 0x41, 0x96, 0x01, 0xd4, 0x5e, 0xac, 0x2e, 0x5f, 0x7a, + 0x4a, 0x4a, 0x84, 0x4b, 0x9e, 0xbc, 0x20, 0x25, 0x51, 0x0e, 0xd2, 0xb4, 0xa4, 0xbc, 0xb1, 0xb1, + 0x2a, 0xa5, 0x3c, 0xcc, 0x7a, 0x43, 0xa9, 0xad, 0xaf, 0x48, 0x69, 0x0f, 0x73, 0x45, 0xd9, 0xd8, + 0xda, 0x94, 0xc0, 0x43, 0x58, 0xab, 0xd6, 0xeb, 0xa5, 0x95, 0xaa, 0x94, 0xf1, 0x28, 0xca, 0x2f, + 0x35, 0xaa, 0x75, 0x29, 0x1b, 0x6a, 0xd6, 0x93, 0x17, 0xa4, 0x9c, 0xf7, 0x8a, 0xea, 0xfa, 0xd6, + 0x9a, 0x94, 0x47, 0x53, 0x90, 0x63, 0xaf, 0x10, 0x8d, 0x28, 0xf4, 0x14, 0x5d, 0x7a, 0x4a, 0x92, + 0xfc, 0x86, 0x30, 0x94, 0xa9, 0x50, 0xc1, 0xa5, 0xa7, 0x24, 0x24, 0x57, 0x60, 0x92, 0xaa, 0x21, + 0x42, 0x90, 0x5f, 0x2d, 0x95, 0xab, 0xab, 0xea, 0xc6, 0x66, 0xa3, 0xb6, 0xb1, 0x5e, 0x5a, 0x95, + 0x22, 0x7e, 0x99, 0x52, 0x7d, 0xff, 0x56, 0x4d, 0xa9, 0x2e, 0x4b, 0xd1, 0x60, 0xd9, 0x66, 0xb5, + 0xd4, 0xa8, 0x2e, 0x4b, 0x31, 0x59, 0x87, 0x99, 0x41, 0x06, 0x75, 0xe0, 0x14, 0x0a, 0xe8, 0x42, + 0x74, 0x88, 0x2e, 0x50, 0xac, 0x5e, 0x5d, 0x90, 0x3f, 0x17, 0x85, 0xe9, 0x01, 0x8b, 0xca, 0xc0, + 0x97, 0x3c, 0x0f, 0x93, 0x4c, 0x97, 0xd9, 0x32, 0x7b, 0x76, 0xe0, 0xea, 0x44, 0x35, 0xbb, 0x6f, + 0xa9, 0xa5, 0x7c, 0x41, 0x27, 0x24, 0x36, 0xc4, 0x09, 0x21, 0x10, 0x7d, 0x0a, 0xfb, 0x2d, 0x7d, + 0xc6, 0x9f, 0xad, 0x8f, 0x97, 0xc6, 0x59, 0x1f, 0x69, 0xd9, 0xd1, 0x16, 0x81, 0xc9, 0x01, 0x8b, + 0xc0, 0x65, 0x98, 0xea, 0x03, 0x1a, 0xdb, 0x18, 0x7f, 0x28, 0x02, 0xb3, 0xc3, 0x84, 0x33, 0xc2, + 0x24, 0x46, 0x43, 0x26, 0xf1, 0x72, 0xaf, 0x04, 0x1f, 0x18, 0x3e, 0x08, 0x7d, 0x63, 0xfd, 0x33, + 0x11, 0x38, 0x3e, 0xd8, 0xd9, 0x1c, 0xd8, 0x86, 0xf7, 0x41, 0xa2, 0x8d, 0xdd, 0x3d, 0x4b, 0xb8, + 0x55, 0x0f, 0x0f, 0x58, 0xac, 0x49, 0x75, 0xef, 0x60, 0x73, 0xae, 0xe0, 0x6a, 0x1f, 0x1b, 0xe6, + 0x31, 0xb2, 0xd6, 0xf4, 0xb5, 0xf4, 0xbb, 0xa3, 0x70, 0x6c, 0x20, 0xf8, 0xc0, 0x86, 0xde, 0x0f, + 0x60, 0x98, 0x9d, 0xae, 0xcb, 0x5c, 0x27, 0x66, 0x89, 0xd3, 0xb4, 0x84, 0x1a, 0x2f, 0x62, 0x65, + 0xbb, 0xae, 0x57, 0x1f, 0xa3, 0xf5, 0xc0, 0x8a, 0x28, 0xc1, 0x33, 0x7e, 0x43, 0xe3, 0xb4, 0xa1, + 0x73, 0x43, 0x7a, 0xda, 0xa7, 0x98, 0x8f, 0x83, 0xa4, 0xb7, 0x0c, 0x6c, 0xba, 0xaa, 0xe3, 0xda, + 0x58, 0x6b, 0x1b, 0xe6, 0x2e, 0x5d, 0x6a, 0x52, 0x4b, 0x93, 0x3b, 0x5a, 0xcb, 0xc1, 0x4a, 0x81, + 0x55, 0xd7, 0x45, 0x2d, 0xe1, 0xa0, 0x0a, 0x64, 0x07, 0x38, 0x12, 0x21, 0x0e, 0x56, 0xed, 0x71, + 0xc8, 0xdf, 0x97, 0x86, 0x4c, 0xc0, 0x35, 0x47, 0x0f, 0x40, 0xf6, 0x15, 0xed, 0x96, 0xa6, 0x8a, + 0x70, 0x8b, 0x49, 0x22, 0x43, 0xca, 0x36, 0x79, 0xc8, 0xf5, 0x38, 0xcc, 0x50, 0x12, 0xab, 0xeb, + 0x62, 0x5b, 0xd5, 0x5b, 0x9a, 0xe3, 0x50, 0xa1, 0xa5, 0x28, 0x29, 0x22, 0x75, 0x1b, 0xa4, 0xaa, + 0x22, 0x6a, 0xd0, 0x45, 0x98, 0xa6, 0x1c, 0xed, 0x6e, 0xcb, 0x35, 0x3a, 0x2d, 0xac, 0x92, 0x00, + 0xd0, 0xa1, 0x4b, 0x8e, 0xd7, 0xb2, 0x29, 0x42, 0xb1, 0xc6, 0x09, 0x48, 0x8b, 0x1c, 0xb4, 0x0c, + 0xf7, 0x53, 0xb6, 0x5d, 0x6c, 0x62, 0x5b, 0x73, 0xb1, 0x8a, 0x3f, 0xd8, 0xd5, 0x5a, 0x8e, 0xaa, + 0x99, 0x4d, 0x75, 0x4f, 0x73, 0xf6, 0x66, 0x67, 0x08, 0x40, 0x39, 0x3a, 0x1b, 0x51, 0x4e, 0x12, + 0xc2, 0x15, 0x4e, 0x57, 0xa5, 0x64, 0x25, 0xb3, 0x79, 0x55, 0x73, 0xf6, 0xd0, 0x12, 0x1c, 0xa7, + 0x28, 0x8e, 0x6b, 0x1b, 0xe6, 0xae, 0xaa, 0xef, 0x61, 0xfd, 0xa6, 0xda, 0x75, 0x77, 0x9e, 0x99, + 0x3d, 0x15, 0x7c, 0x3f, 0x6d, 0x61, 0x9d, 0xd2, 0x54, 0x08, 0xc9, 0x96, 0xbb, 0xf3, 0x0c, 0xaa, + 0x43, 0x96, 0x0c, 0x46, 0xdb, 0x78, 0x15, 0xab, 0x3b, 0x96, 0x4d, 0xd7, 0xd0, 0xfc, 0x00, 0xd3, + 0x14, 0x90, 0xe0, 0xe2, 0x06, 0x67, 0x58, 0xb3, 0x9a, 0x78, 0x69, 0xb2, 0xbe, 0x59, 0xad, 0x2e, + 0x2b, 0x19, 0x81, 0x72, 0xc5, 0xb2, 0x89, 0x42, 0xed, 0x5a, 0x9e, 0x80, 0x33, 0x4c, 0xa1, 0x76, + 0x2d, 0x21, 0xde, 0x8b, 0x30, 0xad, 0xeb, 0xac, 0xcf, 0x86, 0xae, 0xf2, 0x30, 0xcd, 0x99, 0x95, + 0x42, 0xc2, 0xd2, 0xf5, 0x15, 0x46, 0xc0, 0x75, 0xdc, 0x41, 0xcf, 0xc2, 0x31, 0x5f, 0x58, 0x41, + 0xc6, 0xa9, 0xbe, 0x5e, 0xf6, 0xb2, 0x5e, 0x84, 0xe9, 0xce, 0x41, 0x3f, 0x23, 0x0a, 0xbd, 0xb1, + 0x73, 0xd0, 0xcb, 0xf6, 0x34, 0xcc, 0x74, 0xf6, 0x3a, 0xfd, 0x7c, 0xe7, 0x82, 0x7c, 0xa8, 0xb3, + 0xd7, 0xe9, 0x65, 0x7c, 0x88, 0xc6, 0xec, 0x36, 0xd6, 0x35, 0x17, 0x37, 0x67, 0x4f, 0x04, 0xc9, + 0x03, 0x15, 0x68, 0x11, 0x24, 0x5d, 0x57, 0xb1, 0xa9, 0x6d, 0xb7, 0xb0, 0xaa, 0xd9, 0xd8, 0xd4, + 0x9c, 0xd9, 0x79, 0x4a, 0x1c, 0x77, 0xed, 0x2e, 0x56, 0xf2, 0xba, 0x5e, 0xa5, 0x95, 0x25, 0x5a, + 0x87, 0xce, 0xc1, 0x94, 0xb5, 0xfd, 0x8a, 0xce, 0x34, 0x52, 0xed, 0xd8, 0x78, 0xc7, 0xd8, 0x9f, + 0x7d, 0x0f, 0x15, 0x6f, 0x81, 0x54, 0x50, 0x7d, 0xdc, 0xa4, 0xc5, 0xe8, 0x2c, 0x48, 0xba, 0xb3, + 0xa7, 0xd9, 0x1d, 0x6a, 0x92, 0x9d, 0x8e, 0xa6, 0xe3, 0xd9, 0x87, 0x18, 0x29, 0x2b, 0x5f, 0x17, + 0xc5, 0x64, 0x46, 0x38, 0xb7, 0x8d, 0x1d, 0x57, 0x20, 0x9e, 0x66, 0x33, 0x82, 0x96, 0x71, 0xb4, + 0x33, 0x20, 0x11, 0x49, 0x84, 0x5e, 0x7c, 0x86, 0x92, 0xe5, 0x3b, 0x7b, 0x9d, 0xe0, 0x7b, 0x1f, + 0x84, 0x1c, 0xa1, 0xf4, 0x5f, 0x7a, 0x96, 0x39, 0x6e, 0x9d, 0xbd, 0xc0, 0x1b, 0x9f, 0x82, 0xe3, + 0x84, 0xa8, 0x8d, 0x5d, 0xad, 0xa9, 0xb9, 0x5a, 0x80, 0xfa, 0x51, 0x4a, 0x4d, 0xc4, 0xbe, 0xc6, + 0x2b, 0x43, 0xed, 0xb4, 0xbb, 0xdb, 0x07, 0x9e, 0x62, 0x3d, 0xc6, 0xda, 0x49, 0xca, 0x84, 0x6a, + 0xbd, 0x63, 0xce, 0xb9, 0xbc, 0x04, 0xd9, 0xa0, 0xde, 0xa3, 0x34, 0x30, 0xcd, 0x97, 0x22, 0xc4, + 0x09, 0xaa, 0x6c, 0x2c, 0x13, 0xf7, 0xe5, 0xe5, 0xaa, 0x14, 0x25, 0x6e, 0xd4, 0x6a, 0xad, 0x51, + 0x55, 0x95, 0xad, 0xf5, 0x46, 0x6d, 0xad, 0x2a, 0xc5, 0x02, 0x8e, 0xfd, 0xb5, 0x78, 0xea, 0x61, + 0xe9, 0xb4, 0xfc, 0xe9, 0x18, 0xe4, 0xc3, 0x91, 0x1a, 0x7a, 0x2f, 0x9c, 0x10, 0x09, 0x17, 0x07, + 0xbb, 0xea, 0x6d, 0xc3, 0xa6, 0x13, 0xb2, 0xad, 0xb1, 0xc5, 0xd1, 0xd3, 0x9f, 0x19, 0x4e, 0x55, + 0xc7, 0xee, 0x0b, 0x86, 0x4d, 0xa6, 0x5b, 0x5b, 0x73, 0xd1, 0x2a, 0xcc, 0x9b, 0x96, 0xea, 0xb8, + 0x9a, 0xd9, 0xd4, 0xec, 0xa6, 0xea, 0xa7, 0xba, 0x54, 0x4d, 0xd7, 0xb1, 0xe3, 0x58, 0x6c, 0x21, + 0xf4, 0x50, 0xee, 0x33, 0xad, 0x3a, 0x27, 0xf6, 0x57, 0x88, 0x12, 0x27, 0xed, 0x51, 0xdf, 0xd8, + 0x30, 0xf5, 0x3d, 0x05, 0xe9, 0xb6, 0xd6, 0x51, 0xb1, 0xe9, 0xda, 0x07, 0xd4, 0x3f, 0x4f, 0x29, + 0xa9, 0xb6, 0xd6, 0xa9, 0x92, 0x67, 0x74, 0x03, 0x1e, 0xf6, 0x49, 0xd5, 0x16, 0xde, 0xd5, 0xf4, + 0x03, 0x95, 0x3a, 0xe3, 0x34, 0x6d, 0xa0, 0xea, 0x96, 0xb9, 0xd3, 0x32, 0x74, 0xd7, 0xa1, 0xf6, + 0x81, 0xd9, 0x38, 0xd9, 0xe7, 0x58, 0xa5, 0x0c, 0xd7, 0x1c, 0xcb, 0xa4, 0x3e, 0x78, 0x45, 0x50, + 0xbf, 0x2b, 0xe1, 0xd7, 0xb5, 0x78, 0x2a, 0x2e, 0x4d, 0x5e, 0x8b, 0xa7, 0x26, 0xa5, 0xc4, 0xb5, + 0x78, 0x2a, 0x21, 0x25, 0xaf, 0xc5, 0x53, 0x29, 0x29, 0x7d, 0x2d, 0x9e, 0x4a, 0x4b, 0x20, 0xff, + 0x6a, 0x0a, 0xb2, 0xc1, 0xc8, 0x80, 0x04, 0x5a, 0x3a, 0x5d, 0x1b, 0x23, 0xd4, 0x7a, 0x3e, 0x78, + 0x68, 0x1c, 0xb1, 0x58, 0x21, 0x8b, 0xe6, 0x52, 0x82, 0xb9, 0xe1, 0x0a, 0xe3, 0x24, 0x0e, 0x0b, + 0x51, 0x6b, 0xcc, 0xdc, 0x9e, 0x94, 0xc2, 0x9f, 0xd0, 0x0a, 0x24, 0x5e, 0x71, 0x28, 0x76, 0x82, + 0x62, 0xbf, 0xe7, 0x70, 0xec, 0x6b, 0x75, 0x0a, 0x9e, 0xbe, 0x56, 0x57, 0xd7, 0x37, 0x94, 0xb5, + 0xd2, 0xaa, 0xc2, 0xd9, 0xd1, 0x49, 0x88, 0xb7, 0xb4, 0x57, 0x0f, 0xc2, 0xcb, 0x2b, 0x2d, 0x42, + 0x8b, 0x50, 0xe8, 0x9a, 0xb7, 0xb0, 0x6d, 0xec, 0x18, 0x64, 0xa8, 0x08, 0x55, 0x21, 0x48, 0x95, + 0xf7, 0x6b, 0x57, 0x09, 0xfd, 0x98, 0xea, 0x71, 0x12, 0xe2, 0xb7, 0xb1, 0x76, 0x33, 0xbc, 0x08, + 0xd2, 0x22, 0x74, 0x06, 0xb2, 0x4d, 0xbc, 0xdd, 0xdd, 0x55, 0x6d, 0xdc, 0xd4, 0x74, 0x37, 0x6c, + 0xfa, 0x33, 0xb4, 0x4a, 0xa1, 0x35, 0xe8, 0x3a, 0xa4, 0xc9, 0x18, 0x99, 0x74, 0x8c, 0xa7, 0xa8, + 0x08, 0x1e, 0x3b, 0x5c, 0x04, 0x7c, 0x88, 0x05, 0x93, 0xe2, 0xf3, 0xa3, 0x2b, 0x90, 0x70, 0x35, + 0x7b, 0x17, 0xbb, 0xd4, 0xf2, 0xe7, 0x07, 0x24, 0x3f, 0x06, 0x20, 0x35, 0x28, 0x07, 0x8d, 0x69, + 0x39, 0xf7, 0x3b, 0x68, 0x65, 0xce, 0xc3, 0x24, 0x55, 0x0f, 0x04, 0xc0, 0x15, 0x44, 0x9a, 0x40, + 0x29, 0x88, 0x57, 0x36, 0x14, 0x62, 0x69, 0x24, 0xc8, 0xb2, 0x52, 0x75, 0xb3, 0x56, 0xad, 0x54, + 0xa5, 0xa8, 0x7c, 0x11, 0x12, 0x6c, 0xcc, 0x89, 0x15, 0xf2, 0x46, 0x5d, 0x9a, 0xe0, 0x8f, 0x1c, + 0x23, 0x22, 0x6a, 0xb7, 0xd6, 0xca, 0x55, 0x45, 0x8a, 0xca, 0x5b, 0x50, 0xe8, 0x91, 0x13, 0x3a, + 0x06, 0x53, 0x4a, 0xb5, 0x51, 0x5d, 0x27, 0x71, 0x96, 0xba, 0xb5, 0x7e, 0x7d, 0x7d, 0xe3, 0x85, + 0x75, 0x69, 0x22, 0x5c, 0x2c, 0x4c, 0x5a, 0x04, 0xcd, 0x80, 0xe4, 0x17, 0xd7, 0x37, 0xb6, 0x14, + 0xda, 0x9a, 0xef, 0x89, 0x82, 0xd4, 0x2b, 0x35, 0x74, 0x02, 0xa6, 0x1b, 0x25, 0x65, 0xa5, 0xda, + 0x50, 0x59, 0xec, 0xe8, 0x41, 0xcf, 0x80, 0x14, 0xac, 0xb8, 0x52, 0xa3, 0xa1, 0xf1, 0x3c, 0x9c, + 0x0a, 0x96, 0x56, 0x5f, 0x6c, 0x54, 0xd7, 0xeb, 0xf4, 0xe5, 0xa5, 0xf5, 0x15, 0x62, 0x5f, 0x7b, + 0xf0, 0x44, 0xb4, 0x1a, 0x23, 0x4d, 0x0d, 0xe3, 0x55, 0x57, 0x97, 0xa5, 0x78, 0x6f, 0xf1, 0xc6, + 0x7a, 0x75, 0xe3, 0x8a, 0x34, 0xd9, 0xfb, 0x76, 0x1a, 0xc1, 0x26, 0x50, 0x11, 0x8e, 0xf7, 0x96, + 0xaa, 0xd5, 0xf5, 0x86, 0xf2, 0x92, 0x94, 0xec, 0x7d, 0x71, 0xbd, 0xaa, 0xdc, 0xa8, 0x55, 0xaa, + 0x52, 0x0a, 0x1d, 0x07, 0x14, 0x6e, 0x51, 0xe3, 0xea, 0xc6, 0xb2, 0x94, 0xee, 0xb3, 0x28, 0xb2, + 0x03, 0xd9, 0x60, 0x18, 0xf9, 0xee, 0xe4, 0x92, 0x5e, 0x8f, 0x42, 0x26, 0x10, 0x16, 0x12, 0x7f, + 0x5e, 0x6b, 0xb5, 0xac, 0xdb, 0xaa, 0xd6, 0x32, 0x34, 0x87, 0xdb, 0x1b, 0xa0, 0x45, 0x25, 0x52, + 0x32, 0xee, 0xfc, 0x1e, 0xdf, 0xc2, 0x27, 0xbe, 0x1e, 0x2d, 0xfc, 0xa4, 0x94, 0x90, 0x7f, 0x2c, + 0x02, 0x52, 0x6f, 0xbc, 0xd7, 0xd3, 0xfd, 0xc8, 0xb0, 0xee, 0xbf, 0x2b, 0x63, 0xf7, 0xa3, 0x11, + 0xc8, 0x87, 0x83, 0xbc, 0x9e, 0xe6, 0x3d, 0xf0, 0xff, 0xb4, 0x79, 0x7f, 0x14, 0x85, 0x5c, 0x28, + 0xb4, 0x1b, 0xb7, 0x75, 0x1f, 0x84, 0x29, 0xa3, 0x89, 0xdb, 0x1d, 0xcb, 0xc5, 0xa6, 0x7e, 0xa0, + 0xb6, 0xf0, 0x2d, 0xdc, 0x9a, 0x95, 0xa9, 0x51, 0x3e, 0x7f, 0x78, 0xf0, 0xb8, 0x58, 0xf3, 0xf9, + 0x56, 0x09, 0xdb, 0xd2, 0x74, 0x6d, 0xb9, 0xba, 0xb6, 0xb9, 0xd1, 0xa8, 0xae, 0x57, 0x5e, 0x12, + 0xd6, 0x45, 0x91, 0x8c, 0x1e, 0xb2, 0x77, 0xd0, 0x68, 0x6f, 0x82, 0xd4, 0xdb, 0x28, 0x62, 0x2b, + 0x06, 0x34, 0x4b, 0x9a, 0x40, 0xd3, 0x50, 0x58, 0xdf, 0x50, 0xeb, 0xb5, 0xe5, 0xaa, 0x5a, 0xbd, + 0x72, 0xa5, 0x5a, 0x69, 0xd4, 0x59, 0x3a, 0xd0, 0xa3, 0x6e, 0x48, 0xd1, 0xa0, 0x88, 0x7f, 0x38, + 0x06, 0xd3, 0x03, 0x5a, 0x82, 0x4a, 0x3c, 0x90, 0x67, 0xb9, 0x85, 0xc7, 0xc6, 0x69, 0xfd, 0x22, + 0x71, 0xa5, 0x37, 0x35, 0xdb, 0xe5, 0x71, 0xff, 0x59, 0x20, 0x52, 0x32, 0x5d, 0xb2, 0xb2, 0xdb, + 0x3c, 0xcd, 0xca, 0xa2, 0xfb, 0x82, 0x5f, 0xce, 0x32, 0xad, 0x8f, 0x02, 0xea, 0x58, 0x8e, 0xe1, + 0x1a, 0xb7, 0xb0, 0x6a, 0x98, 0x22, 0x27, 0x4b, 0xa2, 0xfd, 0xb8, 0x22, 0x89, 0x9a, 0x9a, 0xe9, + 0x7a, 0xd4, 0x26, 0xde, 0xd5, 0x7a, 0xa8, 0x89, 0xe7, 0x11, 0x53, 0x24, 0x51, 0xe3, 0x51, 0x3f, + 0x00, 0xd9, 0xa6, 0xd5, 0x25, 0x21, 0x10, 0xa3, 0x23, 0xd6, 0x22, 0xa2, 0x64, 0x58, 0x99, 0x47, + 0xc2, 0x83, 0x5b, 0x3f, 0x19, 0x9c, 0x55, 0x32, 0xac, 0x8c, 0x91, 0x9c, 0x86, 0x82, 0xb6, 0xbb, + 0x6b, 0x13, 0x70, 0x01, 0xc4, 0xc2, 0xf5, 0xbc, 0x57, 0x4c, 0x09, 0x8b, 0xd7, 0x20, 0x25, 0xe4, + 0x40, 0x3c, 0x58, 0x22, 0x09, 0xb5, 0xc3, 0x72, 0x50, 0xd1, 0x33, 0x69, 0x25, 0x65, 0x8a, 0xca, + 0x07, 0x20, 0x6b, 0x38, 0xaa, 0xbf, 0xb7, 0x15, 0x5d, 0x88, 0x9e, 0x49, 0x29, 0x19, 0xc3, 0xf1, + 0xf6, 0x05, 0xe4, 0x9f, 0x89, 0x42, 0x3e, 0xbc, 0x6b, 0x87, 0x96, 0x21, 0xd5, 0xb2, 0x74, 0x8d, + 0xaa, 0x16, 0xdb, 0x32, 0x3e, 0x33, 0x62, 0xa3, 0x6f, 0x71, 0x95, 0xd3, 0x2b, 0x1e, 0x67, 0xf1, + 0xdf, 0x45, 0x20, 0x25, 0x8a, 0xd1, 0x71, 0x88, 0x77, 0x34, 0x77, 0x8f, 0xc2, 0x4d, 0x96, 0xa3, + 0x52, 0x44, 0xa1, 0xcf, 0xa4, 0xdc, 0xe9, 0x68, 0x26, 0x55, 0x01, 0x5e, 0x4e, 0x9e, 0xc9, 0xb8, + 0xb6, 0xb0, 0xd6, 0xa4, 0xb9, 0x00, 0xab, 0xdd, 0xc6, 0xa6, 0xeb, 0x88, 0x71, 0xe5, 0xe5, 0x15, + 0x5e, 0x8c, 0x1e, 0x81, 0x29, 0xd7, 0xd6, 0x8c, 0x56, 0x88, 0x36, 0x4e, 0x69, 0x25, 0x51, 0xe1, + 0x11, 0x2f, 0xc1, 0x49, 0x81, 0xdb, 0xc4, 0xae, 0xa6, 0xef, 0xe1, 0xa6, 0xcf, 0x94, 0xa0, 0x39, + 0xbf, 0x13, 0x9c, 0x60, 0x99, 0xd7, 0x0b, 0x5e, 0xf9, 0xb3, 0x51, 0x98, 0x12, 0xd9, 0x8b, 0xa6, + 0x27, 0xac, 0x35, 0x00, 0xcd, 0x34, 0x2d, 0x37, 0x28, 0xae, 0x7e, 0x55, 0xee, 0xe3, 0x5b, 0x2c, + 0x79, 0x4c, 0x4a, 0x00, 0xa0, 0xf8, 0xa5, 0x08, 0x80, 0x5f, 0x35, 0x54, 0x6e, 0xf3, 0x90, 0xe1, + 0x7b, 0xb2, 0x74, 0x63, 0x9f, 0x25, 0xbc, 0x80, 0x15, 0x5d, 0x31, 0x5a, 0x34, 0x2d, 0xb9, 0x8d, + 0x77, 0x0d, 0x93, 0xef, 0xa7, 0xb0, 0x07, 0x91, 0x96, 0x8c, 0xfb, 0xdb, 0x53, 0x0a, 0xa4, 0x1c, + 0xdc, 0xd6, 0x4c, 0xd7, 0xd0, 0xf9, 0x0e, 0xc9, 0xa5, 0x23, 0x35, 0x7e, 0xb1, 0xce, 0xb9, 0x15, + 0x0f, 0x47, 0x3e, 0x03, 0x29, 0x51, 0x4a, 0x1c, 0xbf, 0xf5, 0x8d, 0xf5, 0xaa, 0x34, 0x81, 0x92, + 0x10, 0xab, 0x57, 0x1b, 0x52, 0x84, 0x84, 0x9d, 0xa5, 0xd5, 0x5a, 0xa9, 0x2e, 0x45, 0xcb, 0x7f, + 0x13, 0xa6, 0x75, 0xab, 0xdd, 0xfb, 0xc2, 0xb2, 0xd4, 0x93, 0xf2, 0x73, 0xae, 0x46, 0x5e, 0x7e, + 0x8c, 0x13, 0xed, 0x5a, 0x2d, 0xcd, 0xdc, 0x5d, 0xb4, 0xec, 0x5d, 0xff, 0x58, 0x04, 0x89, 0x0e, + 0x9c, 0xc0, 0xe1, 0x88, 0xce, 0xf6, 0xff, 0x8a, 0x44, 0x7e, 0x3c, 0x1a, 0x5b, 0xd9, 0x2c, 0xff, + 0x5c, 0xb4, 0xb8, 0xc2, 0x18, 0x37, 0x45, 0x77, 0x14, 0xbc, 0xd3, 0xc2, 0x3a, 0x69, 0x3c, 0xfc, + 0xe9, 0x23, 0x30, 0xb3, 0x6b, 0xed, 0x5a, 0x14, 0xe9, 0x3c, 0xf9, 0xc5, 0xcf, 0x55, 0xa4, 0xbd, + 0xd2, 0xe2, 0xc8, 0x43, 0x18, 0x4b, 0xeb, 0x30, 0xcd, 0x89, 0x55, 0xba, 0x7d, 0xcb, 0x92, 0x0b, + 0xe8, 0xd0, 0xcc, 0xf6, 0xec, 0x2f, 0xfd, 0x09, 0xf5, 0x4a, 0x94, 0x29, 0xce, 0x4a, 0xea, 0x58, + 0xfe, 0x61, 0x49, 0x81, 0x63, 0x21, 0x3c, 0x66, 0x23, 0xb0, 0x3d, 0x02, 0xf1, 0xb7, 0x38, 0xe2, + 0x74, 0x00, 0xb1, 0xce, 0x59, 0x97, 0x2a, 0x90, 0x3b, 0x0a, 0xd6, 0xbf, 0xe6, 0x58, 0x59, 0x1c, + 0x04, 0x59, 0x81, 0x02, 0x05, 0xd1, 0xbb, 0x8e, 0x6b, 0xb5, 0xa9, 0x01, 0x3e, 0x1c, 0xe6, 0xdf, + 0xfc, 0x09, 0x9b, 0xb4, 0x79, 0xc2, 0x56, 0xf1, 0xb8, 0x96, 0x96, 0x80, 0xee, 0x58, 0x37, 0xb1, + 0xde, 0x1a, 0x81, 0xf0, 0x19, 0xde, 0x10, 0x8f, 0x7e, 0xe9, 0x06, 0xcc, 0x90, 0xdf, 0xd4, 0x3e, + 0x06, 0x5b, 0x32, 0x3a, 0x0d, 0x3e, 0xfb, 0xbb, 0x1f, 0x62, 0x76, 0x61, 0xda, 0x03, 0x08, 0xb4, + 0x29, 0x30, 0x8a, 0xbb, 0xd8, 0x75, 0xb1, 0xed, 0xa8, 0x5a, 0x6b, 0x50, 0xf3, 0x02, 0x79, 0xc4, + 0xd9, 0x1f, 0xfa, 0x72, 0x78, 0x14, 0x57, 0x18, 0x67, 0xa9, 0xd5, 0x5a, 0xda, 0x82, 0x13, 0x03, + 0xb4, 0x62, 0x0c, 0xcc, 0x1f, 0xe6, 0x98, 0x33, 0x7d, 0x9a, 0x41, 0x60, 0x37, 0x41, 0x94, 0x7b, + 0x63, 0x39, 0x06, 0xe6, 0x8f, 0x70, 0x4c, 0xc4, 0x79, 0xc5, 0x90, 0x12, 0xc4, 0x6b, 0x30, 0x75, + 0x0b, 0xdb, 0xdb, 0x96, 0xc3, 0x73, 0xb7, 0x63, 0xc0, 0xfd, 0x28, 0x87, 0x2b, 0x70, 0x46, 0x9a, + 0xcc, 0x25, 0x58, 0xcf, 0x42, 0x6a, 0x47, 0xd3, 0xf1, 0x18, 0x10, 0x77, 0x39, 0x44, 0x92, 0xd0, + 0x13, 0xd6, 0x12, 0x64, 0x77, 0x2d, 0xbe, 0x44, 0x8e, 0x66, 0xff, 0x31, 0xce, 0x9e, 0x11, 0x3c, + 0x1c, 0xa2, 0x63, 0x75, 0xba, 0x2d, 0xb2, 0x7e, 0x8e, 0x86, 0xf8, 0x87, 0x02, 0x42, 0xf0, 0x70, + 0x88, 0x23, 0x88, 0xf5, 0xa3, 0x02, 0xc2, 0x09, 0xc8, 0xf3, 0x79, 0xc8, 0x58, 0x66, 0xeb, 0xc0, + 0x32, 0xc7, 0x69, 0xc4, 0xc7, 0x38, 0x02, 0x70, 0x16, 0x02, 0x70, 0x19, 0xd2, 0xe3, 0x0e, 0xc4, + 0x4f, 0x7d, 0x59, 0x4c, 0x0f, 0x31, 0x02, 0x2b, 0x50, 0x10, 0x06, 0xca, 0xb0, 0xcc, 0x31, 0x20, + 0x7e, 0x9a, 0x43, 0xe4, 0x03, 0x6c, 0xbc, 0x1b, 0x2e, 0x76, 0xdc, 0x5d, 0x3c, 0x0e, 0xc8, 0xcf, + 0x88, 0x6e, 0x70, 0x16, 0x2e, 0xca, 0x6d, 0x6c, 0xea, 0x7b, 0xe3, 0x21, 0x7c, 0x5c, 0x88, 0x52, + 0xf0, 0x10, 0x88, 0x0a, 0xe4, 0xda, 0x9a, 0xed, 0xec, 0x69, 0xad, 0xb1, 0x86, 0xe3, 0x67, 0x39, + 0x46, 0xd6, 0x63, 0xe2, 0x12, 0xe9, 0x9a, 0x47, 0x81, 0xf9, 0x39, 0x21, 0x91, 0x00, 0x1b, 0x9f, + 0x7a, 0x8e, 0x4b, 0x13, 0xdd, 0x47, 0x41, 0xfb, 0x47, 0x62, 0xea, 0x31, 0xde, 0xb5, 0x20, 0xe2, + 0x65, 0x48, 0x3b, 0xc6, 0xab, 0x63, 0xc1, 0xfc, 0xbc, 0x18, 0x69, 0xca, 0x40, 0x98, 0x5f, 0x82, + 0x93, 0x03, 0x97, 0x89, 0x31, 0xc0, 0x7e, 0x81, 0x83, 0x1d, 0x1f, 0xb0, 0x54, 0x70, 0x93, 0x70, + 0x54, 0xc8, 0x7f, 0x2c, 0x4c, 0x02, 0xee, 0xc1, 0xda, 0x24, 0x41, 0x8b, 0xa3, 0xed, 0x1c, 0x4d, + 0x6a, 0xff, 0x44, 0x48, 0x8d, 0xf1, 0x86, 0xa4, 0xd6, 0x80, 0xe3, 0x1c, 0xf1, 0x68, 0xe3, 0xfa, + 0x8b, 0xc2, 0xb0, 0x32, 0xee, 0xad, 0xf0, 0xe8, 0x7e, 0x33, 0x14, 0x3d, 0x71, 0x0a, 0xef, 0xd8, + 0x51, 0xdb, 0x5a, 0x67, 0x0c, 0xe4, 0x5f, 0xe2, 0xc8, 0xc2, 0xe2, 0x7b, 0xee, 0xb5, 0xb3, 0xa6, + 0x75, 0x08, 0xf8, 0x8b, 0x30, 0x2b, 0xc0, 0xbb, 0xa6, 0x8d, 0x75, 0x6b, 0xd7, 0x34, 0x5e, 0xc5, + 0xcd, 0x31, 0xa0, 0x7f, 0xb9, 0x67, 0xa8, 0xb6, 0x02, 0xec, 0x04, 0xb9, 0x06, 0x92, 0xe7, 0xab, + 0xa8, 0x46, 0xbb, 0x63, 0xd9, 0xee, 0x08, 0xc4, 0x5f, 0x11, 0x23, 0xe5, 0xf1, 0xd5, 0x28, 0xdb, + 0x52, 0x15, 0xd8, 0xe9, 0x8f, 0x71, 0x55, 0xf2, 0x13, 0x1c, 0x28, 0xe7, 0x73, 0x71, 0xc3, 0xa1, + 0x5b, 0xed, 0x8e, 0x66, 0x8f, 0x63, 0xff, 0xfe, 0xa9, 0x30, 0x1c, 0x9c, 0x85, 0x1b, 0x0e, 0xe2, + 0xd1, 0x91, 0xd5, 0x7e, 0x0c, 0x84, 0x4f, 0x0a, 0xc3, 0x21, 0x78, 0x38, 0x84, 0x70, 0x18, 0xc6, + 0x80, 0xf8, 0x55, 0x01, 0x21, 0x78, 0x08, 0xc4, 0xfb, 0xfd, 0x85, 0xd6, 0xc6, 0xbb, 0x86, 0xe3, + 0xda, 0xcc, 0x25, 0x3f, 0x1c, 0xea, 0x53, 0x5f, 0x0e, 0x3b, 0x61, 0x4a, 0x80, 0x95, 0x58, 0x22, + 0xbe, 0xf5, 0x41, 0x43, 0xb6, 0xd1, 0x0d, 0xfb, 0x35, 0x61, 0x89, 0x02, 0x6c, 0xa4, 0x6d, 0x01, + 0x0f, 0x91, 0x88, 0x5d, 0x27, 0x81, 0xca, 0x18, 0x70, 0xff, 0xac, 0xa7, 0x71, 0x75, 0xc1, 0x4b, + 0x30, 0x03, 0xfe, 0x4f, 0xd7, 0xbc, 0x89, 0x0f, 0xc6, 0xd2, 0xce, 0x4f, 0xf7, 0xf8, 0x3f, 0x5b, + 0x8c, 0x93, 0xd9, 0x90, 0x42, 0x8f, 0x3f, 0x85, 0x46, 0x9d, 0xf5, 0x9b, 0xfd, 0xf6, 0xb7, 0x78, + 0x7f, 0xc3, 0xee, 0xd4, 0xd2, 0x2a, 0x51, 0xf2, 0xb0, 0xd3, 0x33, 0x1a, 0xec, 0x43, 0x6f, 0x79, + 0x7a, 0x1e, 0xf2, 0x79, 0x96, 0xae, 0x40, 0x2e, 0xe4, 0xf0, 0x8c, 0x86, 0xfa, 0x5b, 0x1c, 0x2a, + 0x1b, 0xf4, 0x77, 0x96, 0x2e, 0x42, 0x9c, 0x38, 0x2f, 0xa3, 0xd9, 0xbf, 0x93, 0xb3, 0x53, 0xf2, + 0xa5, 0xe7, 0x20, 0x25, 0x9c, 0x96, 0xd1, 0xac, 0xdf, 0xc5, 0x59, 0x3d, 0x16, 0xc2, 0x2e, 0x1c, + 0x96, 0xd1, 0xec, 0x7f, 0x5b, 0xb0, 0x0b, 0x16, 0xc2, 0x3e, 0xbe, 0x08, 0x7f, 0xe3, 0xef, 0xc4, + 0xf9, 0xa2, 0x23, 0x64, 0x77, 0x19, 0x92, 0xdc, 0x53, 0x19, 0xcd, 0xfd, 0xdd, 0xfc, 0xe5, 0x82, + 0x63, 0xe9, 0x69, 0x98, 0x1c, 0x53, 0xe0, 0x7f, 0x97, 0xb3, 0x32, 0xfa, 0xa5, 0x0a, 0x64, 0x02, + 0xde, 0xc9, 0x68, 0xf6, 0xef, 0xe5, 0xec, 0x41, 0x2e, 0xd2, 0x74, 0xee, 0x9d, 0x8c, 0x06, 0xf8, + 0x7b, 0xa2, 0xe9, 0x9c, 0x83, 0x88, 0x4d, 0x38, 0x26, 0xa3, 0xb9, 0x3f, 0x22, 0xa4, 0x2e, 0x58, + 0x96, 0x9e, 0x87, 0xb4, 0xb7, 0xd8, 0x8c, 0xe6, 0xff, 0x3e, 0xce, 0xef, 0xf3, 0x10, 0x09, 0x04, + 0x16, 0xbb, 0xd1, 0x10, 0x7f, 0x5f, 0x48, 0x20, 0xc0, 0x45, 0xa6, 0x51, 0xaf, 0x03, 0x33, 0x1a, + 0xe9, 0xfb, 0xc5, 0x34, 0xea, 0xf1, 0x5f, 0xc8, 0x68, 0x52, 0x9b, 0x3f, 0x1a, 0xe2, 0x1f, 0x88, + 0xd1, 0xa4, 0xf4, 0xa4, 0x19, 0xbd, 0x1e, 0xc1, 0x68, 0x8c, 0x1f, 0x14, 0xcd, 0xe8, 0x71, 0x08, + 0x96, 0x36, 0x01, 0xf5, 0x7b, 0x03, 0xa3, 0xf1, 0x5e, 0xe7, 0x78, 0x53, 0x7d, 0xce, 0xc0, 0xd2, + 0x0b, 0x70, 0x7c, 0xb0, 0x27, 0x30, 0x1a, 0xf5, 0x87, 0xde, 0xea, 0x89, 0xdd, 0x82, 0x8e, 0xc0, + 0x52, 0xc3, 0x5f, 0x52, 0x82, 0x5e, 0xc0, 0x68, 0xd8, 0x1f, 0x7e, 0x2b, 0x6c, 0xb8, 0x83, 0x4e, + 0xc0, 0x52, 0x09, 0xc0, 0x5f, 0x80, 0x47, 0x63, 0xfd, 0x28, 0xc7, 0x0a, 0x30, 0x91, 0xa9, 0xc1, + 0xd7, 0xdf, 0xd1, 0xfc, 0x77, 0xc5, 0xd4, 0xe0, 0x1c, 0x64, 0x6a, 0x88, 0xa5, 0x77, 0x34, 0xf7, + 0x8f, 0x89, 0xa9, 0x21, 0x58, 0x88, 0x66, 0x07, 0x56, 0xb7, 0xd1, 0x08, 0x1f, 0x13, 0x9a, 0x1d, + 0xe0, 0x5a, 0x5a, 0x87, 0xa9, 0xbe, 0x05, 0x71, 0x34, 0xd4, 0x8f, 0x73, 0x28, 0xa9, 0x77, 0x3d, + 0x0c, 0x2e, 0x5e, 0x7c, 0x31, 0x1c, 0x8d, 0xf6, 0x13, 0x3d, 0x8b, 0x17, 0x5f, 0x0b, 0x97, 0x2e, + 0x43, 0xca, 0xec, 0xb6, 0x5a, 0x64, 0xf2, 0xa0, 0xc3, 0xcf, 0xe7, 0xce, 0xfe, 0xb7, 0xaf, 0x72, + 0xe9, 0x08, 0x86, 0xa5, 0x8b, 0x30, 0x89, 0xdb, 0xdb, 0xb8, 0x39, 0x8a, 0xf3, 0x8b, 0x5f, 0x15, + 0x06, 0x93, 0x50, 0x2f, 0x3d, 0x0f, 0xc0, 0x52, 0x23, 0x74, 0xe3, 0x7c, 0x04, 0xef, 0x97, 0xbe, + 0xca, 0x0f, 0xc4, 0xf9, 0x2c, 0x3e, 0x00, 0x3b, 0x5e, 0x77, 0x38, 0xc0, 0x97, 0xc3, 0x00, 0x74, + 0x44, 0x9e, 0x85, 0xe4, 0x2b, 0x8e, 0x65, 0xba, 0xda, 0xee, 0x28, 0xee, 0x3f, 0xe5, 0xdc, 0x82, + 0x9e, 0x08, 0xac, 0x6d, 0xd9, 0xd8, 0xd5, 0x76, 0x9d, 0x51, 0xbc, 0xff, 0x9d, 0xf3, 0x7a, 0x0c, + 0x84, 0x59, 0xd7, 0x1c, 0x77, 0x9c, 0x7e, 0xff, 0x99, 0x60, 0x16, 0x0c, 0xa4, 0xd1, 0xe4, 0xf7, + 0x4d, 0x7c, 0x30, 0x8a, 0xf7, 0xcf, 0x45, 0xa3, 0x39, 0xfd, 0xd2, 0x73, 0x90, 0x26, 0x3f, 0xd9, + 0x29, 0xd7, 0x11, 0xcc, 0x7f, 0xc1, 0x99, 0x7d, 0x0e, 0xf2, 0x66, 0xc7, 0x6d, 0xba, 0xc6, 0x68, + 0x61, 0x7f, 0x85, 0x8f, 0xb4, 0xa0, 0x5f, 0x2a, 0x41, 0xc6, 0x71, 0x9b, 0xcd, 0x2e, 0xf7, 0x4f, + 0x47, 0xb0, 0xff, 0x8f, 0xaf, 0x7a, 0x29, 0x0b, 0x8f, 0x87, 0x8c, 0xf6, 0xed, 0x9b, 0x6e, 0xc7, + 0xa2, 0xfb, 0x2d, 0xa3, 0x10, 0xde, 0xe2, 0x08, 0x01, 0x96, 0xa5, 0x0a, 0x64, 0x49, 0x5f, 0x6c, + 0xdc, 0xc1, 0x74, 0x73, 0x6c, 0x04, 0xc4, 0x5f, 0x72, 0x01, 0x84, 0x98, 0xca, 0xdf, 0xfa, 0x99, + 0x37, 0xe7, 0x22, 0x9f, 0x7d, 0x73, 0x2e, 0xf2, 0x47, 0x6f, 0xce, 0x45, 0x3e, 0xf2, 0xb9, 0xb9, + 0x89, 0xcf, 0x7e, 0x6e, 0x6e, 0xe2, 0xf7, 0x3f, 0x37, 0x37, 0x31, 0x38, 0x4b, 0x0c, 0x2b, 0xd6, + 0x8a, 0xc5, 0xf2, 0xc3, 0x2f, 0x3f, 0xb4, 0x6b, 0xb8, 0x7b, 0xdd, 0xed, 0x45, 0xdd, 0x6a, 0x9f, + 0xd7, 0x2d, 0xa7, 0x6d, 0x39, 0xe7, 0xc3, 0x79, 0x5d, 0xfa, 0x0b, 0xfe, 0x2a, 0x42, 0x62, 0xe6, + 0x70, 0x3a, 0x57, 0x33, 0x0f, 0x86, 0x7d, 0x4c, 0x77, 0x09, 0x62, 0x25, 0xf3, 0x00, 0x9d, 0x64, + 0x06, 0x4e, 0xed, 0xda, 0x2d, 0x7e, 0xd4, 0x32, 0x49, 0x9e, 0xb7, 0xec, 0x16, 0x9a, 0xf1, 0xcf, + 0x43, 0x47, 0xce, 0x64, 0xf9, 0x21, 0xe7, 0xf2, 0xf7, 0x46, 0x8e, 0xd6, 0x93, 0x54, 0xc9, 0x3c, + 0xa0, 0x1d, 0xd9, 0x8c, 0xbc, 0xfc, 0xe8, 0xc8, 0x3c, 0xf7, 0x4d, 0xd3, 0xba, 0x6d, 0x92, 0x66, + 0x77, 0xb6, 0x45, 0x8e, 0x7b, 0xae, 0x37, 0xc7, 0xfd, 0x02, 0x6e, 0xb5, 0xae, 0x13, 0xba, 0x06, + 0x61, 0xd9, 0x4e, 0xb0, 0x53, 0xfd, 0xf0, 0xfd, 0x51, 0x98, 0xeb, 0x4b, 0x67, 0x73, 0x25, 0x18, + 0x26, 0x84, 0x25, 0x48, 0x2d, 0x0b, 0xdd, 0x9a, 0x85, 0xa4, 0x83, 0x75, 0xcb, 0x6c, 0x3a, 0x54, + 0x10, 0x31, 0x45, 0x3c, 0x12, 0x41, 0x98, 0x9a, 0x69, 0x39, 0xfc, 0xb0, 0x32, 0x7b, 0x28, 0xff, + 0xc8, 0x11, 0x05, 0x91, 0x13, 0x6f, 0x12, 0xd2, 0x78, 0x62, 0x4c, 0x69, 0x88, 0x4e, 0x84, 0x32, + 0xff, 0xe3, 0x4a, 0xe5, 0x07, 0xa3, 0x30, 0xdf, 0x2b, 0x15, 0x32, 0xb3, 0x1c, 0x57, 0x6b, 0x77, + 0x86, 0x89, 0xe5, 0x32, 0xa4, 0x1b, 0x82, 0xe6, 0xc8, 0x72, 0xb9, 0x7b, 0x44, 0xb9, 0xe4, 0xbd, + 0x57, 0x09, 0xc1, 0x5c, 0x18, 0x53, 0x30, 0x5e, 0x3f, 0xee, 0x49, 0x32, 0xff, 0x3b, 0x01, 0x27, + 0xd9, 0x74, 0x52, 0xd9, 0x54, 0x62, 0x0f, 0x5c, 0x26, 0xd9, 0x60, 0xd5, 0xe8, 0x7d, 0x12, 0xf9, + 0x3a, 0x4c, 0xd7, 0x88, 0xb5, 0x20, 0x51, 0x90, 0xbf, 0xc3, 0x33, 0xf0, 0x3c, 0xf7, 0x42, 0xc8, + 0xe1, 0xe7, 0xfb, 0x5b, 0xc1, 0x22, 0xf9, 0xdb, 0x23, 0x20, 0xd5, 0x75, 0xad, 0xa5, 0xd9, 0x5f, + 0x2b, 0x14, 0x7a, 0x1a, 0x80, 0x1d, 0xf7, 0xf0, 0x3e, 0xdc, 0xcb, 0x5f, 0x98, 0x5d, 0x0c, 0x76, + 0x6e, 0x91, 0xbd, 0x89, 0x9e, 0xa0, 0x4a, 0x53, 0x5a, 0xf2, 0xf3, 0xdc, 0x8b, 0x00, 0x7e, 0x05, + 0x3a, 0x05, 0x27, 0xea, 0x95, 0xd2, 0x6a, 0x49, 0x11, 0x87, 0x84, 0xea, 0x9b, 0xd5, 0x4a, 0xed, + 0x4a, 0xad, 0xba, 0x2c, 0x4d, 0xa0, 0xe3, 0x80, 0x82, 0x95, 0xde, 0xa1, 0xa6, 0x63, 0x30, 0x15, + 0x2c, 0x67, 0x5f, 0xa9, 0x44, 0x89, 0xa7, 0x68, 0xb4, 0x3b, 0x2d, 0x4c, 0x77, 0x1e, 0x55, 0x43, + 0x48, 0x6d, 0xb4, 0x13, 0xf2, 0xdb, 0xff, 0x91, 0x7d, 0xb9, 0x30, 0xed, 0xb3, 0x7b, 0x32, 0x5f, + 0x5a, 0x85, 0x29, 0x4d, 0xd7, 0x71, 0x27, 0x04, 0x39, 0xc2, 0x54, 0x13, 0x40, 0xba, 0x97, 0xca, + 0x39, 0x7d, 0xb4, 0xa7, 0x21, 0xe1, 0xd0, 0xde, 0x8f, 0x82, 0xf8, 0x1d, 0x0e, 0xc1, 0xc9, 0x97, + 0x4c, 0x98, 0x22, 0x9e, 0x9f, 0x66, 0xe3, 0x40, 0x33, 0x0e, 0xcf, 0x33, 0xfc, 0xf3, 0x5f, 0x79, + 0x9c, 0xee, 0xac, 0x3e, 0x10, 0x1e, 0x96, 0x01, 0xea, 0xa4, 0x48, 0x1c, 0xdb, 0x6f, 0x28, 0x86, + 0xbc, 0x78, 0x1f, 0x6f, 0xf0, 0xe1, 0x2f, 0xfb, 0x75, 0xfe, 0xb2, 0xb9, 0x41, 0x3a, 0x10, 0x78, + 0x53, 0x8e, 0xa3, 0xb2, 0x8a, 0x72, 0x75, 0xd8, 0x9c, 0x7e, 0xf9, 0x91, 0xfe, 0xd5, 0x89, 0xfd, + 0xf7, 0x18, 0x45, 0xbe, 0x1c, 0x7c, 0x8d, 0x37, 0xf7, 0xfe, 0x20, 0x06, 0x53, 0x5a, 0xdb, 0x30, + 0xad, 0xf3, 0xf4, 0x5f, 0x3e, 0xe7, 0x26, 0xe9, 0xc3, 0x18, 0x9b, 0x92, 0x97, 0xd8, 0x54, 0x18, + 0xad, 0x31, 0x7f, 0xf1, 0x3d, 0x3f, 0x3d, 0xe9, 0x4f, 0x97, 0xa5, 0x35, 0x90, 0xc4, 0x21, 0x5e, + 0x6c, 0xea, 0x56, 0x73, 0xac, 0x2c, 0xc5, 0x57, 0x04, 0x86, 0xc8, 0x6f, 0x55, 0x39, 0xeb, 0xd2, + 0x7b, 0x21, 0xe5, 0xc1, 0x8c, 0xf2, 0x4c, 0x04, 0x88, 0xc7, 0x41, 0xfc, 0x12, 0x36, 0x33, 0xc7, + 0xf1, 0x42, 0xdf, 0x12, 0xfc, 0x6c, 0x86, 0xae, 0x93, 0xde, 0xac, 0x40, 0xbe, 0x69, 0x99, 0xae, + 0x6a, 0xb5, 0x0d, 0x17, 0xb7, 0x3b, 0xee, 0x48, 0xbf, 0xee, 0x2f, 0x19, 0x48, 0x4a, 0xc9, 0x11, + 0xbe, 0x0d, 0xc1, 0x76, 0x4f, 0x83, 0xeb, 0x34, 0x6f, 0x72, 0x5b, 0xec, 0xee, 0xb3, 0x41, 0xf4, + 0x06, 0xf7, 0xcf, 0x62, 0x30, 0xc7, 0x89, 0xb7, 0x35, 0x07, 0x9f, 0xbf, 0xf5, 0xc4, 0x36, 0x76, + 0xb5, 0x27, 0xce, 0xeb, 0x96, 0x21, 0x16, 0xe2, 0x69, 0x6e, 0x6b, 0x49, 0xfd, 0x22, 0xaf, 0x2f, + 0x0e, 0xdc, 0xad, 0x2e, 0x0e, 0xb7, 0xd1, 0xc5, 0x7e, 0x15, 0x92, 0x5f, 0x86, 0x78, 0xc5, 0x32, + 0x4c, 0xb2, 0x34, 0x35, 0xb1, 0x69, 0xb5, 0xb9, 0xb5, 0x64, 0x0f, 0xe8, 0x12, 0x24, 0xb4, 0xb6, + 0xd5, 0x35, 0x5d, 0x66, 0x29, 0xcb, 0x73, 0x9f, 0x79, 0x63, 0x7e, 0xe2, 0x0f, 0xde, 0x98, 0x8f, + 0xd5, 0x4c, 0xf7, 0xf7, 0x3e, 0xf1, 0x18, 0x70, 0xf4, 0x9a, 0xe9, 0x7e, 0xfc, 0xf3, 0xbf, 0x78, + 0x2e, 0xa2, 0x70, 0xea, 0xa5, 0xf8, 0x17, 0x3e, 0x3a, 0x1f, 0x91, 0x5f, 0x84, 0xe4, 0x32, 0xd6, + 0x0f, 0x81, 0x7f, 0xa2, 0x07, 0xfe, 0xa4, 0x80, 0x5f, 0xc6, 0x7a, 0x00, 0x7e, 0x19, 0xeb, 0x3d, + 0xc8, 0x4f, 0x43, 0xaa, 0x66, 0xba, 0xec, 0x0b, 0xa0, 0x47, 0x20, 0x66, 0x98, 0xec, 0x50, 0x79, + 0x00, 0xa1, 0xaf, 0x81, 0x0a, 0xa1, 0x22, 0x8c, 0xcb, 0x58, 0xf7, 0x18, 0x9b, 0x58, 0xef, 0x65, + 0xec, 0x7f, 0x35, 0xa1, 0x2a, 0x2f, 0xff, 0xfe, 0x1f, 0xcf, 0x4d, 0xbc, 0xf6, 0xe6, 0xdc, 0xc4, + 0xd0, 0xa1, 0x97, 0x47, 0x0f, 0xbd, 0x37, 0xe2, 0x3f, 0x1d, 0x87, 0xfb, 0xe9, 0x87, 0xa1, 0x76, + 0xdb, 0x30, 0xdd, 0xf3, 0xba, 0x7d, 0xd0, 0x71, 0x2d, 0x32, 0x7f, 0xad, 0x1d, 0x3e, 0xe0, 0x53, + 0x7e, 0xf5, 0x22, 0xab, 0x1e, 0x3c, 0xdc, 0xf2, 0x0e, 0x4c, 0x6e, 0x12, 0x3e, 0x22, 0x62, 0xd7, + 0x72, 0xb5, 0x16, 0x77, 0x3a, 0xd8, 0x03, 0x29, 0x65, 0x1f, 0x93, 0x46, 0x59, 0xa9, 0x21, 0xbe, + 0x23, 0x6d, 0x61, 0x6d, 0x87, 0x7d, 0x93, 0x13, 0xa3, 0xde, 0x6a, 0x8a, 0x14, 0xd0, 0xcf, 0x6f, + 0x66, 0x60, 0x52, 0xeb, 0xb2, 0x73, 0x33, 0x31, 0xe2, 0xc6, 0xd2, 0x07, 0xf9, 0x3a, 0x24, 0xf9, + 0xf6, 0x39, 0x92, 0x20, 0x76, 0x13, 0x1f, 0xd0, 0xf7, 0x64, 0x15, 0xf2, 0x13, 0x2d, 0xc2, 0x24, + 0x6d, 0x3c, 0xff, 0xd8, 0x70, 0x76, 0xb1, 0xaf, 0xf5, 0x8b, 0xb4, 0x91, 0x0a, 0x23, 0x93, 0xaf, + 0x41, 0x6a, 0xd9, 0x22, 0x5a, 0x18, 0x46, 0x4b, 0x33, 0x34, 0xda, 0xe6, 0x4e, 0x97, 0x6b, 0x85, + 0xc2, 0x1e, 0xd0, 0x71, 0x48, 0xb0, 0x6f, 0xb4, 0xf8, 0xd9, 0x1f, 0xfe, 0x24, 0x57, 0x20, 0x49, + 0xb1, 0x37, 0x3a, 0x64, 0xc5, 0xf7, 0x8e, 0xad, 0xa7, 0xf9, 0x17, 0xbb, 0x1c, 0x3e, 0xea, 0x37, + 0x16, 0x41, 0xbc, 0xa9, 0xb9, 0x1a, 0xef, 0x37, 0xfd, 0x2d, 0xbf, 0x0f, 0x52, 0x1c, 0xc4, 0x41, + 0x17, 0x20, 0x66, 0x75, 0x1c, 0x7e, 0x7a, 0xa7, 0x38, 0xac, 0x2b, 0x1b, 0x9d, 0x72, 0x9c, 0xe8, + 0x8c, 0x42, 0x88, 0xcb, 0xeb, 0x43, 0xd5, 0xe2, 0xa9, 0x90, 0x5a, 0xb4, 0xb1, 0xbb, 0xbd, 0xe3, + 0xfa, 0x3f, 0xd8, 0x70, 0xf6, 0xa9, 0x82, 0xa7, 0x28, 0x77, 0xa3, 0x30, 0x17, 0xa8, 0xbd, 0x85, + 0x6d, 0xc7, 0xb0, 0x4c, 0xa6, 0x4d, 0x5c, 0x53, 0x50, 0xa0, 0x81, 0xbc, 0x7e, 0x88, 0xaa, 0x3c, + 0x07, 0xb1, 0x52, 0xa7, 0x83, 0x8a, 0x90, 0xa2, 0xcf, 0xba, 0xc5, 0x74, 0x25, 0xae, 0x78, 0xcf, + 0xa4, 0xce, 0xb1, 0x76, 0xdc, 0xdb, 0x9a, 0xed, 0x7d, 0xc2, 0x2c, 0x9e, 0xe5, 0x67, 0x21, 0x5d, + 0xb1, 0x4c, 0x07, 0x9b, 0x4e, 0x97, 0xba, 0xb2, 0xdb, 0x2d, 0x4b, 0xbf, 0xc9, 0x11, 0xd8, 0x03, + 0x11, 0xb6, 0xd6, 0xe9, 0x50, 0xce, 0xb8, 0x42, 0x7e, 0xb2, 0xf9, 0x5a, 0xde, 0x18, 0x2a, 0x9e, + 0x8b, 0x47, 0x13, 0x0f, 0xef, 0xa0, 0xef, 0x93, 0x46, 0xe0, 0xbe, 0xfe, 0x89, 0x74, 0x13, 0x1f, + 0x38, 0x47, 0x9d, 0x47, 0x2f, 0x42, 0x7a, 0x93, 0xde, 0x2e, 0x72, 0x1d, 0x1f, 0xa0, 0x22, 0x24, + 0x71, 0xf3, 0xc2, 0xc5, 0x8b, 0x4f, 0x3c, 0xcb, 0xb4, 0xfc, 0xea, 0x84, 0x22, 0x0a, 0xd0, 0x1c, + 0xa4, 0x1d, 0xac, 0x77, 0x2e, 0x5c, 0xbc, 0x74, 0xf3, 0x09, 0xa6, 0x56, 0x57, 0x27, 0x14, 0xbf, + 0x68, 0x29, 0x45, 0x7a, 0xfc, 0x85, 0x8f, 0xcd, 0x47, 0xca, 0x93, 0x10, 0x73, 0xba, 0xed, 0x77, + 0x4c, 0x37, 0x7e, 0x60, 0x12, 0x16, 0x02, 0xb5, 0x6c, 0x71, 0xb9, 0xa5, 0xb5, 0x8c, 0xa6, 0xe6, + 0xdf, 0x09, 0x23, 0x05, 0xfa, 0x4f, 0x29, 0x86, 0xac, 0x1a, 0x87, 0x4a, 0x51, 0xfe, 0xe5, 0x08, + 0x64, 0x6f, 0x08, 0xe4, 0x3a, 0x76, 0xd1, 0x65, 0x00, 0xef, 0x4d, 0x62, 0xaa, 0x9c, 0x5a, 0xec, + 0x7d, 0xd7, 0xa2, 0xc7, 0xa3, 0x04, 0xc8, 0xd1, 0xd3, 0x54, 0x01, 0x3b, 0x96, 0xc3, 0x3f, 0x67, + 0x1d, 0xc1, 0xea, 0x11, 0xa3, 0x47, 0x01, 0x51, 0xab, 0xa6, 0xde, 0xb2, 0x5c, 0xc3, 0xdc, 0x55, + 0x3b, 0xd6, 0x6d, 0x7e, 0x49, 0x40, 0x4c, 0x91, 0x68, 0xcd, 0x0d, 0x5a, 0xb1, 0x49, 0xca, 0x49, + 0xa3, 0xd3, 0x1e, 0x0a, 0x89, 0xca, 0xb4, 0x66, 0xd3, 0xc6, 0x8e, 0xc3, 0x0d, 0x97, 0x78, 0x44, + 0x97, 0x21, 0xd9, 0xe9, 0x6e, 0xab, 0xc2, 0x4a, 0x64, 0x2e, 0xdc, 0x37, 0x68, 0xce, 0x0b, 0xdd, + 0xe0, 0xb3, 0x3e, 0xd1, 0xe9, 0x6e, 0x13, 0x4d, 0x79, 0x00, 0xb2, 0x03, 0x1a, 0x93, 0xb9, 0xe5, + 0xb7, 0x83, 0x5e, 0x68, 0xc3, 0x7b, 0xa0, 0x76, 0x6c, 0xc3, 0xb2, 0x0d, 0xf7, 0x80, 0x9e, 0xba, + 0x8b, 0x29, 0x92, 0xa8, 0xd8, 0xe4, 0xe5, 0xf2, 0x4d, 0x28, 0xd4, 0xa9, 0xb7, 0xee, 0xb7, 0xfc, + 0xa2, 0xdf, 0xbe, 0xc8, 0xe8, 0xf6, 0x0d, 0x6d, 0x59, 0xb4, 0xaf, 0x65, 0xe5, 0xb5, 0xa1, 0x9a, + 0xf9, 0xe4, 0xd1, 0x34, 0x33, 0xbc, 0xba, 0x7d, 0xe9, 0x64, 0x68, 0x52, 0x72, 0xaf, 0x27, 0x60, + 0xb2, 0xc6, 0x55, 0xca, 0x51, 0x81, 0x78, 0xf1, 0xf0, 0x45, 0xb4, 0x38, 0xc2, 0x74, 0x16, 0x47, + 0x4e, 0x1f, 0xf9, 0x59, 0xc8, 0x6d, 0x6a, 0xb6, 0x5b, 0xc7, 0xee, 0x55, 0xac, 0x35, 0xb1, 0x1d, + 0x5e, 0x65, 0x73, 0x62, 0x95, 0x45, 0x10, 0xa7, 0x4b, 0x29, 0x5b, 0x65, 0xe8, 0x6f, 0x79, 0x0f, + 0xe2, 0xf4, 0xd8, 0xad, 0xb7, 0x02, 0x73, 0x0e, 0xb6, 0x02, 0x13, 0xfb, 0x79, 0xe0, 0x62, 0x47, + 0xe4, 0x8a, 0xe8, 0x03, 0x7a, 0x4a, 0xac, 0xa3, 0xb1, 0xc3, 0xd7, 0x51, 0xae, 0x84, 0x7c, 0x35, + 0x6d, 0x41, 0xb2, 0x4c, 0xcc, 0x6f, 0x6d, 0xd9, 0x6b, 0x48, 0xc4, 0x6f, 0x08, 0x5a, 0x83, 0x42, + 0x47, 0xb3, 0x5d, 0xfa, 0x19, 0xde, 0x1e, 0xed, 0x05, 0xd7, 0xf3, 0xf9, 0xfe, 0x59, 0x17, 0xea, + 0x2c, 0x7f, 0x4b, 0xae, 0x13, 0x2c, 0x94, 0xff, 0x6b, 0x1c, 0x12, 0x5c, 0x18, 0xcf, 0x41, 0x92, + 0x8b, 0x95, 0x6b, 0xe6, 0xfd, 0x8b, 0xfd, 0x8b, 0xd1, 0xa2, 0xb7, 0x68, 0x70, 0x3c, 0xc1, 0x83, + 0x1e, 0x86, 0x94, 0xbe, 0xa7, 0x19, 0xa6, 0x6a, 0x34, 0xb9, 0x03, 0x98, 0x79, 0xf3, 0x8d, 0xf9, + 0x64, 0x85, 0x94, 0xd5, 0x96, 0x95, 0x24, 0xad, 0xac, 0x35, 0xc9, 0xca, 0xbf, 0x87, 0x8d, 0xdd, + 0x3d, 0x97, 0xcf, 0x2e, 0xfe, 0x84, 0x9e, 0x81, 0x38, 0x51, 0x08, 0xfe, 0x91, 0x76, 0xb1, 0xcf, + 0x97, 0xf7, 0xf2, 0x24, 0xe5, 0x14, 0x79, 0xf1, 0x47, 0xfe, 0xcb, 0x7c, 0x44, 0xa1, 0x1c, 0xa8, + 0x02, 0xb9, 0x96, 0xe6, 0xb8, 0x2a, 0x5d, 0xb5, 0xc8, 0xeb, 0x27, 0x29, 0xc4, 0xc9, 0x7e, 0x81, + 0x70, 0xc1, 0xf2, 0xa6, 0x67, 0x08, 0x17, 0x2b, 0x6a, 0xa2, 0x33, 0x20, 0x51, 0x10, 0xdd, 0x6a, + 0xb7, 0x0d, 0x97, 0xf9, 0x52, 0x09, 0x2a, 0xf7, 0x3c, 0x29, 0xaf, 0xd0, 0x62, 0xea, 0x51, 0x9d, + 0x82, 0x34, 0xfd, 0x2c, 0x94, 0x92, 0xb0, 0xb3, 0xde, 0x29, 0x52, 0x40, 0x2b, 0x4f, 0x43, 0xc1, + 0xb7, 0x8d, 0x8c, 0x24, 0xc5, 0x50, 0xfc, 0x62, 0x4a, 0xf8, 0x38, 0xcc, 0x98, 0x78, 0x9f, 0x9e, + 0x3e, 0x0f, 0x51, 0xa7, 0x29, 0x35, 0x22, 0x75, 0x37, 0xc2, 0x1c, 0x0f, 0x41, 0x5e, 0x17, 0xc2, + 0x67, 0xb4, 0x40, 0x69, 0x73, 0x5e, 0x29, 0x25, 0x3b, 0x09, 0x29, 0xad, 0xd3, 0x61, 0x04, 0x19, + 0x6e, 0x1b, 0x3b, 0x1d, 0x5a, 0x75, 0x0e, 0xa6, 0x68, 0x1f, 0x6d, 0xec, 0x74, 0x5b, 0x2e, 0x07, + 0xc9, 0x52, 0x9a, 0x02, 0xa9, 0x50, 0x58, 0x39, 0xa5, 0x7d, 0x10, 0x72, 0xf8, 0x96, 0xd1, 0xc4, + 0xa6, 0x8e, 0x19, 0x5d, 0x8e, 0xd2, 0x65, 0x45, 0x21, 0x25, 0x3a, 0x0b, 0x9e, 0xcd, 0x53, 0x85, + 0x3d, 0xce, 0x33, 0x3c, 0x51, 0x5e, 0x62, 0xc5, 0xf2, 0x2c, 0xc4, 0x97, 0x35, 0x57, 0x23, 0x4e, + 0x85, 0xbb, 0xcf, 0x16, 0x99, 0xac, 0x42, 0x7e, 0xca, 0x5f, 0x88, 0x42, 0xfc, 0x86, 0xe5, 0x62, + 0xf4, 0x64, 0xc0, 0xe1, 0xcb, 0x0f, 0xd2, 0xe7, 0xba, 0xb1, 0x6b, 0xe2, 0xe6, 0x9a, 0xb3, 0x1b, + 0xb8, 0xc3, 0xc5, 0x57, 0xa7, 0x68, 0x48, 0x9d, 0x66, 0x60, 0xd2, 0xb6, 0xba, 0x66, 0x53, 0x9c, + 0x92, 0xa6, 0x0f, 0xa8, 0x0a, 0x29, 0x4f, 0x4b, 0xe2, 0xa3, 0xb4, 0xa4, 0x40, 0xb4, 0x84, 0xe8, + 0x30, 0x2f, 0x50, 0x92, 0xdb, 0x5c, 0x59, 0xca, 0x90, 0xf6, 0x8c, 0x17, 0xd7, 0xb6, 0xf1, 0x14, + 0xd6, 0x67, 0x23, 0x0b, 0x89, 0x37, 0xf6, 0x9e, 0xf0, 0x98, 0xc6, 0x49, 0x5e, 0x05, 0x97, 0x5e, + 0x48, 0xad, 0xf8, 0x7d, 0x32, 0x49, 0xda, 0x2f, 0x5f, 0xad, 0xd8, 0x9d, 0x32, 0xf7, 0x41, 0xda, + 0x31, 0x76, 0x4d, 0xcd, 0xed, 0xda, 0x98, 0x6b, 0x9e, 0x5f, 0x20, 0xff, 0x46, 0x04, 0x12, 0x4c, + 0x93, 0x03, 0x72, 0x8b, 0x0c, 0x96, 0x5b, 0x74, 0x98, 0xdc, 0x62, 0xf7, 0x2e, 0xb7, 0x12, 0x80, + 0xd7, 0x18, 0x87, 0x5f, 0xf3, 0x31, 0xc0, 0x5b, 0x60, 0x4d, 0xac, 0x1b, 0xbb, 0x7c, 0xa2, 0x06, + 0x98, 0xe4, 0xff, 0x1c, 0x21, 0x8e, 0x2b, 0xaf, 0x47, 0x25, 0xc8, 0x89, 0x76, 0xa9, 0x3b, 0x2d, + 0x6d, 0x97, 0xeb, 0xce, 0xfd, 0x43, 0x1b, 0x77, 0xa5, 0xa5, 0xed, 0x2a, 0x19, 0xde, 0x1e, 0xf2, + 0x30, 0x78, 0x1c, 0xa2, 0x43, 0xc6, 0x21, 0x34, 0xf0, 0xb1, 0x7b, 0x1b, 0xf8, 0xd0, 0x10, 0xc5, + 0x7b, 0x87, 0xe8, 0x57, 0xa2, 0x34, 0x78, 0xe9, 0x58, 0x8e, 0xd6, 0x7a, 0x37, 0x66, 0xc4, 0x29, + 0x48, 0x77, 0xac, 0x96, 0xca, 0x6a, 0xd8, 0xd7, 0x03, 0xa9, 0x8e, 0xd5, 0x52, 0xfa, 0x86, 0x7d, + 0xf2, 0x6d, 0x9a, 0x2e, 0x89, 0xb7, 0x41, 0x6a, 0xc9, 0x5e, 0xa9, 0xd9, 0x90, 0x65, 0xa2, 0xe0, + 0x6b, 0xd9, 0xe3, 0x44, 0x06, 0x74, 0x71, 0x8c, 0xf4, 0xaf, 0xbd, 0xac, 0xd9, 0x8c, 0x52, 0xe1, + 0x74, 0x84, 0x83, 0x99, 0xfe, 0x41, 0x51, 0x6f, 0x50, 0x2d, 0x15, 0x4e, 0x27, 0xff, 0x40, 0x04, + 0x60, 0x95, 0x48, 0x96, 0xf6, 0x97, 0xac, 0x42, 0x0e, 0x6d, 0x82, 0x1a, 0x7a, 0xf3, 0xdc, 0xb0, + 0x41, 0xe3, 0xef, 0xcf, 0x3a, 0xc1, 0x76, 0x57, 0x20, 0xe7, 0x2b, 0xa3, 0x83, 0x45, 0x63, 0xe6, + 0x0e, 0xf1, 0xa8, 0xeb, 0xd8, 0x55, 0xb2, 0xb7, 0x02, 0x4f, 0xf2, 0xbf, 0x8c, 0x40, 0x9a, 0xb6, + 0x69, 0x0d, 0xbb, 0x5a, 0x68, 0x0c, 0x23, 0xf7, 0x3e, 0x86, 0xf7, 0x03, 0x30, 0x18, 0xc7, 0x78, + 0x15, 0x73, 0xcd, 0x4a, 0xd3, 0x92, 0xba, 0xf1, 0x2a, 0x46, 0x97, 0x3c, 0x81, 0xc7, 0x0e, 0x17, + 0xb8, 0xf0, 0xb8, 0xb9, 0xd8, 0x4f, 0x40, 0x92, 0x5e, 0x8b, 0xb7, 0xef, 0x70, 0x27, 0x3a, 0x61, + 0x76, 0xdb, 0x8d, 0x7d, 0x47, 0x7e, 0x05, 0x92, 0x8d, 0x7d, 0x96, 0x0b, 0x39, 0x05, 0x69, 0xdb, + 0xb2, 0xf8, 0x9a, 0xcc, 0x7c, 0xa1, 0x14, 0x29, 0xa0, 0x4b, 0x90, 0x88, 0xff, 0xa3, 0x7e, 0xfc, + 0xef, 0x27, 0x30, 0x62, 0x63, 0x25, 0x30, 0xce, 0xfd, 0xa7, 0x08, 0x64, 0x02, 0xf6, 0x01, 0x3d, + 0x01, 0xc7, 0xca, 0xab, 0x1b, 0x95, 0xeb, 0x6a, 0x6d, 0x59, 0xbd, 0xb2, 0x5a, 0x5a, 0xf1, 0x3f, + 0x90, 0x2b, 0x1e, 0xbf, 0x73, 0x77, 0x01, 0x05, 0x68, 0xb7, 0x4c, 0xba, 0x19, 0x83, 0xce, 0xc3, + 0x4c, 0x98, 0xa5, 0x54, 0xae, 0x57, 0xd7, 0x1b, 0x52, 0xa4, 0x78, 0xec, 0xce, 0xdd, 0x85, 0xa9, + 0x00, 0x47, 0x69, 0xdb, 0xc1, 0xa6, 0xdb, 0xcf, 0x50, 0xd9, 0x58, 0x5b, 0xab, 0x35, 0xa4, 0x68, + 0x1f, 0x03, 0x37, 0xd8, 0x67, 0x61, 0x2a, 0xcc, 0xb0, 0x5e, 0x5b, 0x95, 0x62, 0x45, 0x74, 0xe7, + 0xee, 0x42, 0x3e, 0x40, 0xbd, 0x6e, 0xb4, 0x8a, 0xa9, 0x0f, 0xff, 0xc4, 0xdc, 0xc4, 0xc7, 0x7f, + 0x72, 0x2e, 0x42, 0x7a, 0x96, 0x0b, 0xd9, 0x08, 0xf4, 0x28, 0x9c, 0xa8, 0xd7, 0x56, 0xd6, 0xab, + 0xcb, 0xea, 0x5a, 0x7d, 0xa5, 0xe7, 0x9b, 0xe7, 0x62, 0xe1, 0xce, 0xdd, 0x85, 0x0c, 0xef, 0xd2, + 0x30, 0xea, 0x4d, 0xa5, 0x7a, 0x63, 0xa3, 0x51, 0x95, 0x22, 0x8c, 0x7a, 0xd3, 0xc6, 0xb7, 0x2c, + 0x97, 0xdd, 0xa8, 0xf9, 0x38, 0x9c, 0x1c, 0x40, 0xed, 0x75, 0x6c, 0xea, 0xce, 0xdd, 0x85, 0xdc, + 0xa6, 0x8d, 0xd9, 0xfc, 0xa1, 0x1c, 0x8b, 0x30, 0xdb, 0xcf, 0xb1, 0xb1, 0xb9, 0x51, 0x2f, 0xad, + 0x4a, 0x0b, 0x45, 0xe9, 0xce, 0xdd, 0x85, 0xac, 0x30, 0x86, 0x84, 0xde, 0xef, 0xd9, 0x3b, 0x15, + 0xed, 0x7c, 0x57, 0x32, 0x94, 0xcb, 0x63, 0x71, 0x44, 0x47, 0xb3, 0xb5, 0xf6, 0x51, 0xc3, 0x9d, + 0x11, 0xbb, 0xb1, 0xf2, 0x6b, 0x51, 0x28, 0x78, 0xce, 0xf4, 0x26, 0x7d, 0x03, 0x7a, 0x32, 0x98, + 0x87, 0xc9, 0x0c, 0x5d, 0xc6, 0x18, 0xb5, 0x48, 0xd3, 0xbc, 0x17, 0x52, 0xc2, 0x29, 0xe3, 0xe6, + 0x62, 0xa1, 0x9f, 0xaf, 0xca, 0x29, 0x38, 0xab, 0xc7, 0x81, 0x9e, 0x87, 0xb4, 0x67, 0x3c, 0xbc, + 0x5b, 0xa7, 0x86, 0x5b, 0x1b, 0xce, 0xef, 0xf3, 0xa0, 0x67, 0xfd, 0xb0, 0x21, 0x3e, 0x2c, 0x10, + 0xb9, 0xc1, 0x08, 0x38, 0xb3, 0xa0, 0x97, 0x6b, 0x7c, 0xda, 0xf1, 0xde, 0xd3, 0x1b, 0x3b, 0xf6, + 0x55, 0x16, 0x49, 0x31, 0xaf, 0x24, 0xd5, 0xd6, 0xf6, 0xcb, 0x34, 0x98, 0x3a, 0x01, 0x49, 0x52, + 0xb9, 0xcb, 0xbf, 0x09, 0x8f, 0x29, 0x89, 0xb6, 0xb6, 0xbf, 0xa2, 0x39, 0xd7, 0xe2, 0xa9, 0x98, + 0x14, 0x97, 0x7f, 0x36, 0x02, 0xf9, 0x70, 0x1f, 0xd1, 0x23, 0x80, 0x08, 0x87, 0xb6, 0x8b, 0x55, + 0x62, 0x62, 0xa8, 0xb0, 0x04, 0x6e, 0xa1, 0xad, 0xed, 0x97, 0x76, 0xf1, 0x7a, 0xb7, 0x4d, 0x1b, + 0xe0, 0xa0, 0x35, 0x90, 0x04, 0xb1, 0x18, 0x27, 0x2e, 0xcc, 0x93, 0xfd, 0x77, 0x50, 0x72, 0x02, + 0xb6, 0x50, 0xbd, 0x4e, 0x16, 0xaa, 0x3c, 0xc3, 0xf3, 0x76, 0xd3, 0x43, 0x5d, 0x89, 0x85, 0xbb, + 0x22, 0x3f, 0x0f, 0x85, 0x1e, 0x79, 0x22, 0x19, 0x72, 0x3c, 0x2b, 0x40, 0x77, 0x2a, 0x99, 0x7f, + 0x9c, 0x56, 0x32, 0x2c, 0xfa, 0xa7, 0x3b, 0xb7, 0x4b, 0xa9, 0x4f, 0x7d, 0x74, 0x3e, 0x42, 0x13, + 0xe6, 0x8f, 0x40, 0x2e, 0x24, 0x51, 0x91, 0xa9, 0x8b, 0xf8, 0x99, 0x3a, 0x9f, 0xf8, 0x65, 0xc8, + 0x12, 0x43, 0x89, 0x9b, 0x9c, 0xf6, 0x61, 0x28, 0x30, 0x43, 0xde, 0x2b, 0x6b, 0xe6, 0x49, 0xad, + 0x09, 0x81, 0xcb, 0xc2, 0xb5, 0x0a, 0x8b, 0x3d, 0x23, 0xa8, 0x56, 0x34, 0xa7, 0xfc, 0xfe, 0x8f, + 0xbf, 0x39, 0x17, 0x79, 0x67, 0x26, 0xe2, 0xef, 0xbe, 0x1f, 0x4e, 0x05, 0x2a, 0xb5, 0x6d, 0xdd, + 0x08, 0x65, 0x1d, 0x0a, 0x01, 0x25, 0x23, 0x95, 0xa3, 0xb2, 0x07, 0x87, 0xe6, 0x30, 0x0e, 0x4f, + 0x98, 0x15, 0x0f, 0xb7, 0x08, 0xa3, 0x13, 0x1b, 0x83, 0x73, 0x94, 0xff, 0x27, 0x05, 0x49, 0x05, + 0x7f, 0xb0, 0x8b, 0x1d, 0x17, 0x5d, 0x80, 0x38, 0xd6, 0xf7, 0xac, 0x41, 0x29, 0x21, 0xd2, 0xb9, + 0x45, 0x4e, 0x57, 0xd5, 0xf7, 0xac, 0xab, 0x13, 0x0a, 0xa5, 0x45, 0x17, 0x61, 0x72, 0xa7, 0xd5, + 0xe5, 0x79, 0x8a, 0x1e, 0x63, 0x11, 0x64, 0xba, 0x42, 0x88, 0xae, 0x4e, 0x28, 0x8c, 0x9a, 0xbc, + 0x8a, 0xde, 0xf3, 0x1b, 0x3b, 0xfc, 0x55, 0x35, 0x73, 0x87, 0xbe, 0x8a, 0xd0, 0xa2, 0x32, 0x80, + 0x61, 0x1a, 0xae, 0x4a, 0x63, 0x78, 0xee, 0x09, 0x3e, 0x30, 0x9c, 0xd3, 0x70, 0x69, 0xd4, 0x7f, + 0x75, 0x42, 0x49, 0x1b, 0xe2, 0x81, 0x34, 0xf7, 0x83, 0x5d, 0x6c, 0x1f, 0x70, 0x07, 0x70, 0x68, + 0x73, 0xdf, 0x4f, 0x88, 0x48, 0x73, 0x29, 0x35, 0xaa, 0x42, 0x86, 0x7e, 0xe0, 0xca, 0xe6, 0x2f, + 0xbf, 0x59, 0x56, 0x1e, 0xc6, 0x5c, 0x26, 0xa4, 0x74, 0x4a, 0x5f, 0x9d, 0x50, 0x60, 0xdb, 0x7b, + 0x22, 0x46, 0x92, 0xdd, 0x3c, 0xe6, 0xee, 0xf3, 0xfb, 0x34, 0xe7, 0x87, 0x61, 0xd0, 0xeb, 0xc7, + 0x1a, 0xfb, 0x57, 0x27, 0x94, 0xa4, 0xce, 0x7e, 0x92, 0xfe, 0x37, 0x71, 0xcb, 0xb8, 0x85, 0x6d, + 0xc2, 0x9f, 0x3e, 0xbc, 0xff, 0xcb, 0x8c, 0x92, 0x22, 0xa4, 0x9b, 0xe2, 0x81, 0x18, 0x5a, 0x6c, + 0x36, 0x79, 0x37, 0xa0, 0xdf, 0x4e, 0x87, 0xc6, 0xd9, 0x6c, 0x8a, 0x4e, 0xa4, 0x30, 0xff, 0x8d, + 0x9e, 0xf1, 0x3c, 0xd4, 0x4c, 0xbf, 0x53, 0x18, 0xea, 0x00, 0xcb, 0x55, 0x4c, 0x08, 0x4f, 0x15, + 0xad, 0x43, 0xbe, 0x65, 0x38, 0xae, 0xea, 0x98, 0x5a, 0xc7, 0xd9, 0xb3, 0x5c, 0x87, 0x06, 0xfd, + 0x99, 0x0b, 0x0f, 0x0d, 0x43, 0x58, 0x35, 0x1c, 0xb7, 0x2e, 0x88, 0xaf, 0x4e, 0x28, 0xb9, 0x56, + 0xb0, 0x80, 0xe0, 0x59, 0x3b, 0x3b, 0xd8, 0xf6, 0x00, 0x69, 0x72, 0xe0, 0x10, 0xbc, 0x0d, 0x42, + 0x2d, 0xf8, 0x09, 0x9e, 0x15, 0x2c, 0x40, 0xdf, 0x0c, 0xd3, 0x2d, 0x4b, 0x6b, 0x7a, 0x70, 0xaa, + 0xbe, 0xd7, 0x35, 0x6f, 0xd2, 0x4c, 0x42, 0xe6, 0xc2, 0xd9, 0xa1, 0x8d, 0xb4, 0xb4, 0xa6, 0x80, + 0xa8, 0x10, 0x86, 0xab, 0x13, 0xca, 0x54, 0xab, 0xb7, 0x10, 0x7d, 0x00, 0x66, 0xb4, 0x4e, 0xa7, + 0x75, 0xd0, 0x8b, 0x5e, 0xa0, 0xe8, 0xe7, 0x86, 0xa1, 0x97, 0x08, 0x4f, 0x2f, 0x3c, 0xd2, 0xfa, + 0x4a, 0x51, 0x03, 0xa4, 0x8e, 0x8d, 0xe9, 0x37, 0x31, 0x1d, 0xee, 0xaa, 0xd0, 0x1b, 0x83, 0x32, + 0x17, 0x4e, 0x0f, 0xc3, 0xde, 0x64, 0xf4, 0xc2, 0xb3, 0xb9, 0x3a, 0xa1, 0x14, 0x3a, 0xe1, 0x22, + 0x86, 0x6a, 0xe9, 0x98, 0x5e, 0x68, 0xc6, 0x51, 0xa7, 0x46, 0xa1, 0x52, 0xfa, 0x30, 0x6a, 0xa8, + 0xa8, 0x9c, 0xe4, 0x67, 0xda, 0xf8, 0x85, 0x2f, 0xa7, 0x21, 0x13, 0x30, 0x2c, 0x68, 0x16, 0x92, + 0x7c, 0x8f, 0x5f, 0x9c, 0x85, 0xe3, 0x8f, 0x72, 0x1e, 0xb2, 0x41, 0x63, 0x22, 0x7f, 0x24, 0xe2, + 0x71, 0xd2, 0x2f, 0xe5, 0x67, 0xc3, 0xa9, 0xc3, 0xb4, 0x9f, 0x15, 0x7c, 0x50, 0xac, 0x22, 0xa2, + 0x9e, 0xed, 0x26, 0x65, 0x69, 0x21, 0x5f, 0xc4, 0xd0, 0x3c, 0x64, 0x3a, 0x17, 0x3a, 0x1e, 0x49, + 0x8c, 0x92, 0x40, 0xe7, 0x42, 0x47, 0x10, 0x3c, 0x00, 0x59, 0xd2, 0x53, 0x35, 0xe8, 0x68, 0xa4, + 0x95, 0x0c, 0x29, 0xe3, 0x24, 0xf2, 0xbf, 0x8d, 0x82, 0xd4, 0x6b, 0x80, 0xbc, 0x9c, 0x62, 0xe4, + 0xc8, 0x39, 0xc5, 0x93, 0xbd, 0xd9, 0x4c, 0x3f, 0x81, 0xb9, 0x0a, 0x92, 0x9f, 0x87, 0x63, 0x0b, + 0xc1, 0x70, 0xc7, 0xa9, 0xc7, 0xc3, 0x53, 0x0a, 0x7a, 0x8f, 0xcb, 0x77, 0x25, 0xb4, 0xf7, 0x22, + 0x2e, 0xb2, 0xef, 0x1d, 0x62, 0xcf, 0x5f, 0xd8, 0xea, 0x34, 0x35, 0x17, 0x8b, 0xbc, 0x48, 0x60, + 0x1b, 0xe6, 0x61, 0x28, 0x68, 0x9d, 0x8e, 0xea, 0xb8, 0x9a, 0x8b, 0xf9, 0xb2, 0x3e, 0xc9, 0xd2, + 0x83, 0x5a, 0xa7, 0x53, 0x27, 0xa5, 0x6c, 0x59, 0x7f, 0x08, 0xf2, 0xc4, 0x26, 0x1b, 0x5a, 0x4b, + 0xe5, 0x59, 0x82, 0x04, 0x5b, 0xfd, 0x79, 0xe9, 0x55, 0x5a, 0x28, 0x37, 0xbd, 0x11, 0xa7, 0xf6, + 0xd8, 0x0b, 0xb3, 0x22, 0x81, 0x30, 0x0b, 0xf1, 0x1b, 0x0c, 0x98, 0x7c, 0xc4, 0xad, 0x0f, 0x83, + 0xb3, 0xbb, 0x33, 0x34, 0x24, 0xbb, 0xc5, 0x12, 0x1e, 0x29, 0x85, 0x3d, 0xc8, 0x1f, 0x8a, 0xc2, + 0x54, 0x9f, 0xe5, 0x1e, 0x98, 0xf6, 0xf6, 0xe3, 0xcb, 0xe8, 0x91, 0xe2, 0xcb, 0xeb, 0xe1, 0xb4, + 0x6e, 0x60, 0xe5, 0x3b, 0xd5, 0x27, 0x64, 0x66, 0x37, 0x89, 0x42, 0x73, 0x90, 0x40, 0xe6, 0x97, + 0xaa, 0xf9, 0x16, 0xcc, 0x6c, 0x1f, 0xbc, 0xaa, 0x99, 0xae, 0x61, 0x62, 0xb5, 0x6f, 0xd4, 0xfa, + 0x97, 0xd2, 0x35, 0xc3, 0xd9, 0xc6, 0x7b, 0xda, 0x2d, 0xc3, 0x12, 0xcd, 0x9a, 0xf6, 0xf8, 0xfd, + 0xe4, 0xae, 0xac, 0x40, 0x3e, 0xbc, 0xf4, 0xa0, 0x3c, 0x44, 0xdd, 0x7d, 0xde, 0xff, 0xa8, 0xbb, + 0x8f, 0x1e, 0xe7, 0x79, 0xa0, 0x28, 0xcd, 0x03, 0xf5, 0xbf, 0x88, 0xf3, 0xf9, 0x49, 0x20, 0x59, + 0xf6, 0x66, 0x83, 0xb7, 0x1c, 0xf5, 0xa2, 0xca, 0x67, 0xa1, 0xd0, 0xb3, 0xde, 0x0c, 0xcb, 0x0a, + 0xca, 0x05, 0xc8, 0x85, 0x16, 0x17, 0xf9, 0x38, 0xcc, 0x0c, 0x5a, 0x2b, 0xe4, 0x3d, 0xaf, 0x3c, + 0x64, 0xf3, 0xd1, 0x45, 0x48, 0x79, 0x8b, 0xc5, 0x80, 0x2c, 0x04, 0xed, 0x85, 0x20, 0x56, 0x3c, + 0xd2, 0x50, 0x32, 0x3b, 0x1a, 0x4a, 0x66, 0xcb, 0xdf, 0x0a, 0xb3, 0xc3, 0x16, 0x82, 0x9e, 0x6e, + 0xc4, 0x3d, 0x2d, 0x3c, 0x0e, 0x09, 0x7e, 0x6b, 0x61, 0x94, 0x6e, 0xdf, 0xf0, 0x27, 0xa2, 0x9d, + 0x6c, 0x51, 0x88, 0xb1, 0x5d, 0x1d, 0xfa, 0x20, 0xab, 0x70, 0x72, 0xe8, 0x62, 0x30, 0x7c, 0x23, + 0x88, 0x01, 0xf1, 0x8d, 0x20, 0x5d, 0x34, 0xc7, 0xa1, 0x7d, 0x15, 0x87, 0x1d, 0xd8, 0x93, 0xfc, + 0x7a, 0x0c, 0x8e, 0x0f, 0x5e, 0x12, 0xd0, 0x02, 0x64, 0x89, 0xdf, 0xed, 0x86, 0x5d, 0x74, 0x68, + 0x6b, 0xfb, 0x0d, 0xee, 0x9f, 0xf3, 0x44, 0x7a, 0xd4, 0x4b, 0xa4, 0xa3, 0x2d, 0x98, 0x6a, 0x59, + 0xba, 0xd6, 0x52, 0x03, 0x1a, 0xcf, 0x95, 0xfd, 0xc1, 0x3e, 0x61, 0x57, 0xd9, 0x5d, 0xe6, 0xcd, + 0x3e, 0xa5, 0x2f, 0x50, 0x8c, 0x55, 0x4f, 0xf3, 0xd1, 0x32, 0x64, 0xda, 0xbe, 0x22, 0x1f, 0x41, + 0xd9, 0x83, 0x6c, 0x81, 0x21, 0x99, 0x1c, 0xb8, 0xed, 0x93, 0x38, 0xb2, 0x89, 0x1e, 0xb6, 0x83, + 0x92, 0x1c, 0xba, 0x83, 0x32, 0x68, 0xbb, 0x22, 0x35, 0x78, 0xbb, 0xe2, 0xc3, 0xc1, 0xa1, 0x09, + 0x2d, 0xa2, 0xfd, 0x3b, 0x18, 0xa8, 0x0e, 0x33, 0x9c, 0xbf, 0x19, 0x92, 0x7d, 0x74, 0x5c, 0x43, + 0x83, 0x04, 0xfb, 0x70, 0xb1, 0xc7, 0xee, 0x4d, 0xec, 0xc2, 0x96, 0xc6, 0x03, 0xb6, 0xf4, 0xff, + 0xb3, 0xa1, 0xf8, 0x0f, 0x69, 0x48, 0x29, 0xd8, 0xe9, 0x90, 0x85, 0x13, 0x95, 0x21, 0x8d, 0xf7, + 0x75, 0xdc, 0x71, 0xfd, 0x6d, 0xca, 0x41, 0xc1, 0x00, 0xa3, 0xae, 0x0a, 0x4a, 0xe2, 0x89, 0x7b, + 0x6c, 0xe8, 0x49, 0x1e, 0x6c, 0x0d, 0x8f, 0x9b, 0x38, 0x7b, 0x30, 0xda, 0xba, 0x24, 0xa2, 0xad, + 0xd8, 0x50, 0xe7, 0x9b, 0x71, 0xf5, 0x84, 0x5b, 0x4f, 0xf2, 0x70, 0x2b, 0x3e, 0xe2, 0x65, 0xa1, + 0x78, 0xab, 0x12, 0x8a, 0xb7, 0x12, 0x23, 0xba, 0x39, 0x24, 0xe0, 0xba, 0x24, 0x02, 0xae, 0xe4, + 0x88, 0x16, 0xf7, 0x44, 0x5c, 0x57, 0xc2, 0x11, 0x57, 0x6a, 0x88, 0x01, 0x11, 0xdc, 0x43, 0x43, + 0xae, 0xe7, 0x02, 0x21, 0x57, 0x7a, 0x68, 0xbc, 0xc3, 0x40, 0x06, 0xc4, 0x5c, 0x95, 0x50, 0xcc, + 0x05, 0x23, 0x64, 0x30, 0x24, 0xe8, 0xfa, 0xa6, 0x60, 0xd0, 0x95, 0x19, 0x1a, 0xb7, 0xf1, 0xf1, + 0x1e, 0x14, 0x75, 0x3d, 0xeb, 0x45, 0x5d, 0xd9, 0xa1, 0x61, 0x23, 0xef, 0x43, 0x6f, 0xd8, 0xb5, + 0xd1, 0x17, 0x76, 0xe5, 0xf8, 0x9f, 0x09, 0x19, 0x06, 0x31, 0x22, 0xee, 0xda, 0xe8, 0x8b, 0xbb, + 0xf2, 0x23, 0x00, 0x47, 0x04, 0x5e, 0x7f, 0x63, 0x70, 0xe0, 0x35, 0x3c, 0x34, 0xe2, 0xcd, 0x1c, + 0x2f, 0xf2, 0x52, 0x87, 0x44, 0x5e, 0x2c, 0x3a, 0x7a, 0x64, 0x28, 0xfc, 0xd8, 0xa1, 0xd7, 0xd6, + 0x80, 0xd0, 0x8b, 0x05, 0x49, 0x67, 0x86, 0x82, 0x8f, 0x11, 0x7b, 0x6d, 0x0d, 0x88, 0xbd, 0xd0, + 0x48, 0xd8, 0xa3, 0x04, 0x5f, 0x93, 0x52, 0x42, 0x3e, 0x4b, 0x5c, 0xdf, 0x1e, 0x3b, 0x45, 0xfc, + 0x07, 0x6c, 0xdb, 0x96, 0x2d, 0x4e, 0xd6, 0xd2, 0x07, 0xf9, 0x0c, 0x71, 0xc6, 0x7d, 0x9b, 0x74, + 0x48, 0xa0, 0x46, 0xfd, 0xb4, 0x80, 0x1d, 0x92, 0x3f, 0x15, 0xf1, 0x79, 0xa9, 0x0f, 0x1b, 0x74, + 0xe4, 0xd3, 0xdc, 0x91, 0x0f, 0x84, 0x6f, 0xd1, 0x70, 0xf8, 0x36, 0x0f, 0x19, 0xe2, 0x7f, 0xf5, + 0x44, 0x66, 0x5a, 0xc7, 0x8b, 0xcc, 0xc4, 0x91, 0x02, 0x16, 0xe4, 0xf1, 0x65, 0x85, 0xed, 0xe4, + 0x14, 0xbc, 0xe3, 0x15, 0x2c, 0xa6, 0x40, 0x8f, 0xc1, 0x74, 0x80, 0xd6, 0xf3, 0xeb, 0x58, 0x98, + 0x22, 0x79, 0xd4, 0x25, 0xee, 0xe0, 0xfd, 0xab, 0x88, 0x2f, 0x21, 0x3f, 0xa4, 0x1b, 0x14, 0x7d, + 0x45, 0xde, 0xa6, 0xe8, 0x2b, 0x7a, 0xcf, 0xd1, 0x57, 0xd0, 0x4f, 0x8d, 0x85, 0xfd, 0xd4, 0xff, + 0x19, 0xf1, 0xc7, 0xc4, 0x8b, 0xa5, 0x74, 0xab, 0x89, 0xb9, 0xe7, 0x48, 0x7f, 0x13, 0xa7, 0xa2, + 0x65, 0xed, 0x72, 0xff, 0x90, 0xfc, 0x24, 0x54, 0xde, 0xc2, 0x91, 0xe6, 0xeb, 0x82, 0xe7, 0x74, + 0x4e, 0x06, 0xcf, 0xff, 0xf2, 0x43, 0xb1, 0x09, 0xff, 0x50, 0xac, 0xf7, 0xed, 0x5a, 0x32, 0xf0, + 0xed, 0x1a, 0x7a, 0x06, 0xd2, 0x34, 0x23, 0xaa, 0x5a, 0x1d, 0xf1, 0x47, 0x65, 0x4e, 0x0d, 0x3f, + 0x10, 0xeb, 0xd0, 0xa3, 0x7a, 0xec, 0x10, 0xad, 0xef, 0x31, 0xa4, 0x43, 0x1e, 0xc3, 0x7d, 0x90, + 0x26, 0xad, 0x67, 0x97, 0xa3, 0x03, 0xff, 0xf0, 0x51, 0x14, 0xc8, 0x1f, 0x00, 0xd4, 0xbf, 0x48, + 0xa0, 0xab, 0x90, 0xc0, 0xb7, 0xe8, 0xa5, 0x7c, 0xec, 0xa0, 0xe1, 0xf1, 0x7e, 0xd7, 0x94, 0x54, + 0x97, 0x67, 0x89, 0x90, 0xbf, 0xf8, 0xc6, 0xbc, 0xc4, 0xa8, 0x1f, 0xf5, 0xce, 0xf9, 0x2b, 0x9c, + 0x5f, 0xfe, 0xc3, 0x28, 0x09, 0x60, 0x42, 0x0b, 0xc8, 0x40, 0xd9, 0x0e, 0xda, 0x22, 0x1c, 0x4f, + 0xde, 0x73, 0x00, 0xbb, 0x9a, 0xa3, 0xde, 0xd6, 0x4c, 0x17, 0x37, 0xb9, 0xd0, 0x03, 0x25, 0xa8, + 0x08, 0x29, 0xf2, 0xd4, 0x75, 0x70, 0x93, 0x87, 0xd1, 0xde, 0x73, 0xa0, 0x9f, 0xc9, 0xaf, 0xad, + 0x9f, 0x61, 0x29, 0xa7, 0x7a, 0xa4, 0x1c, 0x08, 0x2e, 0xd2, 0xc1, 0xe0, 0x82, 0x1d, 0x0c, 0xe6, + 0xe7, 0x13, 0x81, 0xb5, 0x4d, 0x3c, 0xa3, 0x07, 0x21, 0xd7, 0xc6, 0xed, 0x8e, 0x65, 0xb5, 0x54, + 0x66, 0x6e, 0xd8, 0x5f, 0x41, 0xc8, 0xf2, 0xc2, 0x2a, 0xb5, 0x3a, 0xdf, 0x19, 0xf5, 0xe7, 0x9f, + 0x1f, 0x44, 0x7e, 0xc3, 0x09, 0x98, 0x5e, 0x1b, 0xdd, 0xeb, 0x22, 0xa0, 0x7a, 0xf0, 0xd4, 0x48, + 0x97, 0x9a, 0x05, 0xa1, 0xd0, 0xe3, 0xda, 0x0f, 0xff, 0x74, 0x09, 0x2b, 0x76, 0xd0, 0x4b, 0x70, + 0xa2, 0xc7, 0xb6, 0x79, 0xd0, 0xd1, 0x71, 0x4d, 0xdc, 0xb1, 0xb0, 0x89, 0x13, 0xd0, 0xbe, 0xb0, + 0x62, 0x5f, 0xe3, 0xac, 0xab, 0x41, 0x3e, 0xec, 0xf1, 0x0c, 0x1c, 0x7e, 0xfa, 0x57, 0x77, 0x5c, + 0xcd, 0x30, 0xd5, 0x50, 0x3a, 0x28, 0xcb, 0x0a, 0x79, 0x92, 0x69, 0x13, 0x8e, 0x0d, 0xf4, 0x7c, + 0xd0, 0xd3, 0x90, 0xf6, 0x9d, 0x26, 0x26, 0xd5, 0x43, 0xd2, 0x05, 0x3e, 0xad, 0xfc, 0xeb, 0x11, + 0x1f, 0x32, 0x9c, 0x80, 0xa8, 0x42, 0x82, 0x1d, 0x7b, 0xe3, 0x87, 0x69, 0x1e, 0x1b, 0xcf, 0x67, + 0x5a, 0x64, 0x67, 0xe2, 0x14, 0xce, 0x2c, 0x7f, 0x00, 0x12, 0xac, 0x04, 0x65, 0x20, 0xe9, 0xdf, + 0x9b, 0x0b, 0x90, 0x28, 0x55, 0x2a, 0xd5, 0x4d, 0x71, 0x09, 0x66, 0x79, 0x43, 0x69, 0x48, 0x51, + 0x52, 0xac, 0x54, 0xaf, 0x55, 0x2b, 0x0d, 0x29, 0x86, 0xa6, 0x20, 0xc7, 0x7e, 0xab, 0x57, 0x36, + 0x94, 0xb5, 0x52, 0x43, 0x8a, 0x07, 0x8a, 0xea, 0xd5, 0xf5, 0xe5, 0xaa, 0x22, 0x4d, 0xca, 0x4f, + 0xc0, 0xc9, 0xa1, 0x5e, 0x96, 0x9f, 0x5d, 0x88, 0x04, 0xb2, 0x0b, 0xf2, 0xeb, 0x51, 0x28, 0x0e, + 0x77, 0x9d, 0xd0, 0xb5, 0x9e, 0x8e, 0x5f, 0x38, 0x82, 0xdf, 0xd5, 0xd3, 0x7b, 0xf4, 0x10, 0xe4, + 0x6d, 0xbc, 0x83, 0x5d, 0x7d, 0x8f, 0xb9, 0x72, 0x6c, 0xc9, 0xcc, 0x29, 0x39, 0x5e, 0x4a, 0x99, + 0x1c, 0x46, 0xf6, 0x0a, 0xd6, 0x5d, 0x95, 0xd9, 0x22, 0x87, 0xff, 0x61, 0xd0, 0x1c, 0x2b, 0xad, + 0xb3, 0x42, 0xf9, 0x5b, 0x8f, 0x24, 0xcb, 0x34, 0x4c, 0x2a, 0xd5, 0x86, 0xf2, 0x92, 0x14, 0x43, + 0x08, 0xf2, 0xf4, 0xa7, 0x5a, 0x5f, 0x2f, 0x6d, 0xd6, 0xaf, 0x6e, 0x10, 0x59, 0x4e, 0x43, 0x41, + 0xc8, 0x52, 0x14, 0x4e, 0xca, 0x8f, 0xc0, 0x89, 0x21, 0x7e, 0xdf, 0x80, 0x73, 0x88, 0x1f, 0x8b, + 0x04, 0xa9, 0xc3, 0x31, 0xff, 0x06, 0x24, 0x1c, 0x57, 0x73, 0xbb, 0x0e, 0x17, 0xe2, 0xd3, 0xe3, + 0x3a, 0x82, 0x8b, 0xe2, 0x47, 0x9d, 0xb2, 0x2b, 0x1c, 0x46, 0xbe, 0x08, 0xf9, 0x70, 0xcd, 0x70, + 0x19, 0xf8, 0x4a, 0x14, 0x95, 0x5f, 0x02, 0x08, 0xe4, 0x23, 0xbd, 0x13, 0x5d, 0x91, 0xe0, 0x89, + 0xae, 0x8b, 0x30, 0x79, 0xcb, 0x62, 0x36, 0x63, 0xf0, 0xc4, 0xb9, 0x61, 0xb9, 0x38, 0x90, 0x7c, + 0x60, 0xd4, 0xb2, 0x01, 0xa8, 0x3f, 0x27, 0x34, 0xe4, 0x15, 0xcf, 0x85, 0x5f, 0xf1, 0xc0, 0xd0, + 0xec, 0xd2, 0xe0, 0x57, 0xbd, 0x0a, 0x93, 0xd4, 0xda, 0x0c, 0xfc, 0xc4, 0xe7, 0x5b, 0x00, 0x34, + 0xd7, 0xb5, 0x8d, 0xed, 0xae, 0xff, 0x82, 0xf9, 0xc1, 0xd6, 0xaa, 0x24, 0xe8, 0xca, 0xf7, 0x71, + 0xb3, 0x35, 0xe3, 0xb3, 0x06, 0x4c, 0x57, 0x00, 0x50, 0x5e, 0x87, 0x7c, 0x98, 0x77, 0xf0, 0x27, + 0x4b, 0xfe, 0xa7, 0xff, 0x69, 0xe1, 0x3e, 0x79, 0xce, 0x17, 0xbf, 0x8e, 0x83, 0x3e, 0xc8, 0x77, + 0x22, 0x90, 0x6a, 0xec, 0x73, 0x3d, 0x3e, 0xe4, 0x50, 0xa5, 0xff, 0xdd, 0x96, 0x97, 0x2c, 0x64, + 0xf9, 0xd8, 0x98, 0x97, 0xe5, 0xfd, 0x26, 0x6f, 0xa6, 0xc6, 0xc7, 0x8d, 0x76, 0x45, 0xb6, 0x9b, + 0x5b, 0xa7, 0xcb, 0xe3, 0x7d, 0x23, 0x31, 0x03, 0x93, 0xc1, 0xef, 0x1b, 0xd8, 0x83, 0xdc, 0x0c, + 0x1c, 0x4b, 0x60, 0xcb, 0x46, 0xf0, 0x63, 0x8a, 0xc8, 0x91, 0x3f, 0xa6, 0xf0, 0xde, 0x12, 0x0d, + 0xbe, 0xe5, 0x16, 0xa4, 0x84, 0x52, 0xa0, 0xf7, 0x05, 0xcf, 0x9e, 0x88, 0x3d, 0x9a, 0xa1, 0x8b, + 0x27, 0x87, 0x0f, 0x1c, 0x3d, 0x39, 0x07, 0x53, 0xfc, 0xc8, 0x9d, 0x1f, 0x57, 0xf0, 0xbf, 0x18, + 0x50, 0x60, 0x15, 0xab, 0x22, 0xa8, 0x90, 0x7f, 0x2a, 0x02, 0x52, 0xaf, 0x56, 0xbe, 0x9b, 0x0d, + 0x20, 0x46, 0x91, 0x68, 0x7f, 0xe0, 0xca, 0x6e, 0x36, 0xf2, 0x39, 0x52, 0xea, 0x5f, 0xda, 0xfd, + 0xa1, 0x28, 0x64, 0x02, 0x39, 0x3d, 0xf4, 0x54, 0xe8, 0x08, 0xe8, 0xc2, 0x61, 0xf9, 0xbf, 0xc0, + 0x19, 0xd0, 0x50, 0xc7, 0xa2, 0x47, 0xef, 0xd8, 0xdb, 0x7f, 0x48, 0x7f, 0xf0, 0xd7, 0x3e, 0x93, + 0x43, 0xbe, 0xf6, 0xf9, 0x8e, 0x08, 0xa4, 0xbc, 0xa5, 0xfb, 0xa8, 0xd9, 0xfc, 0xe3, 0x90, 0xe0, + 0xab, 0x13, 0x4b, 0xe7, 0xf3, 0xa7, 0x81, 0xb9, 0xd0, 0x22, 0xa4, 0xc4, 0xdf, 0x79, 0xe2, 0x81, + 0xa8, 0xf7, 0x7c, 0xee, 0x59, 0xc8, 0x04, 0x36, 0x56, 0x88, 0x9d, 0x58, 0xaf, 0xbe, 0x20, 0x4d, + 0x14, 0x93, 0x77, 0xee, 0x2e, 0xc4, 0xd6, 0xf1, 0x6d, 0x32, 0xc3, 0x94, 0x6a, 0xe5, 0x6a, 0xb5, + 0x72, 0x5d, 0x8a, 0x14, 0x33, 0x77, 0xee, 0x2e, 0x24, 0x15, 0x4c, 0xd3, 0x57, 0xe7, 0xae, 0x43, + 0xa1, 0x67, 0x60, 0xc2, 0xf6, 0x1d, 0x41, 0x7e, 0x79, 0x6b, 0x73, 0xb5, 0x56, 0x29, 0x35, 0xaa, + 0x2a, 0x3b, 0x4e, 0x87, 0x4e, 0xc0, 0xf4, 0x6a, 0x6d, 0xe5, 0x6a, 0x43, 0xad, 0xac, 0xd6, 0xaa, + 0xeb, 0x0d, 0xb5, 0xd4, 0x68, 0x94, 0x2a, 0xd7, 0xa5, 0xe8, 0x85, 0xaf, 0x02, 0x14, 0x4a, 0xe5, + 0x4a, 0x8d, 0xac, 0xcf, 0x06, 0xbf, 0x75, 0xbd, 0x02, 0x71, 0x9a, 0x0a, 0x38, 0xf4, 0xa8, 0x48, + 0xf1, 0xf0, 0xdc, 0x26, 0xba, 0x02, 0x93, 0x34, 0x4b, 0x80, 0x0e, 0x3f, 0x3b, 0x52, 0x1c, 0x91, + 0xec, 0x24, 0x8d, 0xa1, 0xd3, 0xe9, 0xd0, 0xc3, 0x24, 0xc5, 0xc3, 0x73, 0x9f, 0x48, 0x81, 0xb4, + 0x1f, 0x65, 0x8c, 0x3e, 0x5c, 0x51, 0x1c, 0xc3, 0x3a, 0xa2, 0x55, 0x48, 0x8a, 0xc0, 0x70, 0xd4, + 0x71, 0x8f, 0xe2, 0xc8, 0xe4, 0x24, 0x11, 0x17, 0x0b, 0xe0, 0x0f, 0x3f, 0xbb, 0x52, 0x1c, 0x91, + 0x69, 0x45, 0x35, 0xef, 0x10, 0xfe, 0x88, 0x23, 0x1c, 0xc5, 0x51, 0xc9, 0x46, 0x22, 0x34, 0x3f, + 0x35, 0x32, 0xfa, 0x44, 0x4e, 0x71, 0x8c, 0x24, 0x32, 0xda, 0x02, 0x08, 0x84, 0xeb, 0x63, 0x1c, + 0xb5, 0x29, 0x8e, 0x93, 0x1c, 0x46, 0x1b, 0x90, 0xf2, 0xa2, 0xa7, 0x91, 0x07, 0x5f, 0x8a, 0xa3, + 0xb3, 0xb4, 0xe8, 0x03, 0x90, 0x0b, 0x47, 0x0d, 0xe3, 0x1d, 0x67, 0x29, 0x8e, 0x99, 0x7e, 0x25, + 0xf8, 0xe1, 0x10, 0x62, 0xbc, 0xe3, 0x2d, 0xc5, 0x31, 0xb3, 0xb1, 0xe8, 0x15, 0x98, 0xea, 0x77, + 0xf1, 0xc7, 0x3f, 0xed, 0x52, 0x3c, 0x42, 0x7e, 0x16, 0xb5, 0x01, 0x0d, 0x08, 0x0d, 0x8e, 0x70, + 0xf8, 0xa5, 0x78, 0x94, 0x74, 0x2d, 0x6a, 0x42, 0xa1, 0xd7, 0xdf, 0x1e, 0xf7, 0x30, 0x4c, 0x71, + 0xec, 0xd4, 0x2d, 0x7b, 0x4b, 0xd8, 0x4f, 0x1f, 0xf7, 0x70, 0x4c, 0x71, 0xec, 0x4c, 0x6e, 0xb9, + 0x34, 0xf4, 0x7c, 0xe3, 0xe9, 0x43, 0xcf, 0x37, 0xfa, 0x27, 0x16, 0xbd, 0x33, 0x8d, 0xdf, 0xfe, + 0x04, 0xbc, 0x87, 0x5f, 0x26, 0xe0, 0xb8, 0xda, 0x4d, 0xc3, 0xdc, 0xf5, 0x6e, 0x87, 0xe0, 0xcf, + 0xfc, 0x70, 0xe3, 0x71, 0x7e, 0x61, 0x81, 0x28, 0x1d, 0x71, 0x47, 0xc4, 0xd0, 0x7b, 0xaf, 0x46, + 0x1d, 0x42, 0x1e, 0x7d, 0x74, 0xf1, 0x90, 0xfb, 0x27, 0x46, 0xdc, 0x72, 0x31, 0xe0, 0x7e, 0x8a, + 0x11, 0x87, 0x30, 0x0f, 0x3b, 0xef, 0x29, 0x7f, 0x7f, 0x04, 0xf2, 0x57, 0x0d, 0xc7, 0xb5, 0x6c, + 0x43, 0xd7, 0x5a, 0x74, 0xc5, 0xb8, 0x3c, 0xee, 0x47, 0x1e, 0xe5, 0x34, 0x71, 0x46, 0xf8, 0xa5, + 0x16, 0xfc, 0x60, 0xc8, 0x32, 0x24, 0x6e, 0x69, 0x2d, 0xf6, 0x89, 0x45, 0xf0, 0xfa, 0x99, 0x5e, + 0x99, 0x07, 0xbc, 0xa4, 0x20, 0x0a, 0xe3, 0x95, 0x7f, 0x9e, 0x1e, 0xe2, 0x6e, 0xb7, 0x0d, 0x87, + 0xfd, 0x25, 0x76, 0x17, 0x3b, 0x68, 0x13, 0xe2, 0xb6, 0xe6, 0xf2, 0xa0, 0xa6, 0xfc, 0x5e, 0x7e, + 0x15, 0xc5, 0xc3, 0xa3, 0x2f, 0x94, 0x58, 0xec, 0xbf, 0xad, 0x82, 0x22, 0xa1, 0x17, 0x20, 0xd5, + 0xd6, 0xf6, 0x55, 0x8a, 0x1a, 0x7d, 0x1b, 0x50, 0x93, 0x6d, 0x6d, 0x9f, 0xb4, 0x95, 0xcc, 0x20, + 0x02, 0xac, 0xef, 0x69, 0xe6, 0x2e, 0x66, 0xf8, 0xb1, 0xb7, 0x01, 0x3f, 0xd7, 0xd6, 0xf6, 0x2b, + 0x14, 0x93, 0xbc, 0x65, 0x29, 0xf5, 0xfa, 0x47, 0xe7, 0x27, 0xe8, 0x59, 0xe4, 0xdf, 0x8a, 0xf0, + 0xf8, 0x95, 0x8a, 0x0b, 0x69, 0x20, 0xe9, 0xde, 0x13, 0x7d, 0xbd, 0xc8, 0xe5, 0x9f, 0x1e, 0x36, + 0x1a, 0x3d, 0xc2, 0x2e, 0xe7, 0x48, 0x43, 0x3f, 0xfb, 0xc6, 0x7c, 0x84, 0x8d, 0x4b, 0x41, 0xef, + 0x19, 0x8c, 0x6b, 0x90, 0x61, 0x29, 0x34, 0x95, 0xfa, 0xad, 0xd1, 0x91, 0x7e, 0x6b, 0x4e, 0xf8, + 0xad, 0x0c, 0x10, 0x18, 0x37, 0xa9, 0x0f, 0xf4, 0xe3, 0xe7, 0x23, 0x90, 0x59, 0x0e, 0x5c, 0x33, + 0x35, 0x0b, 0xc9, 0xb6, 0x65, 0x1a, 0x37, 0xb1, 0xed, 0x6d, 0xc8, 0xb0, 0x47, 0xe2, 0x5f, 0xb2, + 0xbf, 0x56, 0xe4, 0x1e, 0x88, 0x2b, 0x18, 0xc4, 0x33, 0xe1, 0xba, 0x8d, 0xb7, 0x1d, 0x43, 0x48, + 0x5d, 0x11, 0x8f, 0xe8, 0x2c, 0x48, 0x0e, 0xd6, 0xbb, 0xb6, 0xe1, 0x1e, 0xa8, 0xba, 0x65, 0xba, + 0x9a, 0xee, 0xf2, 0xb4, 0x69, 0x41, 0x94, 0x57, 0x58, 0x31, 0x01, 0x69, 0x62, 0x57, 0x33, 0x5a, + 0xec, 0xbc, 0x57, 0x5a, 0x11, 0x8f, 0x81, 0xe6, 0x7e, 0x3a, 0x19, 0x8c, 0x0b, 0x2b, 0x20, 0x59, + 0x1d, 0x6c, 0x87, 0xbe, 0x77, 0x63, 0xba, 0x3a, 0xfb, 0x7b, 0x9f, 0x78, 0x6c, 0x86, 0x0b, 0x9e, + 0xef, 0xbe, 0xb3, 0x9b, 0x95, 0x95, 0x82, 0xe0, 0x10, 0x1f, 0xc2, 0xbd, 0x14, 0xda, 0x86, 0xe9, + 0x6e, 0xfb, 0xdf, 0xdb, 0xcf, 0xf4, 0x09, 0xb7, 0x64, 0x1e, 0x94, 0x67, 0x7f, 0xc7, 0x87, 0xf6, + 0xe3, 0xc6, 0xeb, 0xf8, 0x20, 0xb8, 0x27, 0x43, 0x61, 0x88, 0xfb, 0xfe, 0x8a, 0x66, 0xb4, 0xc4, + 0x1f, 0x77, 0x53, 0xf8, 0x13, 0x5a, 0xf2, 0x72, 0x30, 0x71, 0x1a, 0x0b, 0xc9, 0xc3, 0x74, 0xa4, + 0x6c, 0x99, 0xcd, 0x70, 0xba, 0x05, 0x35, 0x20, 0xe1, 0x5a, 0x37, 0xb1, 0xc9, 0x85, 0x74, 0x24, + 0xfd, 0xee, 0xbf, 0x7c, 0x86, 0x63, 0xa1, 0x5d, 0x90, 0x9a, 0xb8, 0x85, 0x77, 0xd9, 0xd7, 0x5a, + 0x7b, 0x9a, 0x8d, 0xd9, 0x17, 0x9c, 0x5f, 0xeb, 0xfc, 0x29, 0x78, 0xa8, 0x75, 0x0a, 0x8a, 0x36, + 0xc3, 0x17, 0x9d, 0x25, 0xf9, 0x96, 0xfc, 0x90, 0xfe, 0x07, 0x34, 0x33, 0x68, 0xb3, 0x42, 0x17, + 0xa3, 0x9d, 0x05, 0xa9, 0x6b, 0x6e, 0x5b, 0x26, 0xfd, 0x7b, 0x49, 0x3c, 0xba, 0x4a, 0xb1, 0x6d, + 0x3b, 0xaf, 0x9c, 0x6f, 0xdb, 0x6d, 0x42, 0xde, 0x27, 0xa5, 0xb3, 0x28, 0x7d, 0xd4, 0x59, 0x94, + 0xf3, 0x00, 0x08, 0x09, 0x5a, 0x03, 0xf0, 0xe7, 0xa9, 0xb7, 0xb5, 0x3f, 0x72, 0xc6, 0x07, 0x3b, + 0x13, 0x00, 0x40, 0x2d, 0x98, 0x6e, 0x1b, 0xa6, 0xea, 0xe0, 0xd6, 0x8e, 0xca, 0x25, 0x47, 0x70, + 0x33, 0x6f, 0xc3, 0x48, 0x4f, 0xb5, 0x0d, 0xb3, 0x8e, 0x5b, 0x3b, 0xcb, 0x1e, 0x2c, 0x7a, 0x2f, + 0x9c, 0xf2, 0xc5, 0x61, 0x99, 0xea, 0x9e, 0xd5, 0x6a, 0xaa, 0x36, 0xde, 0x51, 0x75, 0x7a, 0xf7, + 0x51, 0x96, 0x0a, 0xf1, 0x84, 0x47, 0xb2, 0x61, 0x5e, 0xb5, 0x5a, 0x4d, 0x05, 0xef, 0x54, 0x48, + 0x35, 0x7a, 0x10, 0x7c, 0x59, 0xa8, 0x46, 0xd3, 0x99, 0xcd, 0x2d, 0xc4, 0xce, 0xc4, 0x95, 0xac, + 0x57, 0x58, 0x6b, 0x3a, 0x4b, 0xd9, 0x0f, 0x7f, 0x74, 0x7e, 0x82, 0xcf, 0xde, 0x09, 0x79, 0x93, + 0xde, 0xd6, 0xc1, 0x27, 0x1e, 0x76, 0xd0, 0x25, 0x48, 0x6b, 0xe2, 0x81, 0x7d, 0x27, 0x72, 0xc8, + 0xc4, 0xf5, 0x49, 0x99, 0x3d, 0x78, 0xed, 0x0f, 0x17, 0x22, 0xf2, 0x4f, 0x46, 0x20, 0xb1, 0x7c, + 0x63, 0x53, 0x33, 0x6c, 0x54, 0x85, 0x29, 0x5f, 0x85, 0xc7, 0xb5, 0x06, 0xbe, 0xd6, 0x0b, 0x73, + 0x50, 0x1d, 0xf6, 0x11, 0xed, 0xa1, 0x30, 0xbd, 0x9f, 0xd7, 0xf6, 0x74, 0xfc, 0x1a, 0x24, 0x59, + 0x2b, 0x1d, 0xf4, 0x3c, 0x4c, 0x76, 0xc8, 0x0f, 0xbe, 0x19, 0x30, 0x37, 0x54, 0xf5, 0x29, 0x7d, + 0x50, 0x51, 0x18, 0x9f, 0xfc, 0x57, 0x11, 0x80, 0xe5, 0x1b, 0x37, 0x1a, 0xb6, 0xd1, 0x69, 0x61, + 0xf7, 0xed, 0xea, 0xf6, 0x2a, 0x1c, 0x0b, 0x7c, 0xae, 0x69, 0xeb, 0x63, 0x77, 0x7d, 0xda, 0xff, + 0x60, 0xd3, 0xd6, 0x07, 0xa2, 0x35, 0x1d, 0xd7, 0x43, 0x8b, 0x8d, 0x8d, 0xb6, 0xec, 0xb8, 0x83, + 0x65, 0xf9, 0x22, 0x64, 0xfc, 0xee, 0x3b, 0xa8, 0x06, 0x29, 0x97, 0xff, 0xe6, 0x22, 0x95, 0x87, + 0x8b, 0x54, 0xb0, 0x05, 0xc5, 0xea, 0xb1, 0xcb, 0x7f, 0x4d, 0x24, 0xeb, 0x4f, 0x8f, 0xaf, 0x2b, + 0x85, 0x22, 0x76, 0x9f, 0xdb, 0xe5, 0xb7, 0xc3, 0xaf, 0xe1, 0x58, 0x3d, 0xa2, 0xfd, 0x70, 0x14, + 0xa6, 0xb7, 0xc4, 0xf4, 0xfd, 0xba, 0x95, 0xc4, 0x16, 0x24, 0xb1, 0xe9, 0xda, 0x06, 0x16, 0x3b, + 0x80, 0x8f, 0x0f, 0x1b, 0xf0, 0x01, 0x7d, 0xa1, 0x7f, 0x34, 0x3b, 0x38, 0xfc, 0x02, 0xab, 0x47, + 0x14, 0xbf, 0x19, 0x83, 0xd9, 0x61, 0xec, 0xe8, 0x34, 0x14, 0x74, 0x1b, 0xd3, 0x02, 0x35, 0x94, + 0x25, 0xcf, 0x8b, 0x62, 0xbe, 0xe0, 0x28, 0x40, 0xdc, 0x38, 0xa2, 0x5d, 0x84, 0xf4, 0xde, 0xfc, + 0xb6, 0xbc, 0x8f, 0x40, 0x97, 0x1c, 0x0c, 0x05, 0x71, 0xec, 0x7d, 0x5b, 0x6b, 0x69, 0xa6, 0x7e, + 0x2f, 0x9e, 0x6e, 0xff, 0xfa, 0x20, 0xce, 0xd2, 0x97, 0x19, 0x26, 0xba, 0x01, 0x49, 0x01, 0x1f, + 0x7f, 0x1b, 0xe0, 0x05, 0x18, 0x7a, 0x00, 0xb2, 0xc1, 0x65, 0x83, 0x7a, 0x31, 0x71, 0x25, 0x13, + 0x58, 0x35, 0x46, 0xad, 0x4b, 0x89, 0x43, 0xd7, 0xa5, 0x80, 0xb3, 0xf8, 0x2f, 0x62, 0x30, 0xa5, + 0xe0, 0xe6, 0x37, 0xe0, 0xe0, 0x7d, 0x33, 0x00, 0x9b, 0xe0, 0xc4, 0xf8, 0xde, 0xc3, 0xf8, 0xf5, + 0x1b, 0x8c, 0x34, 0xc3, 0x5b, 0x76, 0xdc, 0x77, 0x73, 0x04, 0xff, 0x7d, 0x14, 0xb2, 0xc1, 0x11, + 0xfc, 0x06, 0x58, 0xed, 0xd0, 0xba, 0x6f, 0xde, 0xd8, 0x01, 0xf5, 0xb3, 0xc3, 0xcc, 0x5b, 0x9f, + 0x6e, 0x8f, 0x61, 0xd7, 0x7e, 0x30, 0x06, 0x09, 0x7e, 0x62, 0x6c, 0xa3, 0xcf, 0x1b, 0x8e, 0x8c, + 0xfa, 0x4c, 0x38, 0x27, 0x3e, 0x13, 0x1e, 0xe8, 0x0c, 0x3f, 0x04, 0x79, 0x12, 0x83, 0x87, 0x8e, + 0xa1, 0x45, 0xce, 0xe4, 0x68, 0x10, 0xed, 0x1f, 0x9a, 0x46, 0xf3, 0x90, 0x21, 0x64, 0xbe, 0x0d, + 0x27, 0x34, 0xd0, 0xd6, 0xf6, 0xab, 0xac, 0x04, 0x3d, 0x06, 0x68, 0xcf, 0xcb, 0x8f, 0xa8, 0xbe, + 0x30, 0x08, 0xdd, 0x94, 0x5f, 0x23, 0xc8, 0xef, 0x07, 0x20, 0xad, 0x50, 0xd9, 0x45, 0x9e, 0xfc, + 0x76, 0x55, 0x52, 0xb2, 0x4c, 0x2f, 0xf3, 0xfc, 0x36, 0xe6, 0x53, 0xf7, 0x84, 0xe7, 0x3c, 0xba, + 0x59, 0x3d, 0xda, 0xa4, 0xf8, 0xca, 0x1b, 0xf3, 0xc5, 0x03, 0xad, 0xdd, 0x5a, 0x92, 0x07, 0x40, + 0xca, 0xd4, 0xc7, 0x0e, 0x87, 0xf5, 0x4b, 0x67, 0x84, 0x2e, 0xdf, 0xf9, 0xfc, 0x2f, 0x9e, 0x3b, + 0x15, 0xc0, 0xdc, 0xf7, 0x12, 0x67, 0x6c, 0x38, 0xe4, 0x5f, 0x88, 0x00, 0xf2, 0x17, 0x1a, 0xef, + 0x98, 0xf8, 0x1a, 0x3d, 0x3c, 0x2c, 0x22, 0x81, 0xc8, 0xe1, 0x11, 0x86, 0xcf, 0x1f, 0x8a, 0x30, + 0x02, 0x13, 0xe8, 0x7d, 0xbe, 0x59, 0x17, 0x1f, 0x85, 0x0f, 0xb8, 0xc2, 0x75, 0xb1, 0x62, 0x19, + 0x21, 0x08, 0xc1, 0xe4, 0xcd, 0xcd, 0x09, 0xf9, 0x8d, 0x08, 0x9c, 0xec, 0xd3, 0x40, 0xaf, 0xd9, + 0x3a, 0x20, 0x3b, 0x50, 0x49, 0x47, 0x51, 0x6c, 0xbd, 0xde, 0x9b, 0x42, 0x4f, 0xd9, 0x7d, 0xa6, + 0xfc, 0x1d, 0x5a, 0xa3, 0xf8, 0x65, 0xae, 0xbf, 0x1d, 0x81, 0x99, 0x60, 0x8b, 0xbc, 0xbe, 0xd5, + 0x21, 0x1b, 0x6c, 0x0b, 0xef, 0xd5, 0x7b, 0xc6, 0xe9, 0x55, 0xb0, 0x43, 0x21, 0x10, 0xd2, 0x17, + 0xa1, 0xe9, 0x2c, 0x8d, 0xf7, 0xc4, 0xd8, 0x52, 0xf2, 0xb6, 0x28, 0x06, 0x4d, 0xff, 0x38, 0x1d, + 0xac, 0xef, 0x8d, 0x42, 0x7c, 0xd3, 0xb2, 0x5a, 0xe8, 0x3b, 0x22, 0x30, 0x65, 0x5a, 0xae, 0x4a, + 0xe6, 0x07, 0x6e, 0xaa, 0x3c, 0x95, 0xc0, 0x2c, 0xe8, 0x8d, 0xa3, 0x49, 0xef, 0x8b, 0x6f, 0xcc, + 0xf7, 0x43, 0x0d, 0xba, 0x7d, 0xb7, 0x60, 0x5a, 0x6e, 0x99, 0x12, 0x35, 0x58, 0xb6, 0xe1, 0x36, + 0xe4, 0xc2, 0xef, 0x67, 0x66, 0x57, 0x39, 0xf2, 0xfb, 0x73, 0x23, 0xdf, 0x9d, 0xdd, 0x0e, 0xbc, + 0x98, 0xdd, 0x81, 0xf9, 0xe7, 0x64, 0x70, 0x5f, 0x02, 0xe9, 0x46, 0xef, 0xa1, 0xb5, 0x2a, 0x24, + 0x8f, 0x7a, 0xfe, 0x2d, 0x28, 0x71, 0xce, 0x7b, 0xee, 0x93, 0x11, 0x00, 0x3f, 0x71, 0x83, 0x1e, + 0x85, 0x13, 0xe5, 0x8d, 0xf5, 0x65, 0xb5, 0xde, 0x28, 0x35, 0xb6, 0xea, 0xe1, 0x1b, 0xd7, 0xc5, + 0x35, 0x25, 0x4e, 0x07, 0xeb, 0xc6, 0x8e, 0x81, 0x9b, 0xe8, 0x61, 0x98, 0x09, 0x53, 0x93, 0xa7, + 0xea, 0xb2, 0x14, 0x29, 0x66, 0xef, 0xdc, 0x5d, 0x48, 0x31, 0x97, 0x14, 0x37, 0xd1, 0x19, 0x38, + 0xd6, 0x4f, 0x57, 0x5b, 0x5f, 0x91, 0xa2, 0xc5, 0xdc, 0x9d, 0xbb, 0x0b, 0x69, 0xcf, 0x77, 0x45, + 0x32, 0xa0, 0x20, 0x25, 0xc7, 0x8b, 0x15, 0xe1, 0xce, 0xdd, 0x85, 0x04, 0x1b, 0x96, 0x62, 0xfc, + 0xc3, 0x3f, 0x31, 0x37, 0x71, 0xee, 0x5b, 0x00, 0x6a, 0xe6, 0x8e, 0xad, 0xd1, 0x3f, 0x3b, 0x8c, + 0x8a, 0x70, 0xbc, 0xb6, 0x7e, 0x45, 0x29, 0x55, 0x1a, 0xb5, 0x8d, 0xf5, 0x9e, 0x8b, 0xe2, 0xc3, + 0x75, 0xcb, 0x1b, 0x5b, 0xe5, 0xd5, 0xaa, 0x5a, 0xaf, 0xad, 0xac, 0xb3, 0xcd, 0xdf, 0x50, 0xdd, + 0x0b, 0xeb, 0x8d, 0xda, 0x5a, 0x55, 0x8a, 0x96, 0xaf, 0x0c, 0xdd, 0x7e, 0x78, 0xf4, 0xd0, 0x01, + 0xf7, 0x2d, 0x65, 0x68, 0x0f, 0xe2, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x67, 0x40, 0xb3, + 0x7c, 0x9a, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) From 85fc4afcc9636c3fd8a16975b6eba6c5d1944264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 18:42:34 +0200 Subject: [PATCH 08/34] build(deps): Bump github.com/cosmos/gogoproto from 1.4.8 to 1.4.9 (#16030) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert --- api/go.mod | 2 +- api/go.sum | 4 ++-- client/v2/go.mod | 2 +- client/v2/go.sum | 4 ++-- core/go.mod | 2 +- core/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- orm/go.mod | 2 +- orm/go.sum | 4 ++-- simapp/go.mod | 2 +- simapp/go.sum | 4 ++-- tests/go.mod | 2 +- tests/go.sum | 4 ++-- tools/cosmovisor/go.mod | 2 +- tools/cosmovisor/go.sum | 4 ++-- tools/rosetta/go.mod | 2 +- tools/rosetta/go.sum | 4 ++-- tx/go.mod | 2 +- tx/go.sum | 4 ++-- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/go.mod b/api/go.mod index 2da415487b..00fced3c0a 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/gogoproto v1.4.8 + github.com/cosmos/gogoproto v1.4.9 google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.30.0 diff --git a/api/go.sum b/api/go.sum index 148d06d7b3..0c741f6944 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,7 +1,7 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= diff --git a/client/v2/go.mod b/client/v2/go.mod index 1bbbf23364..b4d6d245b5 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -16,7 +16,7 @@ require ( require ( cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect diff --git a/client/v2/go.sum b/client/v2/go.sum index 03c8e31e79..0250d8560e 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -8,8 +8,8 @@ github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= diff --git a/core/go.mod b/core/go.mod index f601d85edf..755d131979 100644 --- a/core/go.mod +++ b/core/go.mod @@ -15,7 +15,7 @@ require ( ) require ( - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect diff --git a/core/go.sum b/core/go.sum index 7a47312fb2..47b19341f7 100644 --- a/core/go.sum +++ b/core/go.sum @@ -6,8 +6,8 @@ github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= diff --git a/go.mod b/go.mod index 11ea5bb359..f2a66dc278 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogogateway v1.2.0 - github.com/cosmos/gogoproto v1.4.8 + github.com/cosmos/gogoproto v1.4.9 github.com/cosmos/iavl v0.20.0 github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 22f2941fab..8fb58461e3 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/orm/go.mod b/orm/go.mod index 0f739290ca..7736955cfe 100644 --- a/orm/go.mod +++ b/orm/go.mod @@ -24,7 +24,7 @@ require ( github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/apd/v3 v3.1.0 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/cucumber/common/gherkin/go/v22 v22.0.0 // indirect github.com/cucumber/common/messages/go/v17 v17.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/orm/go.sum b/orm/go.sum index 432581271b..d966ed97c0 100644 --- a/orm/go.sum +++ b/orm/go.sum @@ -24,8 +24,8 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= diff --git a/simapp/go.mod b/simapp/go.mod index c1d2736e69..9309d16e23 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -49,7 +49,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index f54e3b20ba..76a70cd37e 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -325,8 +325,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/tests/go.mod b/tests/go.mod index 79df2812ae..2e45065bd8 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -10,7 +10,7 @@ require ( github.com/cometbft/cometbft v0.37.1 github.com/cometbft/cometbft-db v0.7.0 github.com/cosmos/cosmos-sdk v0.47.2 - github.com/cosmos/gogoproto v1.4.8 + github.com/cosmos/gogoproto v1.4.9 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/spf13/cobra v1.6.1 diff --git a/tests/go.sum b/tests/go.sum index 8d4579730d..e1a5f34beb 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -325,8 +325,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 1b7afbc834..7936e223e2 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -40,7 +40,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 57b05595ed..65faa080d7 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -287,8 +287,8 @@ github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXy github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 3afff49902..6fd9d0afae 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -34,7 +34,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index 7ed0fa9d84..700be80b5f 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -121,8 +121,8 @@ github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXy github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= diff --git a/tx/go.mod b/tx/go.mod index 88ebc60d15..abb54fdafc 100644 --- a/tx/go.mod +++ b/tx/go.mod @@ -12,7 +12,7 @@ require ( ) require ( - github.com/cosmos/gogoproto v1.4.8 // indirect + github.com/cosmos/gogoproto v1.4.9 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect diff --git a/tx/go.sum b/tx/go.sum index f93dfb4506..04fb66e176 100644 --- a/tx/go.sum +++ b/tx/go.sum @@ -4,8 +4,8 @@ cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= +github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 050f03af10b9d0a2de440b1baf3d5d6fda85e1f3 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 12:02:37 +0000 Subject: [PATCH 09/34] feat!: bootstrap comet cmd for local state sync (backport #16061) (#16079) Co-authored-by: Marko --- CHANGELOG.md | 2 +- docs/docs/run-node/01-run-node.md | 12 ++++ server/tm_cmds.go | 96 +++++++++++++++++++++++++++++++ server/util.go | 1 + 4 files changed, 110 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f43850cf3..bb25dc009f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,7 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (client) [#16075](https://github.com/cosmos/cosmos-sdk/pull/16075) Partly revert [#15953](https://github.com/cosmos/cosmos-sdk/issues/15953) and `factory.Prepare` now does nothing in offline mode. * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. - +* (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) add comet bootstrap command ### Bug Fixes * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. diff --git a/docs/docs/run-node/01-run-node.md b/docs/docs/run-node/01-run-node.md index 871fd0d2b1..8369920707 100644 --- a/docs/docs/run-node/01-run-node.md +++ b/docs/docs/run-node/01-run-node.md @@ -149,3 +149,15 @@ In config.toml: ```toml log_level: "state:info,p2p:info,consensus:info,x/staking:info,x/ibc:info,*error" ``` + +## State Sync + +State sync is the act in which a node syncs the latest or close to the latest state of a blockchain. This is useful for users who don't want to sync all the blocks in history. You can read more here: https://docs.cometbft.com/v0.37/core/state-sync + +### Local State Sync + +Local state sync work similar to normal state sync except that it works off a local snapshot of state instead of one provided via the p2p network. The steps to start local state sync are similar to normal state sync with a few different designs. + +1. As mentioned in https://docs.cometbft.com/v0.37/core/state-sync, one must set a height and hash in the config.toml along with a few rpc servers (the afromentioned link has instructions on how to do this). +2. Bootsrapping Comet state in order to start the node after the snapshot has been ingested. This can be done with the bootstrap command ` comet bootstrap-state` + diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 97ed7e6c2b..63b4e718d0 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -5,14 +5,22 @@ package server import ( "fmt" + "github.com/cometbft/cometbft/light" + "github.com/cometbft/cometbft/node" "github.com/cometbft/cometbft/p2p" pvm "github.com/cometbft/cometbft/privval" + cmtstore "github.com/cometbft/cometbft/proto/tendermint/store" + sm "github.com/cometbft/cometbft/state" + "github.com/cometbft/cometbft/statesync" + "github.com/cometbft/cometbft/store" tversion "github.com/cometbft/cometbft/version" "github.com/spf13/cobra" "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" + "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -117,3 +125,91 @@ func VersionCmd() *cobra.Command { }, } } + +func BootstrapStateCmd(appCreator types.AppCreator) *cobra.Command { + cmd := &cobra.Command{ + Use: "bootstrap-state", + Short: "Bootstrap CometBFT state at an arbitrary block height using a light client", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + serverCtx := GetServerContextFromCmd(cmd) + cfg := serverCtx.Config + + height, err := cmd.Flags().GetInt64("height") + if err != nil { + return err + } + if height == 0 { + home := serverCtx.Viper.GetString(flags.FlagHome) + db, err := openDB(home, GetAppDBBackend(serverCtx.Viper)) + if err != nil { + return err + } + + app := appCreator(serverCtx.Logger, db, nil, serverCtx.Viper) + height = app.CommitMultiStore().LastCommitID().Version + } + + blockStoreDB, err := node.DefaultDBProvider(&node.DBContext{ID: "blockstore", Config: cfg}) + if err != nil { + return err + } + blockStore := store.NewBlockStore(blockStoreDB) + + stateDB, err := node.DefaultDBProvider(&node.DBContext{ID: "state", Config: cfg}) + if err != nil { + return err + } + stateStore := sm.NewStore(stateDB, sm.StoreOptions{ + DiscardABCIResponses: cfg.Storage.DiscardABCIResponses, + }) + + genState, _, err := node.LoadStateFromDBOrGenesisDocProvider(stateDB, node.DefaultGenesisDocProviderFunc(cfg)) + if err != nil { + return err + } + + stateProvider, err := statesync.NewLightClientStateProvider( + cmd.Context(), + genState.ChainID, genState.Version, genState.InitialHeight, + cfg.StateSync.RPCServers, light.TrustOptions{ + Period: cfg.StateSync.TrustPeriod, + Height: cfg.StateSync.TrustHeight, + Hash: cfg.StateSync.TrustHashBytes(), + }, serverCtx.Logger.With("module", "light")) + if err != nil { + return fmt.Errorf("failed to set up light client state provider: %w", err) + } + + state, err := stateProvider.State(cmd.Context(), uint64(height)) + if err != nil { + return fmt.Errorf("failed to get state: %w", err) + } + + commit, err := stateProvider.Commit(cmd.Context(), uint64(height)) + if err != nil { + return fmt.Errorf("failed to get commit: %w", err) + } + + if err := stateStore.Bootstrap(state); err != nil { + return fmt.Errorf("failed to bootstrap state: %w", err) + } + + if err := blockStore.SaveSeenCommit(state.LastBlockHeight, commit); err != nil { + return fmt.Errorf("failed to save seen commit: %w", err) + } + + store.SaveBlockStoreState(&cmtstore.BlockStoreState{ + // it breaks the invariant that blocks in range [Base, Height] must exists, but it do works in practice. + Base: state.LastBlockHeight, + Height: state.LastBlockHeight, + }, blockStoreDB) + + return nil + }, + } + + cmd.Flags().Int64("height", 0, "Block height to bootstrap state at, if not provided will use the latest block height in app state") + + return cmd +} diff --git a/server/util.go b/server/util.go index c601c078bb..6d15d284af 100644 --- a/server/util.go +++ b/server/util.go @@ -306,6 +306,7 @@ func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator type VersionCmd(), tmcmd.ResetAllCmd, tmcmd.ResetStateCmd, + BootstrapStateCmd(appCreator), ) startCmd := StartCmd(appCreator, defaultNodeHome) From 6aa7de4fc12ae019bc9d67a40902632d7b6b2db2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 21:43:25 +0000 Subject: [PATCH 10/34] build(deps): Bump github.com/cosmos/gogoproto from 1.4.9 to 1.4.10 (#16123) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- api/go.mod | 6 +++--- api/go.sum | 12 ++++++------ client/v2/go.mod | 6 +++--- client/v2/go.sum | 12 ++++++------ core/go.mod | 6 +++--- core/go.sum | 12 ++++++------ go.mod | 8 ++++---- go.sum | 18 +++++++++--------- orm/go.mod | 8 ++++---- orm/go.sum | 16 ++++++++-------- simapp/go.mod | 8 ++++---- simapp/go.sum | 18 +++++++++--------- tests/go.mod | 8 ++++---- tests/go.sum | 18 +++++++++--------- tools/cosmovisor/go.mod | 8 ++++---- tools/cosmovisor/go.sum | 18 +++++++++--------- tools/rosetta/go.mod | 6 +++--- tools/rosetta/go.sum | 12 ++++++------ tx/go.mod | 6 +++--- tx/go.sum | 12 ++++++------ 20 files changed, 109 insertions(+), 109 deletions(-) diff --git a/api/go.mod b/api/go.mod index 00fced3c0a..45049eb55b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -4,9 +4,9 @@ go 1.19 require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/gogoproto v1.4.9 - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f - google.golang.org/grpc v1.54.0 + github.com/cosmos/gogoproto v1.4.10 + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 + google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 ) diff --git a/api/go.sum b/api/go.sum index 0c741f6944..a68f0ccce6 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,7 +1,7 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= @@ -17,10 +17,10 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/client/v2/go.mod b/client/v2/go.mod index b4d6d245b5..d7544fc2cf 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -9,14 +9,14 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 - google.golang.org/grpc v1.54.0 + google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 gotest.tools/v3 v3.4.0 ) require ( cosmossdk.io/depinject v1.0.0-alpha.3 // indirect - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect @@ -25,5 +25,5 @@ require ( golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect ) diff --git a/client/v2/go.sum b/client/v2/go.sum index 0250d8560e..d7b2d870a5 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -8,8 +8,8 @@ github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= @@ -66,10 +66,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/core/go.mod b/core/go.mod index 755d131979..6fc17029e8 100644 --- a/core/go.mod +++ b/core/go.mod @@ -8,14 +8,14 @@ require ( cosmossdk.io/math v1.0.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/stretchr/testify v1.8.1 - google.golang.org/grpc v1.54.0 + google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 gotest.tools/v3 v3.4.0 sigs.k8s.io/yaml v1.3.0 ) require ( - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -27,7 +27,7 @@ require ( golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/core/go.sum b/core/go.sum index 47b19341f7..133ea345d5 100644 --- a/core/go.sum +++ b/core/go.sum @@ -6,8 +6,8 @@ github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= github.com/cucumber/common/messages/go/v17 v17.1.1 h1:RNqopvIFyLWnKv0LfATh34SWBhXeoFTJnSrgm9cT/Ts= @@ -69,10 +69,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/go.mod b/go.mod index f2a66dc278..eaf696a5ce 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogogateway v1.2.0 - github.com/cosmos/gogoproto v1.4.9 + github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/iavl v0.20.0 github.com/cosmos/ledger-cosmos-go v0.12.1 github.com/golang/mock v1.6.0 @@ -57,8 +57,8 @@ require ( github.com/tidwall/btree v1.6.0 golang.org/x/crypto v0.7.0 golang.org/x/exp v0.0.0-20230321023759-10a507213a29 - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 - google.golang.org/grpc v1.54.0 + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 + google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 gotest.tools/v3 v3.4.0 pgregory.net/rapid v0.5.5 @@ -154,7 +154,7 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect diff --git a/go.sum b/go.sum index 8fb58461e3..3f2ff7768c 100644 --- a/go.sum +++ b/go.sum @@ -117,7 +117,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -327,8 +327,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= @@ -1142,8 +1142,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1521,8 +1521,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1564,8 +1564,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/orm/go.mod b/orm/go.mod index 7736955cfe..ea397eebb3 100644 --- a/orm/go.mod +++ b/orm/go.mod @@ -13,7 +13,7 @@ require ( github.com/regen-network/gocuke v0.6.2 github.com/stretchr/testify v1.8.1 golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 - google.golang.org/grpc v1.54.0 + google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 gotest.tools/v3 v3.4.0 pgregory.net/rapid v0.5.5 @@ -24,7 +24,7 @@ require ( github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/apd/v3 v3.1.0 // indirect - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/cucumber/common/gherkin/go/v22 v22.0.0 // indirect github.com/cucumber/common/messages/go/v17 v17.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -37,7 +37,7 @@ require ( github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/gofrs/uuid v4.3.0+incompatible // indirect - github.com/golang/glog v1.0.0 // indirect + github.com/golang/glog v1.1.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect @@ -56,7 +56,7 @@ require ( golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/orm/go.sum b/orm/go.sum index d966ed97c0..88c8caca7f 100644 --- a/orm/go.sum +++ b/orm/go.sum @@ -24,8 +24,8 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/common/gherkin/go/v22 v22.0.0 h1:4K8NqptbvdOrjL9DEea6HFjSpbdT9+Q5kgLpmmsHYl0= @@ -60,8 +60,8 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gofrs/uuid v4.3.0+incompatible h1:CaSVZxm5B+7o45rtab4jC2G37WGYX1zQfuU2i6DSvnc= github.com/gofrs/uuid v4.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -222,10 +222,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/simapp/go.mod b/simapp/go.mod index 9309d16e23..68f766ed37 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -49,7 +49,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect @@ -148,15 +148,15 @@ require ( golang.org/x/crypto v0.7.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.110.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect - google.golang.org/grpc v1.54.0 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect + google.golang.org/grpc v1.55.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index 76a70cd37e..d8abd643c3 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -117,7 +117,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -325,8 +325,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= @@ -1136,8 +1136,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1515,8 +1515,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1558,8 +1558,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/tests/go.mod b/tests/go.mod index 2e45065bd8..96c3808e80 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -10,7 +10,7 @@ require ( github.com/cometbft/cometbft v0.37.1 github.com/cometbft/cometbft-db v0.7.0 github.com/cosmos/cosmos-sdk v0.47.2 - github.com/cosmos/gogoproto v1.4.9 + github.com/cosmos/gogoproto v1.4.10 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/spf13/cobra v1.6.1 @@ -148,15 +148,15 @@ require ( golang.org/x/crypto v0.7.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.110.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect - google.golang.org/grpc v1.54.0 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect + google.golang.org/grpc v1.55.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/tests/go.sum b/tests/go.sum index e1a5f34beb..e5297f9c55 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -117,7 +117,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -325,8 +325,8 @@ github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4x github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= @@ -1132,8 +1132,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1511,8 +1511,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1554,8 +1554,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 7936e223e2..7d4af1199f 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -40,7 +40,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -124,15 +124,15 @@ require ( golang.org/x/crypto v0.7.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.110.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect - google.golang.org/grpc v1.54.0 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect + google.golang.org/grpc v1.55.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 65faa080d7..345ca72557 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -117,7 +117,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+CamDs= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -287,8 +287,8 @@ github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXy github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= @@ -888,8 +888,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1240,8 +1240,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1277,8 +1277,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 6fd9d0afae..65877d52fe 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -12,7 +12,7 @@ require ( github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 - google.golang.org/grpc v1.54.0 + google.golang.org/grpc v1.55.0 ) require ( @@ -34,7 +34,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -107,7 +107,7 @@ require ( golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index 700be80b5f..a226c39ad8 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -121,8 +121,8 @@ github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXy github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= @@ -811,8 +811,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -830,8 +830,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/tx/go.mod b/tx/go.mod index abb54fdafc..e236652612 100644 --- a/tx/go.mod +++ b/tx/go.mod @@ -12,7 +12,7 @@ require ( ) require ( - github.com/cosmos/gogoproto v1.4.9 // indirect + github.com/cosmos/gogoproto v1.4.10 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -21,8 +21,8 @@ require ( golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect - google.golang.org/grpc v1.54.0 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect + google.golang.org/grpc v1.55.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/tx/go.sum b/tx/go.sum index 04fb66e176..0f641310ed 100644 --- a/tx/go.sum +++ b/tx/go.sum @@ -4,8 +4,8 @@ cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/gogoproto v1.4.9 h1:MjVmV6F1yk1rJLWtKeYdGQcTbE880t+VlRcayEBqUKQ= -github.com/cosmos/gogoproto v1.4.9/go.mod h1:c0ysUnwvnlR+RmCUvqqii7pp8kHBB/DBcp/5VLA/nQk= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -36,10 +36,10 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs= -google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= From cbd8a0152a49179c01b9446d11152f7f7d3c3fbd Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 12:38:45 +0200 Subject: [PATCH 11/34] feat: add local snapshots management commands (backport #16067) (#16102) Co-authored-by: yihuang Co-authored-by: marbar3778 Co-authored-by: Julien Robert --- CHANGELOG.md | 2 + client/snapshot/cmd.go | 24 ++++++++ client/snapshot/delete.go | 35 +++++++++++ client/snapshot/dump.go | 120 +++++++++++++++++++++++++++++++++++++ client/snapshot/export.go | 52 ++++++++++++++++ client/snapshot/list.go | 30 ++++++++++ client/snapshot/load.go | 113 ++++++++++++++++++++++++++++++++++ client/snapshot/restore.go | 50 ++++++++++++++++ go.mod | 19 +++--- go.sum | 99 ++++++++++++++++-------------- server/types/app.go | 8 ++- server/util.go | 30 ++++++---- simapp/go.mod | 19 +++--- simapp/go.sum | 95 +++++++++++++++-------------- simapp/simd/cmd/root.go | 2 + snapshots/manager.go | 19 ++++++ snapshots/store.go | 64 ++++++++++++-------- tests/go.mod | 16 ++--- tests/go.sum | 114 ++++++++++++++++++++--------------- 19 files changed, 707 insertions(+), 204 deletions(-) create mode 100644 client/snapshot/cmd.go create mode 100644 client/snapshot/delete.go create mode 100644 client/snapshot/dump.go create mode 100644 client/snapshot/export.go create mode 100644 client/snapshot/list.go create mode 100644 client/snapshot/load.go create mode 100644 client/snapshot/restore.go diff --git a/CHANGELOG.md b/CHANGELOG.md index bb25dc009f..a7704831e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,7 +43,9 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (client) [#16075](https://github.com/cosmos/cosmos-sdk/pull/16075) Partly revert [#15953](https://github.com/cosmos/cosmos-sdk/issues/15953) and `factory.Prepare` now does nothing in offline mode. * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. +* (store) [#16067](https://github.com/cosmos/cosmos-sdk/pull/16067) Add local snapshots management commands. * (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) add comet bootstrap command + ### Bug Fixes * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. diff --git a/client/snapshot/cmd.go b/client/snapshot/cmd.go new file mode 100644 index 0000000000..f49f2b51c2 --- /dev/null +++ b/client/snapshot/cmd.go @@ -0,0 +1,24 @@ +package snapshot + +import ( + servertypes "github.com/cosmos/cosmos-sdk/server/types" + "github.com/spf13/cobra" +) + +// Cmd returns the snapshots group command +func Cmd(appCreator servertypes.AppCreator) *cobra.Command { + cmd := &cobra.Command{ + Use: "snapshots", + Short: "Manage local snapshots", + Long: "Manage local snapshots", + } + cmd.AddCommand( + ListSnapshotsCmd, + RestoreSnapshotCmd(appCreator), + ExportSnapshotCmd(appCreator), + DumpArchiveCmd(), + LoadArchiveCmd(), + DeleteSnapshotCmd(), + ) + return cmd +} diff --git a/client/snapshot/delete.go b/client/snapshot/delete.go new file mode 100644 index 0000000000..0259032e11 --- /dev/null +++ b/client/snapshot/delete.go @@ -0,0 +1,35 @@ +package snapshot + +import ( + "strconv" + + "github.com/cosmos/cosmos-sdk/server" + "github.com/spf13/cobra" +) + +func DeleteSnapshotCmd() *cobra.Command { + return &cobra.Command{ + Use: "delete ", + Short: "Delete a local snapshot", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + + height, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + format, err := strconv.ParseUint(args[1], 10, 32) + if err != nil { + return err + } + + snapshotStore, err := server.GetSnapshotStore(ctx.Viper) + if err != nil { + return err + } + + return snapshotStore.Delete(height, uint32(format)) + }, + } +} diff --git a/client/snapshot/dump.go b/client/snapshot/dump.go new file mode 100644 index 0000000000..917dca0715 --- /dev/null +++ b/client/snapshot/dump.go @@ -0,0 +1,120 @@ +package snapshot + +import ( + "archive/tar" + "compress/gzip" + "fmt" + "io" + "os" + "strconv" + + "github.com/cosmos/cosmos-sdk/server" + "github.com/spf13/cobra" +) + +// DumpArchiveCmd returns a command to dump the snapshot as portable archive format +func DumpArchiveCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: "dump ", + Short: "Dump the snapshot as portable archive format", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + snapshotStore, err := server.GetSnapshotStore(ctx.Viper) + if err != nil { + return err + } + + output, err := cmd.Flags().GetString("output") + if err != nil { + return err + } + + height, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + format, err := strconv.ParseUint(args[1], 10, 32) + if err != nil { + return err + } + + if output == "" { + output = fmt.Sprintf("%d-%d.tar.gz", height, format) + } + + snapshot, err := snapshotStore.Get(height, uint32(format)) + if err != nil { + return err + } + + bz, err := snapshot.Marshal() + if err != nil { + return err + } + + fp, err := os.Create(output) + if err != nil { + return err + } + defer fp.Close() + + // since the chunk files are already compressed, we just use fastest compression here + gzipWriter, err := gzip.NewWriterLevel(fp, gzip.BestSpeed) + if err != nil { + return err + } + tarWriter := tar.NewWriter(gzipWriter) + if err := tarWriter.WriteHeader(&tar.Header{ + Name: SnapshotFileName, + Mode: 0o644, + Size: int64(len(bz)), + }); err != nil { + return fmt.Errorf("failed to write snapshot header to tar: %w", err) + } + if _, err := tarWriter.Write(bz); err != nil { + return fmt.Errorf("failed to write snapshot to tar: %w", err) + } + + for i := uint32(0); i < snapshot.Chunks; i++ { + path := snapshotStore.PathChunk(height, uint32(format), i) + file, err := os.Open(path) + if err != nil { + return fmt.Errorf("failed to open chunk file %s: %w", path, err) + } + defer file.Close() + + st, err := file.Stat() + if err != nil { + return fmt.Errorf("failed to stat chunk file %s: %w", path, err) + } + + if err := tarWriter.WriteHeader(&tar.Header{ + Name: strconv.FormatUint(uint64(i), 10), + Mode: 0o644, + Size: st.Size(), + }); err != nil { + return fmt.Errorf("failed to write chunk header to tar: %w", err) + } + + if _, err := io.Copy(tarWriter, file); err != nil { + return fmt.Errorf("failed to write chunk to tar: %w", err) + } + } + + if err := tarWriter.Close(); err != nil { + return fmt.Errorf("failed to close tar writer: %w", err) + } + + if err := gzipWriter.Close(); err != nil { + return fmt.Errorf("failed to close gzip writer: %w", err) + } + + return fp.Close() + }, + } + + cmd.Flags().StringP("output", "o", "", "output file") + + return cmd +} diff --git a/client/snapshot/export.go b/client/snapshot/export.go new file mode 100644 index 0000000000..6465b7f1e2 --- /dev/null +++ b/client/snapshot/export.go @@ -0,0 +1,52 @@ +package snapshot + +import ( + "fmt" + + "github.com/cosmos/cosmos-sdk/server" + servertypes "github.com/cosmos/cosmos-sdk/server/types" + "github.com/spf13/cobra" +) + +// ExportSnapshotCmd returns a command to take a snapshot of the application state +func ExportSnapshotCmd(appCreator servertypes.AppCreator) *cobra.Command { + cmd := &cobra.Command{ + Use: "export", + Short: "Export app state to snapshot store", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + + height, err := cmd.Flags().GetInt64("height") + if err != nil { + return err + } + + home := ctx.Config.RootDir + db, err := openDB(home, server.GetAppDBBackend(ctx.Viper)) + if err != nil { + return err + } + app := appCreator(ctx.Logger, db, nil, ctx.Viper) + + if height == 0 { + height = app.CommitMultiStore().LastCommitID().Version + } + + fmt.Printf("Exporting snapshot for height %d\n", height) + + sm := app.SnapshotManager() + snapshot, err := sm.Create(uint64(height)) + if err != nil { + return err + } + + fmt.Printf("Snapshot created at height %d, format %d, chunks %d\n", snapshot.Height, snapshot.Format, snapshot.Chunks) + return nil + }, + } + + cmd.Flags().Int64("height", 0, "Height to export, default to latest state height") + + return cmd +} diff --git a/client/snapshot/list.go b/client/snapshot/list.go new file mode 100644 index 0000000000..6ff6391d42 --- /dev/null +++ b/client/snapshot/list.go @@ -0,0 +1,30 @@ +package snapshot + +import ( + "fmt" + + "github.com/cosmos/cosmos-sdk/server" + "github.com/spf13/cobra" +) + +// ListSnapshotsCmd returns the command to list local snapshots +var ListSnapshotsCmd = &cobra.Command{ + Use: "list", + Short: "List local snapshots", + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + snapshotStore, err := server.GetSnapshotStore(ctx.Viper) + if err != nil { + return err + } + snapshots, err := snapshotStore.List() + if err != nil { + return fmt.Errorf("failed to list snapshots: %w", err) + } + for _, snapshot := range snapshots { + fmt.Println("height:", snapshot.Height, "format:", snapshot.Format, "chunks:", snapshot.Chunks) + } + + return nil + }, +} diff --git a/client/snapshot/load.go b/client/snapshot/load.go new file mode 100644 index 0000000000..6797d58baf --- /dev/null +++ b/client/snapshot/load.go @@ -0,0 +1,113 @@ +package snapshot + +import ( + "archive/tar" + "bytes" + "compress/gzip" + "fmt" + "io" + "os" + "reflect" + "strconv" + + "github.com/cosmos/cosmos-sdk/server" + "github.com/spf13/cobra" + + snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" +) + +const SnapshotFileName = "_snapshot" + +// LoadArchiveCmd load a portable archive format snapshot into snapshot store +func LoadArchiveCmd() *cobra.Command { + return &cobra.Command{ + Use: "load ", + Short: "Load a snapshot archive file into snapshot store", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + snapshotStore, err := server.GetSnapshotStore(ctx.Viper) + if err != nil { + return err + } + + path := args[0] + fp, err := os.Open(path) + if err != nil { + return fmt.Errorf("failed to open archive file: %w", err) + } + reader, err := gzip.NewReader(fp) + if err != nil { + return fmt.Errorf("failed to create gzip reader: %w", err) + } + + var snapshot snapshottypes.Snapshot + tr := tar.NewReader(reader) + if err != nil { + return fmt.Errorf("failed to create tar reader: %w", err) + } + + hdr, err := tr.Next() + if err != nil { + return fmt.Errorf("failed to read snapshot file header: %w", err) + } + if hdr.Name != SnapshotFileName { + return fmt.Errorf("invalid archive, expect file: snapshot, got: %s", hdr.Name) + } + bz, err := io.ReadAll(tr) + if err != nil { + return fmt.Errorf("failed to read snapshot file: %w", err) + } + if err := snapshot.Unmarshal(bz); err != nil { + return fmt.Errorf("failed to unmarshal snapshot: %w", err) + } + + // make sure the channel is unbuffered, because the tar reader can't do concurrency + chunks := make(chan io.ReadCloser) + quitChan := make(chan *snapshottypes.Snapshot) + go func() { + defer close(quitChan) + + savedSnapshot, err := snapshotStore.Save(snapshot.Height, snapshot.Format, chunks) + if err != nil { + fmt.Println("failed to save snapshot", err) + return + } + quitChan <- savedSnapshot + }() + + for i := uint32(0); i < snapshot.Chunks; i++ { + hdr, err = tr.Next() + if err != nil { + if err == io.EOF { + break + } + return err + } + + if hdr.Name != strconv.FormatInt(int64(i), 10) { + return fmt.Errorf("invalid archive, expect file: %d, got: %s", i, hdr.Name) + } + + bz, err := io.ReadAll(tr) + if err != nil { + return fmt.Errorf("failed to read chunk file: %w", err) + } + chunks <- io.NopCloser(bytes.NewReader(bz)) + } + close(chunks) + + savedSnapshot := <-quitChan + if savedSnapshot == nil { + return fmt.Errorf("failed to save snapshot") + } + + if !reflect.DeepEqual(&snapshot, savedSnapshot) { + _ = snapshotStore.Delete(snapshot.Height, snapshot.Format) + return fmt.Errorf("invalid archive, the saved snapshot is not equal to the original one") + } + + return nil + }, + } +} diff --git a/client/snapshot/restore.go b/client/snapshot/restore.go new file mode 100644 index 0000000000..9b134ca7d6 --- /dev/null +++ b/client/snapshot/restore.go @@ -0,0 +1,50 @@ +package snapshot + +import ( + "path/filepath" + "strconv" + + "github.com/spf13/cobra" + + dbm "github.com/cometbft/cometbft-db" + "github.com/cosmos/cosmos-sdk/server" + servertypes "github.com/cosmos/cosmos-sdk/server/types" +) + +// RestoreSnapshotCmd returns a command to restore a snapshot +func RestoreSnapshotCmd(appCreator servertypes.AppCreator) *cobra.Command { + cmd := &cobra.Command{ + Use: "restore ", + Short: "Restore app state from local snapshot", + Long: "Restore app state from local snapshot", + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := server.GetServerContextFromCmd(cmd) + + height, err := strconv.ParseUint(args[0], 10, 64) + if err != nil { + return err + } + format, err := strconv.ParseUint(args[1], 10, 32) + if err != nil { + return err + } + + home := ctx.Config.RootDir + db, err := openDB(home, server.GetAppDBBackend(ctx.Viper)) + if err != nil { + return err + } + app := appCreator(ctx.Logger, db, nil, ctx.Viper) + + sm := app.SnapshotManager() + return sm.RestoreLocalSnapshot(height, uint32(format)) + }, + } + return cmd +} + +func openDB(rootDir string, backendType dbm.BackendType) (dbm.DB, error) { + dataDir := filepath.Join(rootDir, "data") + return dbm.NewDB("application", backendType, dataDir) +} diff --git a/go.mod b/go.mod index eaf696a5ce..bb477f2f66 100644 --- a/go.mod +++ b/go.mod @@ -39,13 +39,13 @@ require ( github.com/hdevalence/ed25519consensus v0.1.0 github.com/huandu/skiplist v1.2.0 github.com/improbable-eng/grpc-web v0.15.0 - github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b + github.com/jhump/protoreflect v1.15.1 github.com/magiconair/properties v1.8.6 github.com/manifoldco/promptui v0.9.0 github.com/mattn/go-isatty v0.0.18 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 - github.com/prometheus/common v0.37.0 + github.com/prometheus/common v0.42.0 github.com/rakyll/statik v0.1.7 github.com/rs/zerolog v1.29.1 github.com/spf13/cast v1.5.0 @@ -77,6 +77,7 @@ require ( github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bufbuild/protocompile v0.4.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -125,7 +126,7 @@ require ( github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -135,18 +136,18 @@ require ( github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/gomega v1.20.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/spf13/afero v1.9.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/zondax/hid v0.9.1 // indirect @@ -173,9 +174,9 @@ replace ( // dgrijalva/jwt-go is deprecated and doesn't receive security updates. // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 - // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. + // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // Downgraded to avoid bugs in following commits which caused simulations to fail. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index 3f2ff7768c..d9d2920551 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,11 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -269,10 +274,12 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -405,8 +412,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -415,8 +422,6 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -424,13 +429,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= @@ -439,8 +444,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -649,12 +654,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= -github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= -github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= -github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= -github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= -github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -669,7 +670,6 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -687,6 +687,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -721,13 +723,14 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= @@ -805,12 +808,13 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -829,8 +833,6 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -847,20 +849,16 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -951,11 +949,11 @@ github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -997,6 +995,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1009,9 +1009,9 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1101,7 +1101,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1115,6 +1114,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1158,6 +1159,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1212,7 +1214,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1223,7 +1224,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1237,7 +1237,6 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1257,12 +1256,16 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1274,7 +1277,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1631,6 +1637,7 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/server/types/app.go b/server/types/app.go index 734b85c71b..bbcc6aae72 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -16,7 +16,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/snapshots" + storetypes "github.com/cosmos/cosmos-sdk/store/types" ) // ServerStartTime defines the time duration that the server need to stay running after startup @@ -58,7 +59,10 @@ type ( RegisterNodeService(client.Context) // CommitMultiStore return the multistore instance - CommitMultiStore() sdk.CommitMultiStore + CommitMultiStore() storetypes.CommitMultiStore + + // Return the snapshot manager + SnapshotManager() *snapshots.Manager } // AppCreator is a function that allows us to lazily initialize an diff --git a/server/util.go b/server/util.go index 6d15d284af..9d105671d4 100644 --- a/server/util.go +++ b/server/util.go @@ -463,16 +463,7 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) { chainID = appGenesis.ChainID } - snapshotDir := filepath.Join(homeDir, "data", "snapshots") - if err = os.MkdirAll(snapshotDir, os.ModePerm); err != nil { - panic(fmt.Errorf("failed to create snapshots directory: %w", err)) - } - - snapshotDB, err := dbm.NewDB("metadata", GetAppDBBackend(appOpts), snapshotDir) - if err != nil { - panic(err) - } - snapshotStore, err := snapshots.NewStore(snapshotDB, snapshotDir) + snapshotStore, err := GetSnapshotStore(appOpts) if err != nil { panic(err) } @@ -503,3 +494,22 @@ func DefaultBaseappOptions(appOpts types.AppOptions) []func(*baseapp.BaseApp) { baseapp.SetChainID(chainID), } } + +func GetSnapshotStore(appOpts types.AppOptions) (*snapshots.Store, error) { + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + snapshotDir := filepath.Join(homeDir, "data", "snapshots") + if err := os.MkdirAll(snapshotDir, os.ModePerm); err != nil { + return nil, fmt.Errorf("failed to create snapshots directory: %w", err) + } + + snapshotDB, err := dbm.NewDB("metadata", GetAppDBBackend(appOpts), snapshotDir) + if err != nil { + return nil, err + } + snapshotStore, err := snapshots.NewStore(snapshotDB, snapshotDir) + if err != nil { + return nil, err + } + + return snapshotStore, nil +} diff --git a/simapp/go.mod b/simapp/go.mod index 68f766ed37..962dd14fb5 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -65,12 +65,9 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/gin-gonic/gin v1.8.1 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-playground/validator/v10 v10.11.1 // indirect - github.com/goccy/go-json v0.9.11 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -112,7 +109,7 @@ require ( github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.18 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -120,14 +117,14 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect @@ -136,7 +133,7 @@ require ( github.com/spf13/afero v1.9.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect @@ -170,9 +167,9 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Simapp always use the latest version of the cosmos-sdk github.com/cosmos/cosmos-sdk => ../. - // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. + // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // Downgraded to avoid bugs in following commits which caused simulations to fail. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/simapp/go.sum b/simapp/go.sum index d8abd643c3..cc287a51a8 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -259,6 +259,10 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -269,10 +273,12 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -404,8 +410,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -414,8 +420,6 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -423,14 +427,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= @@ -439,9 +442,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -648,7 +650,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -663,7 +665,6 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -681,6 +682,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -715,13 +718,14 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= @@ -797,12 +801,13 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -821,8 +826,6 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -839,20 +842,16 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -943,11 +942,11 @@ github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -989,6 +988,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1001,10 +1002,9 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1094,9 +1094,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1109,6 +1107,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1206,7 +1206,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1217,7 +1216,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1231,7 +1229,6 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1251,12 +1248,16 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1268,7 +1269,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1625,6 +1629,7 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index 0f1c7046c6..849409eb14 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -23,6 +23,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/keys" "github.com/cosmos/cosmos-sdk/client/pruning" "github.com/cosmos/cosmos-sdk/client/rpc" + "github.com/cosmos/cosmos-sdk/client/snapshot" "github.com/cosmos/cosmos-sdk/server" serverconfig "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -170,6 +171,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { debug.Cmd(), config.Cmd(), pruning.PruningCmd(newApp), + snapshot.Cmd(newApp), ) server.AddCommands(rootCmd, simapp.DefaultNodeHome, newApp, appExport, addModuleInitFlags) diff --git a/snapshots/manager.go b/snapshots/manager.go index d3b08e1bc5..d118ab41ae 100644 --- a/snapshots/manager.go +++ b/snapshots/manager.go @@ -417,6 +417,25 @@ func (m *Manager) RestoreChunk(chunk []byte) (bool, error) { return false, nil } +// RestoreLocalSnapshot restores app state from a local snapshot. +func (m *Manager) RestoreLocalSnapshot(height uint64, format uint32) error { + snapshot, ch, err := m.store.Load(height, format) + if err != nil { + return err + } + + m.mtx.Lock() + defer m.mtx.Unlock() + + err = m.beginLocked(opRestore) + if err != nil { + return err + } + defer m.endLocked() + + return m.restoreSnapshot(*snapshot, ch) +} + // sortedExtensionNames sort extension names for deterministic iteration. func (m *Manager) sortedExtensionNames() []string { names := make([]string, 0, len(m.extensions)) diff --git a/snapshots/store.go b/snapshots/store.go index 8e09e140ec..0c5b295a14 100644 --- a/snapshots/store.go +++ b/snapshots/store.go @@ -3,6 +3,7 @@ package snapshots import ( "crypto/sha256" "encoding/binary" + "hash" "io" "math" "os" @@ -164,8 +165,8 @@ func (s *Store) Load(height uint64, format uint32) (*types.Snapshot, <-chan io.R // LoadChunk loads a chunk from disk, or returns nil if it does not exist. The caller must call // Close() on it when done. -func (s *Store) LoadChunk(height uint64, format uint32, chunk uint32) (io.ReadCloser, error) { - path := s.pathChunk(height, format, chunk) +func (s *Store) LoadChunk(height uint64, format, chunk uint32) (io.ReadCloser, error) { + path := s.PathChunk(height, format, chunk) file, err := os.Open(path) if os.IsNotExist(err) { return nil, nil @@ -174,8 +175,8 @@ func (s *Store) LoadChunk(height uint64, format uint32, chunk uint32) (io.ReadCl } // loadChunkFile loads a chunk from disk, and errors if it does not exist. -func (s *Store) loadChunkFile(height uint64, format uint32, chunk uint32) (io.ReadCloser, error) { - path := s.pathChunk(height, format, chunk) +func (s *Store) loadChunkFile(height uint64, format, chunk uint32) (io.ReadCloser, error) { + path := s.PathChunk(height, format, chunk) return os.Open(path) } @@ -265,27 +266,10 @@ func (s *Store) Save( if err != nil { return nil, sdkerrors.Wrapf(err, "failed to create snapshot directory %q", dir) } - path := s.pathChunk(height, format, index) - file, err := os.Create(path) - if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to create snapshot chunk file %q", path) - } - defer file.Close() //nolint:staticcheck - chunkHasher.Reset() - _, err = io.Copy(io.MultiWriter(file, chunkHasher, snapshotHasher), chunkBody) - if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to generate snapshot chunk %v", index) - } - err = file.Close() - if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to close snapshot chunk %v", index) + if err := s.saveChunk(chunkBody, index, snapshot, chunkHasher, snapshotHasher); err != nil { + return nil, err } - err = chunkBody.Close() - if err != nil { - return nil, sdkerrors.Wrapf(err, "failed to close snapshot chunk %v", index) - } - snapshot.Metadata.ChunkHashes = append(snapshot.Metadata.ChunkHashes, chunkHasher.Sum(nil)) index++ } snapshot.Chunks = index @@ -293,6 +277,36 @@ func (s *Store) Save( return snapshot, s.saveSnapshot(snapshot) } +// saveChunk saves the given chunkBody with the given index to its appropriate path on disk. +// The hash of the chunk is appended to the snapshot's metadata, +// and the overall snapshot hash is updated with the chunk content too. +func (s *Store) saveChunk(chunkBody io.ReadCloser, index uint32, snapshot *types.Snapshot, chunkHasher, snapshotHasher hash.Hash) error { + defer chunkBody.Close() + + path := s.PathChunk(snapshot.Height, snapshot.Format, index) + chunkFile, err := os.Create(path) + if err != nil { + return sdkerrors.Wrapf(err, "failed to create snapshot chunk file %q", path) + } + defer chunkFile.Close() + + chunkHasher.Reset() + if _, err := io.Copy(io.MultiWriter(chunkFile, chunkHasher, snapshotHasher), chunkBody); err != nil { + return sdkerrors.Wrapf(err, "failed to generate snapshot chunk %d", index) + } + + if err := chunkFile.Close(); err != nil { + return sdkerrors.Wrapf(err, "failed to close snapshot chunk file %d", index) + } + + if err := chunkBody.Close(); err != nil { + return sdkerrors.Wrapf(err, "failed to close snapshot chunk body %d", index) + } + + snapshot.Metadata.ChunkHashes = append(snapshot.Metadata.ChunkHashes, chunkHasher.Sum(nil)) + return nil +} + // saveSnapshot saves snapshot metadata to the database. func (s *Store) saveSnapshot(snapshot *types.Snapshot) error { value, err := proto.Marshal(snapshot) @@ -313,8 +327,8 @@ func (s *Store) pathSnapshot(height uint64, format uint32) string { return filepath.Join(s.pathHeight(height), strconv.FormatUint(uint64(format), 10)) } -// pathChunk generates a snapshot chunk path. -func (s *Store) pathChunk(height uint64, format uint32, chunk uint32) string { +// PathChunk generates a snapshot chunk path. +func (s *Store) PathChunk(height uint64, format, chunk uint32) string { return filepath.Join(s.pathSnapshot(height, format), strconv.FormatUint(uint64(chunk), 10)) } diff --git a/tests/go.mod b/tests/go.mod index 96c3808e80..f926d69b9b 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -109,7 +109,7 @@ require ( github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.18 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -117,14 +117,14 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.2 // indirect @@ -136,7 +136,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.14.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect @@ -170,7 +170,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // We always want to test against the latest version of the SDK. github.com/cosmos/cosmos-sdk => ../. - // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. + // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 ) diff --git a/tests/go.sum b/tests/go.sum index e5297f9c55..840ef8fd57 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -259,6 +259,10 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -269,10 +273,12 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -399,13 +405,14 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -414,8 +421,6 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -423,23 +428,24 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -540,6 +546,7 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -646,7 +653,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -661,7 +668,6 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -679,6 +685,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -713,13 +721,14 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= @@ -762,17 +771,22 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -795,12 +809,13 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= +github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -819,8 +834,6 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -837,20 +850,16 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -925,14 +934,15 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= +github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= @@ -941,11 +951,11 @@ github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -987,6 +997,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -999,9 +1011,9 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1079,7 +1091,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -1090,8 +1101,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1105,6 +1116,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1190,19 +1203,17 @@ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1213,7 +1224,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1227,7 +1237,6 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1247,12 +1256,16 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1264,7 +1277,10 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1323,6 +1339,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1621,6 +1638,7 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= From e0866fe091a8bdb36dd113ce1eaf517541fe33a7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 16:37:15 +0200 Subject: [PATCH 12/34] fix: allow non-EOA accounts to stake in simulation (backport #16068) (#16130) Co-authored-by: Javier Su Co-authored-by: Julien Robert --- CHANGELOG.md | 3 ++- x/staking/simulation/operations.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7704831e0..864a2f89a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. * (store) [#16067](https://github.com/cosmos/cosmos-sdk/pull/16067) Add local snapshots management commands. -* (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) add comet bootstrap command +* (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) Add Comet bootstrap command. +* (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. ### Bug Fixes diff --git a/x/staking/simulation/operations.go b/x/staking/simulation/operations.go index a675c4c9e6..edea79a6f6 100644 --- a/x/staking/simulation/operations.go +++ b/x/staking/simulation/operations.go @@ -366,9 +366,9 @@ func SimulateMsgUndelegate(ak types.AccountKeeper, bk types.BankKeeper, k *keepe break } } - // if simaccount.PrivKey == nil, delegation address does not exist in accs. Return error + // if simaccount.PrivKey == nil, delegation address does not exist in accs. However, since smart contracts and module accounts can stake, we can ignore the error if simAccount.PrivKey == nil { - return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "account private key is nil"), nil, fmt.Errorf("delegation addr: %s does not exist in simulation accounts", delAddr) + return simtypes.NoOpMsg(types.ModuleName, msg.Type(), "account private key is nil"), nil, nil } account := ak.GetAccount(ctx, delAddr) @@ -543,9 +543,9 @@ func SimulateMsgBeginRedelegate(ak types.AccountKeeper, bk types.BankKeeper, k * } } - // if simaccount.PrivKey == nil, delegation address does not exist in accs. Return error + // if simaccount.PrivKey == nil, delegation address does not exist in accs. However, since smart contracts and module accounts can stake, we can ignore the error if simAccount.PrivKey == nil { - return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgBeginRedelegate, "account private key is nil"), nil, fmt.Errorf("delegation addr: %s does not exist in simulation accounts", delAddr) + return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgBeginRedelegate, "account private key is nil"), nil, nil } account := ak.GetAccount(ctx, delAddr) From 55b3847f111b6287f12d9e379b2c3c71309f7e2a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 13 May 2023 09:20:03 +0000 Subject: [PATCH 13/34] fix: snapshot commands panic if snapshot don't exists (backport #16138) (#16139) Co-authored-by: yihuang Co-authored-by: marbar3778 Co-authored-by: Julien Robert --- client/snapshot/dump.go | 5 +++++ snapshots/manager.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/client/snapshot/dump.go b/client/snapshot/dump.go index 917dca0715..72dadbc572 100644 --- a/client/snapshot/dump.go +++ b/client/snapshot/dump.go @@ -3,6 +3,7 @@ package snapshot import ( "archive/tar" "compress/gzip" + "errors" "fmt" "io" "os" @@ -48,6 +49,10 @@ func DumpArchiveCmd() *cobra.Command { return err } + if snapshot == nil { + return errors.New("snapshot doesn't exist") + } + bz, err := snapshot.Marshal() if err != nil { return err diff --git a/snapshots/manager.go b/snapshots/manager.go index d118ab41ae..22e453346a 100644 --- a/snapshots/manager.go +++ b/snapshots/manager.go @@ -424,6 +424,10 @@ func (m *Manager) RestoreLocalSnapshot(height uint64, format uint32) error { return err } + if snapshot == nil { + return fmt.Errorf("snapshot doesn't exist, height: %d, format: %d", height, format) + } + m.mtx.Lock() defer m.mtx.Unlock() From 83d600596f5df785524dc3299719eca86ec44ec5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 13 May 2023 17:00:18 +0000 Subject: [PATCH 14/34] perf: Remove indentation in REST respones (backport #16142) (#16143) --- CHANGELOG.md | 1 + server/api/server.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 864a2f89a6..3bf9205da6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (store) [#16067](https://github.com/cosmos/cosmos-sdk/pull/16067) Add local snapshots management commands. * (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) Add Comet bootstrap command. * (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. +* (server) [#16142](https://github.com/cosmos/cosmos-sdk/pull/16142) Remove JSON Indentation from the GRPC to REST gateway's responses. (Saving bandwidth) ### Bug Fixes diff --git a/server/api/server.go b/server/api/server.go index 946e49eb09..917554857b 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -57,7 +57,7 @@ func New(clientCtx client.Context, logger log.Logger) *Server { // Using the gogo/gateway package with the gRPC-Gateway WithMarshaler option fixes the scalar field marshalling issue. marshalerOption := &gateway.JSONPb{ EmitDefaults: true, - Indent: " ", + Indent: "", OrigName: true, AnyResolver: clientCtx.InterfaceRegistry, } From 48c7a9238dd4ba2cdae86ef301e55f490ccdc415 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 16:11:13 +0000 Subject: [PATCH 15/34] fix: rename back TxExtensionOptionI (backport #16145) (#16154) --- CHANGELOG.md | 1 + testutil/testdata/codec.go | 2 +- types/tx/ext.go | 4 ++-- types/tx/types.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bf9205da6..87ff6dea99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) Add Comet bootstrap command. * (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. * (server) [#16142](https://github.com/cosmos/cosmos-sdk/pull/16142) Remove JSON Indentation from the GRPC to REST gateway's responses. (Saving bandwidth) +* (types) [#16145](https://github.com/cosmos/cosmos-sdk/pull/16145) Rename interface `ExtensionOptionI` back to `TxExtensionOptionI` to avoid breaking change. ### Bug Fixes diff --git a/testutil/testdata/codec.go b/testutil/testdata/codec.go index eb2424c40f..6e4dcc253b 100644 --- a/testutil/testdata/codec.go +++ b/testutil/testdata/codec.go @@ -33,7 +33,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { &HasHasAnimal{}, ) registry.RegisterImplementations( - (*tx.ExtensionOptionI)(nil), + (*tx.TxExtensionOptionI)(nil), &Cat{}, ) diff --git a/types/tx/ext.go b/types/tx/ext.go index f532513daa..f0cd824d7e 100644 --- a/types/tx/ext.go +++ b/types/tx/ext.go @@ -5,12 +5,12 @@ import ( ) // TxExtensionOptionI defines the interface for tx extension options -type ExtensionOptionI interface{} +type TxExtensionOptionI interface{} //nolint:revive // to avoid breaking change // unpackTxExtensionOptionsI unpacks Any's to TxExtensionOptionI's. func unpackTxExtensionOptionsI(unpacker types.AnyUnpacker, anys []*types.Any) error { for _, any := range anys { - var opt ExtensionOptionI + var opt TxExtensionOptionI err := unpacker.UnpackAny(any, &opt) if err != nil { return err diff --git a/types/tx/types.go b/types/tx/types.go index 089243e5e9..5ab6abc279 100644 --- a/types/tx/types.go +++ b/types/tx/types.go @@ -206,5 +206,5 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { registry.RegisterInterface("cosmos.tx.v1beta1.Tx", (*sdk.Tx)(nil)) registry.RegisterImplementations((*sdk.Tx)(nil), &Tx{}) - registry.RegisterInterface("cosmos.tx.v1beta1.TxExtensionOptionI", (*ExtensionOptionI)(nil)) + registry.RegisterInterface("cosmos.tx.v1beta1.TxExtensionOptionI", (*TxExtensionOptionI)(nil)) } From 329d7d8ca8ed805cb8cd936c6fd87c257fda8c7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 21:12:20 +0000 Subject: [PATCH 16/34] build(deps): Bump cosmossdk.io/math from 1.0.0 to 1.0.1 (#16167) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- core/go.mod | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- simapp/go.mod | 4 ++-- simapp/go.sum | 8 ++++---- tests/go.mod | 4 ++-- tests/go.sum | 8 ++++---- tools/cosmovisor/go.mod | 4 ++-- tools/cosmovisor/go.sum | 8 ++++---- tools/rosetta/go.mod | 4 ++-- tools/rosetta/go.sum | 8 ++++---- tx/go.mod | 4 ++-- tx/go.sum | 8 ++++---- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/core/go.mod b/core/go.mod index 6fc17029e8..5b670a20d7 100644 --- a/core/go.mod +++ b/core/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/depinject v1.0.0-alpha.3 - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/stretchr/testify v1.8.1 google.golang.org/grpc v1.55.0 diff --git a/go.mod b/go.mod index bb477f2f66..3fd531b8d4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( cosmossdk.io/depinject v1.0.0-alpha.3 cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/log v1.1.0 - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 cosmossdk.io/tools/rosetta v0.2.1 github.com/99designs/keyring v1.2.1 github.com/armon/go-metrics v0.4.1 @@ -56,7 +56,7 @@ require ( github.com/tendermint/go-amino v0.16.0 github.com/tidwall/btree v1.6.0 golang.org/x/crypto v0.7.0 - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 diff --git a/go.sum b/go.sum index d9d2920551..ff5d5848d8 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -1025,8 +1025,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/simapp/go.mod b/simapp/go.mod index 962dd14fb5..c6b2607840 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/api v0.3.1 cosmossdk.io/core v0.5.1 cosmossdk.io/depinject v1.0.0-alpha.3 - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 cosmossdk.io/tools/rosetta v0.2.1 github.com/cometbft/cometbft v0.37.1 github.com/cometbft/cometbft-db v0.7.0 @@ -143,7 +143,7 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.7.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index cc287a51a8..896f6661b0 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -198,8 +198,8 @@ cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -1018,8 +1018,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/tests/go.mod b/tests/go.mod index f926d69b9b..dfc4f7a777 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/depinject v1.0.0-alpha.3 - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 cosmossdk.io/simapp v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v0.37.1 github.com/cometbft/cometbft-db v0.7.0 @@ -146,7 +146,7 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.7.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index 840ef8fd57..23b319b881 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -198,8 +198,8 @@ cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -1027,8 +1027,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 7d4af1199f..cb0102a8df 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -21,7 +21,7 @@ require ( cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect - cosmossdk.io/math v1.0.0 // indirect + cosmossdk.io/math v1.0.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect @@ -122,7 +122,7 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.7.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 345ca72557..3fae471820 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= @@ -779,8 +779,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 65877d52fe..95dec28e33 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -3,7 +3,7 @@ module cosmossdk.io/tools/rosetta go 1.19 require ( - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/coinbase/rosetta-sdk-go/types v1.0.0 github.com/cometbft/cometbft v0.37.1 @@ -102,7 +102,7 @@ require ( github.com/zondax/ledger-go v0.14.0 // indirect go.etcd.io/bbolt v1.3.7 // indirect golang.org/x/crypto v0.7.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/term v0.7.0 // indirect diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index a226c39ad8..7deba08476 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -43,8 +43,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -530,8 +530,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/tx/go.mod b/tx/go.mod index e236652612..f9f4df87f8 100644 --- a/tx/go.mod +++ b/tx/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/core v0.3.2 - cosmossdk.io/math v1.0.0 + cosmossdk.io/math v1.0.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/stretchr/testify v1.8.2 google.golang.org/protobuf v1.30.0 @@ -17,7 +17,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect diff --git a/tx/go.sum b/tx/go.sum index 0f641310ed..760e4a3bcc 100644 --- a/tx/go.sum +++ b/tx/go.sum @@ -1,7 +1,7 @@ cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= @@ -27,8 +27,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= From 273386fda4d5b171c6514d242031b86ed13d8af6 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 19 May 2023 09:56:58 +0000 Subject: [PATCH 17/34] feat: add Close method for resource cleanup in graceful shutdown (backport #16193) (#16204) Co-authored-by: yihuang Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + baseapp/baseapp.go | 5 +++++ server/start.go | 6 ++++++ server/types/app.go | 3 +++ 4 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ff6dea99..ed426c69a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. * (server) [#16142](https://github.com/cosmos/cosmos-sdk/pull/16142) Remove JSON Indentation from the GRPC to REST gateway's responses. (Saving bandwidth) * (types) [#16145](https://github.com/cosmos/cosmos-sdk/pull/16145) Rename interface `ExtensionOptionI` back to `TxExtensionOptionI` to avoid breaking change. +* (baseapp) [#16193](https://github.com/cosmos/cosmos-sdk/pull/16193) Add `Close` method to `BaseApp` for custom app to cleanup resource in graceful shutdown. ### Bug Fixes diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 9e96868ccd..69a2de0e60 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -1026,3 +1026,8 @@ func NoOpProcessProposal() sdk.ProcessProposalHandler { return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT} } } + +// Close is called in start cmd to gracefully cleanup resources. +func (app *BaseApp) Close() error { + return nil +} diff --git a/server/start.go b/server/start.go index a9bd32f68f..061b736cf6 100644 --- a/server/start.go +++ b/server/start.go @@ -252,6 +252,11 @@ func startStandAlone(ctx *Context, appCreator types.AppCreator) error { fmt.Println(err.Error()) os.Exit(1) } + + if err = app.Close(); err != nil { + fmt.Println(err.Error()) + os.Exit(1) + } }() // Wait for SIGINT or SIGTERM signal @@ -500,6 +505,7 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App defer func() { if tmNode != nil && tmNode.IsRunning() { _ = tmNode.Stop() + _ = app.Close() } if traceWriterCleanup != nil { diff --git a/server/types/app.go b/server/types/app.go index bbcc6aae72..727f767fc3 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -63,6 +63,9 @@ type ( // Return the snapshot manager SnapshotManager() *snapshots.Manager + + // Close is called in start cmd to gracefully cleanup resources. + Close() error } // AppCreator is a function that allows us to lazily initialize an From d45f360e16c347195354335dc59003bce01742c9 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 21:34:56 +0200 Subject: [PATCH 18/34] feat: save restored snapshot locally (backport #16060) (#16261) Co-authored-by: yihuang Co-authored-by: marbar3778 Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + snapshots/manager.go | 83 +++++++++++++++++++++++++++++---------- snapshots/manager_test.go | 7 ++++ snapshots/store.go | 6 +++ 4 files changed, 77 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed426c69a3..ba5eb0c750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. * (store) [#16067](https://github.com/cosmos/cosmos-sdk/pull/16067) Add local snapshots management commands. * (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) Add Comet bootstrap command. +* (snapshots) [#16060](https://github.com/cosmos/cosmos-sdk/pull/16060) Support saving restoring snapshot locally. * (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. * (server) [#16142](https://github.com/cosmos/cosmos-sdk/pull/16142) Remove JSON Indentation from the GRPC to REST gateway's responses. (Saving bandwidth) * (types) [#16145](https://github.com/cosmos/cosmos-sdk/pull/16145) Rename interface `ExtensionOptionI` back to `TxExtensionOptionI` to avoid breaking change. diff --git a/snapshots/manager.go b/snapshots/manager.go index 22e453346a..ca57eab914 100644 --- a/snapshots/manager.go +++ b/snapshots/manager.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "math" + "os" "sort" "sync" @@ -38,12 +39,12 @@ type Manager struct { multistore types.Snapshotter logger log.Logger - mtx sync.Mutex - operation operation - chRestore chan<- io.ReadCloser - chRestoreDone <-chan restoreDone - restoreChunkHashes [][]byte - restoreChunkIndex uint32 + mtx sync.Mutex + operation operation + chRestore chan<- uint32 + chRestoreDone <-chan restoreDone + restoreSnapshot *types.Snapshot + restoreChunkIndex uint32 } // operation represents a Manager operation. Only one operation can be in progress at a time. @@ -61,7 +62,8 @@ const ( opPrune operation = "prune" opRestore operation = "restore" - chunkBufferSize = 4 + chunkBufferSize = 4 + chunkIDBufferSize = 1024 snapshotMaxItemSize = int(64e6) // SDK has no key/value size limit, so we set an arbitrary limit ) @@ -134,7 +136,7 @@ func (m *Manager) endLocked() { m.chRestore = nil } m.chRestoreDone = nil - m.restoreChunkHashes = nil + m.restoreSnapshot = nil m.restoreChunkIndex = 0 } @@ -290,11 +292,18 @@ func (m *Manager) Restore(snapshot types.Snapshot) error { } // Start an asynchronous snapshot restoration, passing chunks and completion status via channels. - chChunks := make(chan io.ReadCloser, chunkBufferSize) + chChunkIDs := make(chan uint32, chunkIDBufferSize) chDone := make(chan restoreDone, 1) + dir := m.store.pathSnapshot(snapshot.Height, snapshot.Format) + if err := os.MkdirAll(dir, 0o750); err != nil { + return sdkerrors.Wrapf(err, "failed to create snapshot directory %q", dir) + } + + chChunks := m.loadChunkStream(snapshot.Height, snapshot.Format, chChunkIDs) + go func() { - err := m.restoreSnapshot(snapshot, chChunks) + err := m.doRestoreSnapshot(snapshot, chChunks) chDone <- restoreDone{ complete: err == nil, err: err, @@ -302,17 +311,39 @@ func (m *Manager) Restore(snapshot types.Snapshot) error { close(chDone) }() - m.chRestore = chChunks + m.chRestore = chChunkIDs m.chRestoreDone = chDone - m.restoreChunkHashes = snapshot.Metadata.ChunkHashes + m.restoreSnapshot = &snapshot m.restoreChunkIndex = 0 return nil } -// restoreSnapshot do the heavy work of snapshot restoration after preliminary checks on request have passed. -func (m *Manager) restoreSnapshot(snapshot types.Snapshot, chChunks <-chan io.ReadCloser) error { - var nextItem types.SnapshotItem +func (m *Manager) loadChunkStream(height uint64, format uint32, chunkIDs <-chan uint32) <-chan io.ReadCloser { + chunks := make(chan io.ReadCloser, chunkBufferSize) + go func() { + defer close(chunks) + + for chunkID := range chunkIDs { + chunk, err := m.store.loadChunkFile(height, format, chunkID) + if err != nil { + m.logger.Error("load chunk file failed", "height", height, "format", format, "chunk", chunkID, "err", err) + break + } + chunks <- chunk + } + }() + + return chunks +} +// doRestoreSnapshot do the heavy work of snapshot restoration after preliminary checks on request have passed. +func (m *Manager) doRestoreSnapshot(snapshot types.Snapshot, chChunks <-chan io.ReadCloser) error { + dir := m.store.pathSnapshot(snapshot.Height, snapshot.Format) + if err := os.MkdirAll(dir, 0o750); err != nil { + return sdkerrors.Wrapf(err, "failed to create snapshot directory %q", dir) + } + + var nextItem types.SnapshotItem streamReader, err := NewStreamReader(chChunks) if err != nil { return err @@ -374,7 +405,7 @@ func (m *Manager) RestoreChunk(chunk []byte) (bool, error) { return false, sdkerrors.Wrap(sdkerrors.ErrLogic, "no restore operation in progress") } - if int(m.restoreChunkIndex) >= len(m.restoreChunkHashes) { + if int(m.restoreChunkIndex) >= len(m.restoreSnapshot.Metadata.ChunkHashes) { return false, sdkerrors.Wrap(sdkerrors.ErrLogic, "received unexpected chunk") } @@ -391,19 +422,30 @@ func (m *Manager) RestoreChunk(chunk []byte) (bool, error) { // Verify the chunk hash. hash := sha256.Sum256(chunk) - expected := m.restoreChunkHashes[m.restoreChunkIndex] + expected := m.restoreSnapshot.Metadata.ChunkHashes[m.restoreChunkIndex] if !bytes.Equal(hash[:], expected) { return false, sdkerrors.Wrapf(types.ErrChunkHashMismatch, "expected %x, got %x", hash, expected) } + if err := m.store.saveChunkContent(chunk, m.restoreChunkIndex, m.restoreSnapshot); err != nil { + return false, sdkerrors.Wrapf(err, "save chunk content %d", m.restoreChunkIndex) + } + // Pass the chunk to the restore, and wait for completion if it was the final one. - m.chRestore <- io.NopCloser(bytes.NewReader(chunk)) + m.chRestore <- m.restoreChunkIndex m.restoreChunkIndex++ - if int(m.restoreChunkIndex) >= len(m.restoreChunkHashes) { + if int(m.restoreChunkIndex) >= len(m.restoreSnapshot.Metadata.ChunkHashes) { close(m.chRestore) m.chRestore = nil + + // the chunks are all written into files, we can save the snapshot to the db, + // even if the restoration may not completed yet. + if err := m.store.saveSnapshot(m.restoreSnapshot); err != nil { + return false, sdkerrors.Wrap(err, "save restoring snapshot") + } + done := <-m.chRestoreDone m.endLocked() if done.err != nil { @@ -412,6 +454,7 @@ func (m *Manager) RestoreChunk(chunk []byte) (bool, error) { if !done.complete { return false, sdkerrors.Wrap(sdkerrors.ErrLogic, "restore ended prematurely") } + return true, nil } return false, nil @@ -437,7 +480,7 @@ func (m *Manager) RestoreLocalSnapshot(height uint64, format uint32) error { } defer m.endLocked() - return m.restoreSnapshot(*snapshot, ch) + return m.doRestoreSnapshot(*snapshot, ch) } // sortedExtensionNames sort extension names for deterministic iteration. diff --git a/snapshots/manager_test.go b/snapshots/manager_test.go index a5343f759f..9b60691508 100644 --- a/snapshots/manager_test.go +++ b/snapshots/manager_test.go @@ -213,6 +213,13 @@ func TestManager_Restore(t *testing.T) { assert.Equal(t, expectItems, target.items) assert.Equal(t, 10, len(extSnapshotter.state)) + // The snapshot is saved in local snapshot store + snapshots, err := store.List() + require.NoError(t, err) + snapshot := snapshots[0] + require.Equal(t, uint64(3), snapshot.Height) + require.Equal(t, types.CurrentFormat, snapshot.Format) + // Starting a new restore should fail now, because the target already has contents. err = manager.Restore(types.Snapshot{ Height: 3, diff --git a/snapshots/store.go b/snapshots/store.go index 0c5b295a14..1087c826fa 100644 --- a/snapshots/store.go +++ b/snapshots/store.go @@ -307,6 +307,12 @@ func (s *Store) saveChunk(chunkBody io.ReadCloser, index uint32, snapshot *types return nil } +// saveChunkContent save the chunk to disk +func (s *Store) saveChunkContent(chunk []byte, index uint32, snapshot *types.Snapshot) error { + path := s.PathChunk(snapshot.Height, snapshot.Format, index) + return os.WriteFile(path, chunk, 0o600) +} + // saveSnapshot saves snapshot metadata to the database. func (s *Store) saveSnapshot(snapshot *types.Snapshot) error { value, err := proto.Marshal(snapshot) From 10b3db2318f0df1521d00913bfad82c9c0e6d784 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 14:19:37 +0200 Subject: [PATCH 19/34] chore: make params module optional in app wiring (backport #16269) (#16271) Co-authored-by: Julien Robert --- x/crisis/module.go | 2 +- x/distribution/module.go | 2 +- x/gov/module.go | 2 +- x/mint/module.go | 2 +- x/slashing/module.go | 2 +- x/staking/module.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x/crisis/module.go b/x/crisis/module.go index 25d169f8c3..96cf10d5ba 100644 --- a/x/crisis/module.go +++ b/x/crisis/module.go @@ -202,7 +202,7 @@ type CrisisInputs struct { BankKeeper types.SupplyKeeper // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace exported.Subspace + LegacySubspace exported.Subspace `optional:"true"` } type CrisisOutputs struct { diff --git a/x/distribution/module.go b/x/distribution/module.go index 034b8d3196..eb85e4d458 100644 --- a/x/distribution/module.go +++ b/x/distribution/module.go @@ -223,7 +223,7 @@ type DistrInputs struct { StakingKeeper types.StakingKeeper // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace exported.Subspace + LegacySubspace exported.Subspace `optional:"true"` } type DistrOutputs struct { diff --git a/x/gov/module.go b/x/gov/module.go index e12897743c..1755638ed6 100644 --- a/x/gov/module.go +++ b/x/gov/module.go @@ -176,7 +176,7 @@ type GovInputs struct { StakingKeeper govtypes.StakingKeeper // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace govtypes.ParamSubspace + LegacySubspace govtypes.ParamSubspace `optional:"true"` } type GovOutputs struct { diff --git a/x/mint/module.go b/x/mint/module.go index 0b8fd81d10..03293e9282 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -225,7 +225,7 @@ type MintInputs struct { InflationCalculationFn types.InflationCalculationFn `optional:"true"` // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace exported.Subspace + LegacySubspace exported.Subspace `optional:"true"` AccountKeeper types.AccountKeeper BankKeeper types.BankKeeper diff --git a/x/slashing/module.go b/x/slashing/module.go index f3d01e7bbf..90e1d7f5b6 100644 --- a/x/slashing/module.go +++ b/x/slashing/module.go @@ -223,7 +223,7 @@ type SlashingInputs struct { StakingKeeper types.StakingKeeper // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace exported.Subspace + LegacySubspace exported.Subspace `optional:"true"` } type SlashingOutputs struct { diff --git a/x/staking/module.go b/x/staking/module.go index 76314eab72..4f8294aa4f 100644 --- a/x/staking/module.go +++ b/x/staking/module.go @@ -210,7 +210,7 @@ type StakingInputs struct { Key *store.KVStoreKey // LegacySubspace is used solely for migration of x/params managed parameters - LegacySubspace exported.Subspace + LegacySubspace exported.Subspace `optional:"true"` } // Dependency Injection Outputs From d64fccb503a4bf5046e995a60eae32e2e1653e2b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 26 May 2023 13:56:32 +0200 Subject: [PATCH 20/34] feat(group): add group event tally result (backport #16191) (#16305) Co-authored-by: Jeancarlo Barrios Co-authored-by: Julien Robert --- CHANGELOG.md | 4 + api/cosmos/group/v1/events.pulsar.go | 656 ++++++++++++++++++++++++++- api/cosmos/group/v1/types.pulsar.go | 4 + proto/cosmos/group/v1/events.proto | 13 + proto/cosmos/group/v1/query.proto | 6 +- proto/cosmos/group/v1/types.proto | 4 + x/group/README.md | 10 + x/group/events.pb.go | 307 ++++++++++++- x/group/keeper/genesis.go | 2 +- x/group/keeper/keeper.go | 17 + x/group/keeper/keeper_test.go | 68 ++- x/group/keeper/msg_server.go | 11 + x/group/types.pb.go | 4 + 13 files changed, 1055 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5eb0c750..4e659bf813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Features + +* (x/group) [#16191](https://github.com/cosmos/cosmos-sdk/pull/16191) Add EventProposalPruned event to group module whenever a proposal is pruned. + ### Improvements * (deps) [#16083](https://github.com/cosmos/cosmos-sdk/pull/16083) Bumps `proto-builder` image to 0.13.0. diff --git a/api/cosmos/group/v1/events.pulsar.go b/api/cosmos/group/v1/events.pulsar.go index 5352013f75..deebbe1817 100644 --- a/api/cosmos/group/v1/events.pulsar.go +++ b/api/cosmos/group/v1/events.pulsar.go @@ -3857,6 +3857,537 @@ func (x *fastReflection_EventLeaveGroup) ProtoMethods() *protoiface.Methods { } } +var ( + md_EventProposalPruned protoreflect.MessageDescriptor + fd_EventProposalPruned_proposal_id protoreflect.FieldDescriptor + fd_EventProposalPruned_status protoreflect.FieldDescriptor + fd_EventProposalPruned_tally_result protoreflect.FieldDescriptor +) + +func init() { + file_cosmos_group_v1_events_proto_init() + md_EventProposalPruned = File_cosmos_group_v1_events_proto.Messages().ByName("EventProposalPruned") + fd_EventProposalPruned_proposal_id = md_EventProposalPruned.Fields().ByName("proposal_id") + fd_EventProposalPruned_status = md_EventProposalPruned.Fields().ByName("status") + fd_EventProposalPruned_tally_result = md_EventProposalPruned.Fields().ByName("tally_result") +} + +var _ protoreflect.Message = (*fastReflection_EventProposalPruned)(nil) + +type fastReflection_EventProposalPruned EventProposalPruned + +func (x *EventProposalPruned) ProtoReflect() protoreflect.Message { + return (*fastReflection_EventProposalPruned)(x) +} + +func (x *EventProposalPruned) slowProtoReflect() protoreflect.Message { + mi := &file_cosmos_group_v1_events_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +var _fastReflection_EventProposalPruned_messageType fastReflection_EventProposalPruned_messageType +var _ protoreflect.MessageType = fastReflection_EventProposalPruned_messageType{} + +type fastReflection_EventProposalPruned_messageType struct{} + +func (x fastReflection_EventProposalPruned_messageType) Zero() protoreflect.Message { + return (*fastReflection_EventProposalPruned)(nil) +} +func (x fastReflection_EventProposalPruned_messageType) New() protoreflect.Message { + return new(fastReflection_EventProposalPruned) +} +func (x fastReflection_EventProposalPruned_messageType) Descriptor() protoreflect.MessageDescriptor { + return md_EventProposalPruned +} + +// Descriptor returns message descriptor, which contains only the protobuf +// type information for the message. +func (x *fastReflection_EventProposalPruned) Descriptor() protoreflect.MessageDescriptor { + return md_EventProposalPruned +} + +// Type returns the message type, which encapsulates both Go and protobuf +// type information. If the Go type information is not needed, +// it is recommended that the message descriptor be used instead. +func (x *fastReflection_EventProposalPruned) Type() protoreflect.MessageType { + return _fastReflection_EventProposalPruned_messageType +} + +// New returns a newly allocated and mutable empty message. +func (x *fastReflection_EventProposalPruned) New() protoreflect.Message { + return new(fastReflection_EventProposalPruned) +} + +// Interface unwraps the message reflection interface and +// returns the underlying ProtoMessage interface. +func (x *fastReflection_EventProposalPruned) Interface() protoreflect.ProtoMessage { + return (*EventProposalPruned)(x) +} + +// Range iterates over every populated field in an undefined order, +// calling f for each field descriptor and value encountered. +// Range returns immediately if f returns false. +// While iterating, mutating operations may only be performed +// on the current field descriptor. +func (x *fastReflection_EventProposalPruned) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { + if x.ProposalId != uint64(0) { + value := protoreflect.ValueOfUint64(x.ProposalId) + if !f(fd_EventProposalPruned_proposal_id, value) { + return + } + } + if x.Status != 0 { + value := protoreflect.ValueOfEnum((protoreflect.EnumNumber)(x.Status)) + if !f(fd_EventProposalPruned_status, value) { + return + } + } + if x.TallyResult != nil { + value := protoreflect.ValueOfMessage(x.TallyResult.ProtoReflect()) + if !f(fd_EventProposalPruned_tally_result, value) { + return + } + } +} + +// Has reports whether a field is populated. +// +// Some fields have the property of nullability where it is possible to +// distinguish between the default value of a field and whether the field +// was explicitly populated with the default value. Singular message fields, +// member fields of a oneof, and proto2 scalar fields are nullable. Such +// fields are populated only if explicitly set. +// +// In other cases (aside from the nullable cases above), +// a proto3 scalar field is populated if it contains a non-zero value, and +// a repeated field is populated if it is non-empty. +func (x *fastReflection_EventProposalPruned) Has(fd protoreflect.FieldDescriptor) bool { + switch fd.FullName() { + case "cosmos.group.v1.EventProposalPruned.proposal_id": + return x.ProposalId != uint64(0) + case "cosmos.group.v1.EventProposalPruned.status": + return x.Status != 0 + case "cosmos.group.v1.EventProposalPruned.tally_result": + return x.TallyResult != nil + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", fd.FullName())) + } +} + +// Clear clears the field such that a subsequent Has call reports false. +// +// Clearing an extension field clears both the extension type and value +// associated with the given field number. +// +// Clear is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_EventProposalPruned) Clear(fd protoreflect.FieldDescriptor) { + switch fd.FullName() { + case "cosmos.group.v1.EventProposalPruned.proposal_id": + x.ProposalId = uint64(0) + case "cosmos.group.v1.EventProposalPruned.status": + x.Status = 0 + case "cosmos.group.v1.EventProposalPruned.tally_result": + x.TallyResult = nil + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", fd.FullName())) + } +} + +// Get retrieves the value for a field. +// +// For unpopulated scalars, it returns the default value, where +// the default value of a bytes scalar is guaranteed to be a copy. +// For unpopulated composite types, it returns an empty, read-only view +// of the value; to obtain a mutable reference, use Mutable. +func (x *fastReflection_EventProposalPruned) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { + switch descriptor.FullName() { + case "cosmos.group.v1.EventProposalPruned.proposal_id": + value := x.ProposalId + return protoreflect.ValueOfUint64(value) + case "cosmos.group.v1.EventProposalPruned.status": + value := x.Status + return protoreflect.ValueOfEnum((protoreflect.EnumNumber)(value)) + case "cosmos.group.v1.EventProposalPruned.tally_result": + value := x.TallyResult + return protoreflect.ValueOfMessage(value.ProtoReflect()) + default: + if descriptor.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", descriptor.FullName())) + } +} + +// Set stores the value for a field. +// +// For a field belonging to a oneof, it implicitly clears any other field +// that may be currently set within the same oneof. +// For extension fields, it implicitly stores the provided ExtensionType. +// When setting a composite type, it is unspecified whether the stored value +// aliases the source's memory in any way. If the composite value is an +// empty, read-only value, then it panics. +// +// Set is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_EventProposalPruned) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { + switch fd.FullName() { + case "cosmos.group.v1.EventProposalPruned.proposal_id": + x.ProposalId = value.Uint() + case "cosmos.group.v1.EventProposalPruned.status": + x.Status = (ProposalStatus)(value.Enum()) + case "cosmos.group.v1.EventProposalPruned.tally_result": + x.TallyResult = value.Message().Interface().(*TallyResult) + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", fd.FullName())) + } +} + +// Mutable returns a mutable reference to a composite type. +// +// If the field is unpopulated, it may allocate a composite value. +// For a field belonging to a oneof, it implicitly clears any other field +// that may be currently set within the same oneof. +// For extension fields, it implicitly stores the provided ExtensionType +// if not already stored. +// It panics if the field does not contain a composite type. +// +// Mutable is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_EventProposalPruned) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { + switch fd.FullName() { + case "cosmos.group.v1.EventProposalPruned.tally_result": + if x.TallyResult == nil { + x.TallyResult = new(TallyResult) + } + return protoreflect.ValueOfMessage(x.TallyResult.ProtoReflect()) + case "cosmos.group.v1.EventProposalPruned.proposal_id": + panic(fmt.Errorf("field proposal_id of message cosmos.group.v1.EventProposalPruned is not mutable")) + case "cosmos.group.v1.EventProposalPruned.status": + panic(fmt.Errorf("field status of message cosmos.group.v1.EventProposalPruned is not mutable")) + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", fd.FullName())) + } +} + +// NewField returns a new value that is assignable to the field +// for the given descriptor. For scalars, this returns the default value. +// For lists, maps, and messages, this returns a new, empty, mutable value. +func (x *fastReflection_EventProposalPruned) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { + switch fd.FullName() { + case "cosmos.group.v1.EventProposalPruned.proposal_id": + return protoreflect.ValueOfUint64(uint64(0)) + case "cosmos.group.v1.EventProposalPruned.status": + return protoreflect.ValueOfEnum(0) + case "cosmos.group.v1.EventProposalPruned.tally_result": + m := new(TallyResult) + return protoreflect.ValueOfMessage(m.ProtoReflect()) + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.group.v1.EventProposalPruned")) + } + panic(fmt.Errorf("message cosmos.group.v1.EventProposalPruned does not contain field %s", fd.FullName())) + } +} + +// WhichOneof reports which field within the oneof is populated, +// returning nil if none are populated. +// It panics if the oneof descriptor does not belong to this message. +func (x *fastReflection_EventProposalPruned) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { + switch d.FullName() { + default: + panic(fmt.Errorf("%s is not a oneof field in cosmos.group.v1.EventProposalPruned", d.FullName())) + } + panic("unreachable") +} + +// GetUnknown retrieves the entire list of unknown fields. +// The caller may only mutate the contents of the RawFields +// if the mutated bytes are stored back into the message with SetUnknown. +func (x *fastReflection_EventProposalPruned) GetUnknown() protoreflect.RawFields { + return x.unknownFields +} + +// SetUnknown stores an entire list of unknown fields. +// The raw fields must be syntactically valid according to the wire format. +// An implementation may panic if this is not the case. +// Once stored, the caller must not mutate the content of the RawFields. +// An empty RawFields may be passed to clear the fields. +// +// SetUnknown is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_EventProposalPruned) SetUnknown(fields protoreflect.RawFields) { + x.unknownFields = fields +} + +// IsValid reports whether the message is valid. +// +// An invalid message is an empty, read-only value. +// +// An invalid message often corresponds to a nil pointer of the concrete +// message type, but the details are implementation dependent. +// Validity is not part of the protobuf data model, and may not +// be preserved in marshaling or other operations. +func (x *fastReflection_EventProposalPruned) IsValid() bool { + return x != nil +} + +// ProtoMethods returns optional fastReflectionFeature-path implementations of various operations. +// This method may return nil. +// +// The returned methods type is identical to +// "google.golang.org/protobuf/runtime/protoiface".Methods. +// Consult the protoiface package documentation for details. +func (x *fastReflection_EventProposalPruned) ProtoMethods() *protoiface.Methods { + size := func(input protoiface.SizeInput) protoiface.SizeOutput { + x := input.Message.Interface().(*EventProposalPruned) + if x == nil { + return protoiface.SizeOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Size: 0, + } + } + options := runtime.SizeInputToOptions(input) + _ = options + var n int + var l int + _ = l + if x.ProposalId != 0 { + n += 1 + runtime.Sov(uint64(x.ProposalId)) + } + if x.Status != 0 { + n += 1 + runtime.Sov(uint64(x.Status)) + } + if x.TallyResult != nil { + l = options.Size(x.TallyResult) + n += 1 + l + runtime.Sov(uint64(l)) + } + if x.unknownFields != nil { + n += len(x.unknownFields) + } + return protoiface.SizeOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Size: n, + } + } + + marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) { + x := input.Message.Interface().(*EventProposalPruned) + if x == nil { + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, nil + } + options := runtime.MarshalInputToOptions(input) + _ = options + size := options.Size(x) + dAtA := make([]byte, size) + i := len(dAtA) + _ = i + var l int + _ = l + if x.unknownFields != nil { + i -= len(x.unknownFields) + copy(dAtA[i:], x.unknownFields) + } + if x.TallyResult != nil { + encoded, err := options.Marshal(x.TallyResult) + if err != nil { + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, err + } + i -= len(encoded) + copy(dAtA[i:], encoded) + i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) + i-- + dAtA[i] = 0x1a + } + if x.Status != 0 { + i = runtime.EncodeVarint(dAtA, i, uint64(x.Status)) + i-- + dAtA[i] = 0x10 + } + if x.ProposalId != 0 { + i = runtime.EncodeVarint(dAtA, i, uint64(x.ProposalId)) + i-- + dAtA[i] = 0x8 + } + if input.Buf != nil { + input.Buf = append(input.Buf, dAtA...) + } else { + input.Buf = dAtA + } + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, nil + } + unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) { + x := input.Message.Interface().(*EventProposalPruned) + if x == nil { + return protoiface.UnmarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Flags: input.Flags, + }, nil + } + options := runtime.UnmarshalInputToOptions(input) + _ = options + dAtA := input.Buf + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, 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 protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: EventProposalPruned: wiretype end group for non-group") + } + if fieldNum <= 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: EventProposalPruned: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType) + } + x.ProposalId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + x.ProposalId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + x.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + x.Status |= ProposalStatus(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field TallyResult", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + if x.TallyResult == nil { + x.TallyResult = &TallyResult{} + } + if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.TallyResult); err != nil { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := runtime.Skip(dAtA[iNdEx:]) + if err != nil { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if (iNdEx + skippy) > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + if !options.DiscardUnknown { + x.unknownFields = append(x.unknownFields, dAtA[iNdEx:iNdEx+skippy]...) + } + iNdEx += skippy + } + } + + if iNdEx > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, nil + } + return &protoiface.Methods{ + NoUnkeyedLiterals: struct{}{}, + Flags: protoiface.SupportMarshalDeterministic | protoiface.SupportUnmarshalDiscardUnknown, + Size: size, + Marshal: marshal, + Unmarshal: unmarshal, + Merge: nil, + CheckInitialized: nil, + } +} + // Since: cosmos-sdk 0.46 // Code generated by protoc-gen-go. DO NOT EDIT. @@ -4232,6 +4763,61 @@ func (x *EventLeaveGroup) GetAddress() string { return "" } +// EventProposalPruned is an event emitted when a proposal is pruned. +type EventProposalPruned struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // proposal_id is the unique ID of the proposal. + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` + // status is the proposal status (UNSPECIFIED, SUBMITTED, ACCEPTED, REJECTED, ABORTED, WITHDRAWN). + Status ProposalStatus `protobuf:"varint,2,opt,name=status,proto3,enum=cosmos.group.v1.ProposalStatus" json:"status,omitempty"` + // tally_result is the proposal tally result (when applicable). + TallyResult *TallyResult `protobuf:"bytes,3,opt,name=tally_result,json=tallyResult,proto3" json:"tally_result,omitempty"` +} + +func (x *EventProposalPruned) Reset() { + *x = EventProposalPruned{} + if protoimpl.UnsafeEnabled { + mi := &file_cosmos_group_v1_events_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *EventProposalPruned) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EventProposalPruned) ProtoMessage() {} + +// Deprecated: Use EventProposalPruned.ProtoReflect.Descriptor instead. +func (*EventProposalPruned) Descriptor() ([]byte, []int) { + return file_cosmos_group_v1_events_proto_rawDescGZIP(), []int{9} +} + +func (x *EventProposalPruned) GetProposalId() uint64 { + if x != nil { + return x.ProposalId + } + return 0 +} + +func (x *EventProposalPruned) GetStatus() ProposalStatus { + if x != nil { + return x.Status + } + return ProposalStatus_PROPOSAL_STATUS_UNSPECIFIED +} + +func (x *EventProposalPruned) GetTallyResult() *TallyResult { + if x != nil { + return x.TallyResult + } + return nil +} + var File_cosmos_group_v1_events_proto protoreflect.FileDescriptor var file_cosmos_group_v1_events_proto_rawDesc = []byte{ @@ -4281,18 +4867,29 @@ var file_cosmos_group_v1_events_proto_rawDesc = []byte{ 0x70, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x07, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x42, 0xaa, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x76, 0x31, 0x42, - 0x0b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x28, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, - 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2f, 0x76, 0x31, - 0x3b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x47, 0x58, 0xaa, 0x02, - 0x0f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x0f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0xea, 0x02, 0x11, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x13, 0x45, 0x76, 0x65, 0x6e, + 0x74, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x50, 0x72, 0x75, 0x6e, 0x65, 0x64, 0x12, + 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x49, 0x64, + 0x12, 0x37, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, + 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3f, 0x0a, 0x0c, 0x74, 0x61, 0x6c, + 0x6c, 0x79, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x76, + 0x31, 0x2e, 0x54, 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x0b, 0x74, + 0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x42, 0xaa, 0x01, 0x0a, 0x13, 0x63, + 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, + 0x76, 0x31, 0x42, 0x0b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x28, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x2f, 0x76, 0x31, 0x3b, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x47, + 0x58, 0xaa, 0x02, 0x0f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, 0x72, 0x6f, + 0x75, 0x70, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, + 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -4307,7 +4904,7 @@ func file_cosmos_group_v1_events_proto_rawDescGZIP() []byte { return file_cosmos_group_v1_events_proto_rawDescData } -var file_cosmos_group_v1_events_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_cosmos_group_v1_events_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_cosmos_group_v1_events_proto_goTypes = []interface{}{ (*EventCreateGroup)(nil), // 0: cosmos.group.v1.EventCreateGroup (*EventUpdateGroup)(nil), // 1: cosmos.group.v1.EventUpdateGroup @@ -4318,15 +4915,20 @@ var file_cosmos_group_v1_events_proto_goTypes = []interface{}{ (*EventVote)(nil), // 6: cosmos.group.v1.EventVote (*EventExec)(nil), // 7: cosmos.group.v1.EventExec (*EventLeaveGroup)(nil), // 8: cosmos.group.v1.EventLeaveGroup - (ProposalExecutorResult)(0), // 9: cosmos.group.v1.ProposalExecutorResult + (*EventProposalPruned)(nil), // 9: cosmos.group.v1.EventProposalPruned + (ProposalExecutorResult)(0), // 10: cosmos.group.v1.ProposalExecutorResult + (ProposalStatus)(0), // 11: cosmos.group.v1.ProposalStatus + (*TallyResult)(nil), // 12: cosmos.group.v1.TallyResult } var file_cosmos_group_v1_events_proto_depIdxs = []int32{ - 9, // 0: cosmos.group.v1.EventExec.result:type_name -> cosmos.group.v1.ProposalExecutorResult - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 10, // 0: cosmos.group.v1.EventExec.result:type_name -> cosmos.group.v1.ProposalExecutorResult + 11, // 1: cosmos.group.v1.EventProposalPruned.status:type_name -> cosmos.group.v1.ProposalStatus + 12, // 2: cosmos.group.v1.EventProposalPruned.tally_result:type_name -> cosmos.group.v1.TallyResult + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_cosmos_group_v1_events_proto_init() } @@ -4444,6 +5046,18 @@ func file_cosmos_group_v1_events_proto_init() { return nil } } + file_cosmos_group_v1_events_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*EventProposalPruned); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -4451,7 +5065,7 @@ func file_cosmos_group_v1_events_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_cosmos_group_v1_events_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/api/cosmos/group/v1/types.pulsar.go b/api/cosmos/group/v1/types.pulsar.go index bc96cac970..8ccb799773 100644 --- a/api/cosmos/group/v1/types.pulsar.go +++ b/api/cosmos/group/v1/types.pulsar.go @@ -7965,6 +7965,8 @@ type GroupPolicyInfo struct { // admin is the account address of the group admin. Admin string `protobuf:"bytes,3,opt,name=admin,proto3" json:"admin,omitempty"` // metadata is any arbitrary metadata attached to the group policy. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#decision-policy-1 Metadata string `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata,omitempty"` // version is used to track changes to a group's GroupPolicyInfo structure that // would create a different result on a running proposal. @@ -8058,6 +8060,8 @@ type Proposal struct { // group_policy_address is the account address of group policy. GroupPolicyAddress string `protobuf:"bytes,2,opt,name=group_policy_address,json=groupPolicyAddress,proto3" json:"group_policy_address,omitempty"` // metadata is any arbitrary metadata attached to the proposal. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#proposal-4 Metadata string `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // proposers are the account addresses of the proposers. Proposers []string `protobuf:"bytes,4,rep,name=proposers,proto3" json:"proposers,omitempty"` diff --git a/proto/cosmos/group/v1/events.proto b/proto/cosmos/group/v1/events.proto index c2cfe8728f..2b98ec9abc 100644 --- a/proto/cosmos/group/v1/events.proto +++ b/proto/cosmos/group/v1/events.proto @@ -79,3 +79,16 @@ message EventLeaveGroup { // address is the account address of the group member. string address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } + +// EventProposalPruned is an event emitted when a proposal is pruned. +message EventProposalPruned { + + // proposal_id is the unique ID of the proposal. + uint64 proposal_id = 1; + + // status is the proposal status (UNSPECIFIED, SUBMITTED, ACCEPTED, REJECTED, ABORTED, WITHDRAWN). + ProposalStatus status = 2; + + // tally_result is the proposal tally result (when applicable). + TallyResult tally_result = 3; +} diff --git a/proto/cosmos/group/v1/query.proto b/proto/cosmos/group/v1/query.proto index f141d26b93..80b09255af 100644 --- a/proto/cosmos/group/v1/query.proto +++ b/proto/cosmos/group/v1/query.proto @@ -85,7 +85,7 @@ service Query { }; // Groups queries all groups in state. - // + // // Since: cosmos-sdk 0.47.1 rpc Groups(QueryGroupsRequest) returns (QueryGroupsResponse) { option (google.api.http).get = "/cosmos/group/v1/groups"; @@ -300,7 +300,7 @@ message QueryTallyResultResponse { } // QueryGroupsRequest is the Query/Groups request type. -// +// // Since: cosmos-sdk 0.47.1 message QueryGroupsRequest { @@ -309,7 +309,7 @@ message QueryGroupsRequest { } // QueryGroupsResponse is the Query/Groups response type. -// +// // Since: cosmos-sdk 0.47.1 message QueryGroupsResponse { // `groups` is all the groups present in state. diff --git a/proto/cosmos/group/v1/types.proto b/proto/cosmos/group/v1/types.proto index 99838401ea..4968d13cb7 100644 --- a/proto/cosmos/group/v1/types.proto +++ b/proto/cosmos/group/v1/types.proto @@ -171,6 +171,8 @@ message GroupPolicyInfo { string admin = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // metadata is any arbitrary metadata attached to the group policy. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#decision-policy-1 string metadata = 4; // version is used to track changes to a group's GroupPolicyInfo structure that @@ -199,6 +201,8 @@ message Proposal { string group_policy_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // metadata is any arbitrary metadata attached to the proposal. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#proposal-4 string metadata = 3; // proposers are the account addresses of the proposers. diff --git a/x/group/README.md b/x/group/README.md index b94fec7286..29e5478b5f 100644 --- a/x/group/README.md +++ b/x/group/README.md @@ -49,6 +49,7 @@ This module allows the creation and management of on-chain multisig accounts and * [EventVote](#eventvote) * [EventExec](#eventexec) * [EventLeaveGroup](#eventleavegroup) + * [EventProposalPruned](#eventproposalpruned) * [Client](#client) * [CLI](#cli) * [gRPC](#grpc) @@ -578,6 +579,15 @@ The group module emits the following events: | cosmos.group.v1.EventLeaveGroup | proposal_id | {proposalId} | | cosmos.group.v1.EventLeaveGroup | address | {address} | +### EventProposalPruned + +| Type | Attribute Key | Attribute Value | +|-------------------------------------|---------------|---------------------------------| +| message | action | /cosmos.group.v1.Msg/LeaveGroup | +| cosmos.group.v1.EventProposalPruned | proposal_id | {proposalId} | +| cosmos.group.v1.EventProposalPruned | status | {ProposalStatus} | +| cosmos.group.v1.EventProposalPruned | tally_result | {TallyResult} | + ## Client diff --git a/x/group/events.pb.go b/x/group/events.pb.go index 1e30b1f06c..dc869b695c 100644 --- a/x/group/events.pb.go +++ b/x/group/events.pb.go @@ -464,6 +464,70 @@ func (m *EventLeaveGroup) GetAddress() string { return "" } +// EventProposalPruned is an event emitted when a proposal is pruned. +type EventProposalPruned struct { + // proposal_id is the unique ID of the proposal. + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` + // status is the proposal status (UNSPECIFIED, SUBMITTED, ACCEPTED, REJECTED, ABORTED, WITHDRAWN). + Status ProposalStatus `protobuf:"varint,2,opt,name=status,proto3,enum=cosmos.group.v1.ProposalStatus" json:"status,omitempty"` + // tally_result is the proposal tally result (when applicable). + TallyResult *TallyResult `protobuf:"bytes,3,opt,name=tally_result,json=tallyResult,proto3" json:"tally_result,omitempty"` +} + +func (m *EventProposalPruned) Reset() { *m = EventProposalPruned{} } +func (m *EventProposalPruned) String() string { return proto.CompactTextString(m) } +func (*EventProposalPruned) ProtoMessage() {} +func (*EventProposalPruned) Descriptor() ([]byte, []int) { + return fileDescriptor_e8d753981546f032, []int{9} +} +func (m *EventProposalPruned) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventProposalPruned) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventProposalPruned.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 *EventProposalPruned) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventProposalPruned.Merge(m, src) +} +func (m *EventProposalPruned) XXX_Size() int { + return m.Size() +} +func (m *EventProposalPruned) XXX_DiscardUnknown() { + xxx_messageInfo_EventProposalPruned.DiscardUnknown(m) +} + +var xxx_messageInfo_EventProposalPruned proto.InternalMessageInfo + +func (m *EventProposalPruned) GetProposalId() uint64 { + if m != nil { + return m.ProposalId + } + return 0 +} + +func (m *EventProposalPruned) GetStatus() ProposalStatus { + if m != nil { + return m.Status + } + return PROPOSAL_STATUS_UNSPECIFIED +} + +func (m *EventProposalPruned) GetTallyResult() *TallyResult { + if m != nil { + return m.TallyResult + } + return nil +} + func init() { proto.RegisterType((*EventCreateGroup)(nil), "cosmos.group.v1.EventCreateGroup") proto.RegisterType((*EventUpdateGroup)(nil), "cosmos.group.v1.EventUpdateGroup") @@ -474,36 +538,41 @@ func init() { proto.RegisterType((*EventVote)(nil), "cosmos.group.v1.EventVote") proto.RegisterType((*EventExec)(nil), "cosmos.group.v1.EventExec") proto.RegisterType((*EventLeaveGroup)(nil), "cosmos.group.v1.EventLeaveGroup") + proto.RegisterType((*EventProposalPruned)(nil), "cosmos.group.v1.EventProposalPruned") } func init() { proto.RegisterFile("cosmos/group/v1/events.proto", fileDescriptor_e8d753981546f032) } var fileDescriptor_e8d753981546f032 = []byte{ - // 382 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0x4f, 0x2f, 0xca, 0x2f, 0x2d, 0xd0, 0x2f, 0x33, 0xd4, 0x4f, 0x2d, 0x4b, 0xcd, - 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x87, 0xc8, 0xea, 0x81, 0x65, 0xf5, - 0xca, 0x0c, 0xa5, 0x24, 0x21, 0x02, 0xf1, 0x60, 0x69, 0x7d, 0xa8, 0x2c, 0x98, 0x23, 0x25, 0x8d, - 0x6e, 0x52, 0x49, 0x65, 0x41, 0x2a, 0x54, 0x52, 0x49, 0x97, 0x4b, 0xc0, 0x15, 0x64, 0xb0, 0x73, - 0x51, 0x6a, 0x62, 0x49, 0xaa, 0x3b, 0x48, 0x89, 0x90, 0x24, 0x17, 0x07, 0x58, 0x6d, 0x7c, 0x66, - 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x4b, 0x10, 0x3b, 0x98, 0xef, 0x99, 0x02, 0x57, 0x1e, 0x5a, - 0x90, 0x42, 0x8c, 0x72, 0x1f, 0x2e, 0x31, 0x74, 0xd3, 0x03, 0xf2, 0x73, 0x32, 0x93, 0x2b, 0x85, - 0x8c, 0xb8, 0xd8, 0x13, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0xc1, 0x7a, 0x38, 0x9d, 0x24, 0x2e, - 0x6d, 0xd1, 0x15, 0x81, 0xba, 0xdb, 0x11, 0x22, 0x13, 0x5c, 0x52, 0x94, 0x99, 0x97, 0x1e, 0x04, - 0x53, 0x08, 0x37, 0x0d, 0xc9, 0x72, 0x0a, 0x4c, 0x33, 0xe3, 0x12, 0x06, 0x9b, 0x16, 0x5c, 0x9a, - 0x94, 0x9b, 0x59, 0x12, 0x50, 0x94, 0x5f, 0x90, 0x5f, 0x9c, 0x98, 0x23, 0x24, 0xcf, 0xc5, 0x5d, - 0x00, 0x65, 0x23, 0x3c, 0xc4, 0x05, 0x13, 0xf2, 0x4c, 0x51, 0xb2, 0xe0, 0x12, 0x05, 0xeb, 0x0b, - 0xcf, 0x2c, 0xc9, 0x48, 0x29, 0x4a, 0x2c, 0x27, 0x5e, 0xa7, 0x0e, 0x17, 0x27, 0x58, 0x67, 0x58, - 0x7e, 0x49, 0x2a, 0x61, 0xd5, 0x8d, 0x8c, 0x50, 0xe5, 0xae, 0x15, 0xa9, 0xc9, 0x04, 0x95, 0x0b, - 0xd9, 0x73, 0xb1, 0x15, 0xa5, 0x16, 0x97, 0xe6, 0x94, 0x48, 0x30, 0x29, 0x30, 0x6a, 0xf0, 0x19, - 0xa9, 0xeb, 0xa1, 0x25, 0x11, 0x3d, 0x98, 0x43, 0x41, 0xe6, 0x95, 0x96, 0xe4, 0x17, 0x05, 0x81, - 0x95, 0x07, 0x41, 0xb5, 0x09, 0x09, 0x71, 0xb1, 0xe4, 0xe4, 0xa7, 0x17, 0x4b, 0x30, 0x83, 0x02, - 0x30, 0x08, 0xcc, 0x56, 0x4a, 0xe0, 0xe2, 0x07, 0x3b, 0xc1, 0x27, 0x35, 0xb1, 0x8c, 0x60, 0x6c, - 0x23, 0xc7, 0x02, 0x13, 0x91, 0xb1, 0xe0, 0x64, 0x77, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, - 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, - 0x72, 0x0c, 0x51, 0x2a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xd0, 0xf4, - 0x0c, 0xa5, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, 0x20, 0xc9, 0x39, 0x89, 0x0d, 0x9c, 0x8c, 0x8d, - 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xc0, 0x98, 0xf8, 0x2f, 0x03, 0x00, 0x00, + // 442 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x4f, 0xef, 0xd2, 0x30, + 0x18, 0xc7, 0xe9, 0x4f, 0x02, 0x52, 0x8c, 0x98, 0xfa, 0x27, 0x03, 0xc9, 0x20, 0xc4, 0x44, 0x0e, + 0xb2, 0x05, 0x4c, 0xd4, 0x93, 0x44, 0x0c, 0x31, 0x24, 0x1c, 0xc8, 0xf0, 0x4f, 0xe2, 0x05, 0xc7, + 0xda, 0x8c, 0xc5, 0x41, 0x97, 0xb6, 0x9b, 0x70, 0xf4, 0x1d, 0xf8, 0x52, 0x3c, 0xf8, 0x22, 0x3c, + 0x12, 0x4f, 0x1e, 0x0d, 0xbc, 0x11, 0xb3, 0xae, 0x03, 0x82, 0x31, 0x23, 0xf9, 0x9d, 0x68, 0xfb, + 0xfd, 0x7c, 0xbf, 0x3c, 0x4f, 0x9f, 0x15, 0xd6, 0x1d, 0xca, 0x97, 0x94, 0x9b, 0x2e, 0xa3, 0x61, + 0x60, 0x46, 0x5d, 0x93, 0x44, 0x64, 0x25, 0xb8, 0x11, 0x30, 0x2a, 0x28, 0xaa, 0x24, 0xaa, 0x21, + 0x55, 0x23, 0xea, 0xd6, 0xaa, 0xc9, 0xc1, 0x4c, 0xca, 0xa6, 0x52, 0xe5, 0xa6, 0xf6, 0xf0, 0x3c, + 0x49, 0x6c, 0x02, 0xa2, 0xc4, 0x56, 0x07, 0xde, 0x19, 0xc6, 0xc1, 0xaf, 0x19, 0xb1, 0x05, 0x79, + 0x13, 0x23, 0xa8, 0x0a, 0x6f, 0x4a, 0x76, 0xe6, 0x61, 0x0d, 0x34, 0x41, 0x3b, 0x6f, 0x15, 0xe5, + 0x7e, 0x84, 0x0f, 0xf8, 0xbb, 0x00, 0x5f, 0x82, 0x8f, 0xe1, 0x83, 0xf3, 0xf4, 0x09, 0xf5, 0x3d, + 0x67, 0x83, 0x7a, 0xb0, 0x68, 0x63, 0xcc, 0x08, 0xe7, 0xd2, 0x53, 0x1a, 0x68, 0xbf, 0x7e, 0x74, + 0xee, 0xa9, 0xba, 0x5f, 0x25, 0xca, 0x54, 0x30, 0x6f, 0xe5, 0x5a, 0x29, 0x78, 0x48, 0x3b, 0xf9, + 0xf3, 0x6b, 0xa4, 0x3d, 0x83, 0x77, 0x65, 0xda, 0x34, 0x9c, 0x2f, 0x3d, 0x31, 0x61, 0x34, 0xa0, + 0xdc, 0xf6, 0x51, 0x03, 0x96, 0x03, 0xb5, 0x3e, 0x36, 0x04, 0xd3, 0xa3, 0x11, 0x6e, 0xbd, 0x80, + 0xf7, 0xa5, 0xef, 0x83, 0x27, 0x16, 0x98, 0xd9, 0x5f, 0x2e, 0x77, 0x3e, 0x81, 0x25, 0xe9, 0x7c, + 0x4f, 0x05, 0xc9, 0xa6, 0xbf, 0x02, 0x85, 0x0f, 0xd7, 0xc4, 0xc9, 0xc4, 0x51, 0x1f, 0x16, 0x18, + 0xe1, 0xa1, 0x2f, 0xb4, 0xab, 0x26, 0x68, 0xdf, 0xee, 0x3d, 0x36, 0xce, 0x3e, 0x11, 0x23, 0x2d, + 0x34, 0xce, 0x0b, 0x05, 0x65, 0x96, 0xc4, 0x2d, 0x65, 0x43, 0x08, 0xe6, 0x7d, 0xea, 0x72, 0xed, + 0x46, 0x7c, 0x81, 0x96, 0x5c, 0xb7, 0x3e, 0xc1, 0x8a, 0x2c, 0x61, 0x4c, 0xec, 0x28, 0x73, 0xda, + 0xa7, 0x53, 0xb8, 0xba, 0x74, 0x0a, 0xdf, 0x81, 0x1a, 0x43, 0x5a, 0xdd, 0x84, 0x85, 0x2b, 0x82, + 0xb3, 0xfb, 0x7d, 0x0e, 0x0b, 0x5c, 0xd8, 0x22, 0xe4, 0xaa, 0xdf, 0xc6, 0x7f, 0xfb, 0x9d, 0x4a, + 0xcc, 0x52, 0x38, 0xea, 0xc3, 0x5b, 0xc2, 0xf6, 0xfd, 0xcd, 0x4c, 0x5d, 0x57, 0xdc, 0x6f, 0xb9, + 0x57, 0xff, 0xc7, 0xfe, 0x36, 0x86, 0xd4, 0x1d, 0x95, 0xc5, 0x71, 0x33, 0x78, 0xf9, 0x73, 0xa7, + 0x83, 0xed, 0x4e, 0x07, 0x7f, 0x76, 0x3a, 0xf8, 0xb6, 0xd7, 0x73, 0xdb, 0xbd, 0x9e, 0xfb, 0xbd, + 0xd7, 0x73, 0x1f, 0x1f, 0xb9, 0x9e, 0x58, 0x84, 0x73, 0xc3, 0xa1, 0x4b, 0xf5, 0x04, 0xd5, 0x4f, + 0x87, 0xe3, 0xcf, 0xe6, 0x3a, 0x79, 0x81, 0xf3, 0x82, 0x7c, 0x79, 0x4f, 0xff, 0x06, 0x00, 0x00, + 0xff, 0xff, 0xa5, 0x1a, 0x1c, 0xb9, 0xe2, 0x03, 0x00, 0x00, } func (m *EventCreateGroup) Marshal() (dAtA []byte, err error) { @@ -781,6 +850,51 @@ func (m *EventLeaveGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *EventProposalPruned) 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 *EventProposalPruned) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventProposalPruned) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.TallyResult != nil { + { + size, err := m.TallyResult.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvents(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.Status != 0 { + i = encodeVarintEvents(dAtA, i, uint64(m.Status)) + i-- + dAtA[i] = 0x10 + } + if m.ProposalId != 0 { + i = encodeVarintEvents(dAtA, i, uint64(m.ProposalId)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { offset -= sovEvents(v) base := offset @@ -913,6 +1027,25 @@ func (m *EventLeaveGroup) Size() (n int) { return n } +func (m *EventProposalPruned) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ProposalId != 0 { + n += 1 + sovEvents(uint64(m.ProposalId)) + } + if m.Status != 0 { + n += 1 + sovEvents(uint64(m.Status)) + } + if m.TallyResult != nil { + l = m.TallyResult.Size() + n += 1 + l + sovEvents(uint64(l)) + } + return n +} + func sovEvents(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1649,6 +1782,130 @@ func (m *EventLeaveGroup) Unmarshal(dAtA []byte) error { } return nil } +func (m *EventProposalPruned) 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 ErrIntOverflowEvents + } + 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: EventProposalPruned: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventProposalPruned: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType) + } + m.ProposalId = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ProposalId |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= ProposalStatus(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TallyResult", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthEvents + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TallyResult == nil { + m.TallyResult = &TallyResult{} + } + if err := m.TallyResult.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipEvents(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthEvents + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipEvents(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/group/keeper/genesis.go b/x/group/keeper/genesis.go index fd4eb13c00..e1664b41ac 100644 --- a/x/group/keeper/genesis.go +++ b/x/group/keeper/genesis.go @@ -44,7 +44,7 @@ func (k Keeper) InitGenesis(ctx types.Context, cdc codec.JSONCodec, data json.Ra } // ExportGenesis returns the group module's exported genesis. -func (k Keeper) ExportGenesis(ctx types.Context, cdc codec.JSONCodec) *group.GenesisState { +func (k Keeper) ExportGenesis(ctx types.Context, _ codec.JSONCodec) *group.GenesisState { genesisState := group.NewGenesisState() var groups []*group.GroupInfo diff --git a/x/group/keeper/keeper.go b/x/group/keeper/keeper.go index f8f41673ce..1cce70e3eb 100644 --- a/x/group/keeper/keeper.go +++ b/x/group/keeper/keeper.go @@ -374,6 +374,15 @@ func (k Keeper) PruneProposals(ctx sdk.Context) error { if err != nil { return err } + // Emit event for proposal finalized with its result + if err := ctx.EventManager().EmitTypedEvent( + &group.EventProposalPruned{ + ProposalId: proposal.Id, + Status: proposal.Status, + TallyResult: &proposal.FinalTallyResult, + }); err != nil { + return err + } } return nil @@ -407,6 +416,14 @@ func (k Keeper) TallyProposalsAtVPEnd(ctx sdk.Context) error { if err := k.pruneVotes(ctx, proposalID); err != nil { return err } + // Emit event for proposal finalized with its result + if err := ctx.EventManager().EmitTypedEvent( + &group.EventProposalPruned{ + ProposalId: proposal.Id, + Status: proposal.Status, + }); err != nil { + return err + } } else if proposal.Status == group.PROPOSAL_STATUS_SUBMITTED { if err := k.doTallyAndUpdate(ctx, &proposal, electorate, policyInfo); err != nil { return sdkerrors.Wrap(err, "doTallyAndUpdate") diff --git a/x/group/keeper/keeper_test.go b/x/group/keeper/keeper_test.go index 0bd2027b83..1e3b09e0c1 100644 --- a/x/group/keeper/keeper_test.go +++ b/x/group/keeper/keeper_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" tmtime "github.com/cometbft/cometbft/types/time" "github.com/golang/mock/gomock" @@ -32,6 +33,8 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" ) +var EventProposalPruned = "cosmos.group.v1.EventProposalPruned" + const minExecutionPeriod = 5 * time.Second type TestSuite struct { @@ -1756,6 +1759,9 @@ func (s *TestSuite) TestSubmitProposal() { s.Require().Contains(fromBalances, sdk.NewInt64Coin("test", 9900)) toBalances := s.bankKeeper.GetAllBalances(sdkCtx, addr2) s.Require().Contains(toBalances, sdk.NewInt64Coin("test", 100)) + + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) }, }, "with try exec, not enough yes votes for proposal to pass": { @@ -1847,6 +1853,7 @@ func (s *TestSuite) TestWithdrawProposal() { proposalId uint64 admin string expErrMsg string + postRun func(sdkCtx sdk.Context) }{ "wrong admin": { preRun: func(sdkCtx sdk.Context) uint64 { @@ -1854,6 +1861,7 @@ func (s *TestSuite) TestWithdrawProposal() { }, admin: addr5.String(), expErrMsg: "unauthorized", + postRun: func(sdkCtx sdk.Context) {}, }, "wrong proposalId": { preRun: func(sdkCtx sdk.Context) uint64 { @@ -1861,6 +1869,7 @@ func (s *TestSuite) TestWithdrawProposal() { }, admin: proposers[0], expErrMsg: "not found", + postRun: func(sdkCtx sdk.Context) {}, }, "happy case with proposer": { preRun: func(sdkCtx sdk.Context) uint64 { @@ -1868,6 +1877,7 @@ func (s *TestSuite) TestWithdrawProposal() { }, proposalId: proposalID, admin: proposers[0], + postRun: func(sdkCtx sdk.Context) {}, }, "already closed proposal": { preRun: func(sdkCtx sdk.Context) uint64 { @@ -1882,6 +1892,7 @@ func (s *TestSuite) TestWithdrawProposal() { proposalId: proposalID, admin: proposers[0], expErrMsg: "cannot withdraw a proposal with the status of PROPOSAL_STATUS_WITHDRAWN", + postRun: func(sdkCtx sdk.Context) {}, }, "happy case with group admin address": { preRun: func(sdkCtx sdk.Context) uint64 { @@ -1889,6 +1900,17 @@ func (s *TestSuite) TestWithdrawProposal() { }, proposalId: proposalID, admin: proposers[0], + postRun: func(sdkCtx sdk.Context) { + resp, err := s.groupKeeper.Proposal(s.ctx, &group.QueryProposalRequest{ProposalId: proposalID}) + s.Require().NoError(err) + vpe := resp.Proposal.VotingPeriodEnd + timeDiff := vpe.Sub(s.sdkCtx.BlockTime()) + ctxVPE := sdkCtx.WithBlockTime(s.sdkCtx.BlockTime().Add(timeDiff).Add(time.Second * 1)) + s.Require().NoError(s.groupKeeper.TallyProposalsAtVPEnd(ctxVPE)) + events := ctxVPE.EventManager().ABCIEvents() + + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, } for msg, spec := range specs { @@ -1911,6 +1933,7 @@ func (s *TestSuite) TestWithdrawProposal() { resp, err := s.groupKeeper.Proposal(s.ctx, &group.QueryProposalRequest{ProposalId: pId}) s.Require().NoError(err) s.Require().Equal(resp.GetProposal().Status, group.PROPOSAL_STATUS_WITHDRAWN) + spec.postRun(s.sdkCtx) }) } } @@ -2425,6 +2448,7 @@ func (s *TestSuite) TestExecProposal() { expBalance bool expFromBalances sdk.Coin expToBalances sdk.Coin + postRun func(sdkCtx sdk.Context) }{ "proposal executed when accepted": { setupProposal: func(ctx context.Context) uint64 { @@ -2438,6 +2462,10 @@ func (s *TestSuite) TestExecProposal() { expBalance: true, expFromBalances: sdk.NewInt64Coin("test", 9900), expToBalances: sdk.NewInt64Coin("test", 100), + postRun: func(sdkCtx sdk.Context) { + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, "proposal with multiple messages executed when accepted": { setupProposal: func(ctx context.Context) uint64 { @@ -2452,6 +2480,10 @@ func (s *TestSuite) TestExecProposal() { expBalance: true, expFromBalances: sdk.NewInt64Coin("test", 9800), expToBalances: sdk.NewInt64Coin("test", 200), + postRun: func(sdkCtx sdk.Context) { + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, "proposal not executed when rejected": { setupProposal: func(ctx context.Context) uint64 { @@ -2461,6 +2493,7 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(minExecutionPeriod), // After min execution period end expProposalStatus: group.PROPOSAL_STATUS_REJECTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_NOT_RUN, + postRun: func(sdkCtx sdk.Context) {}, }, "open proposal must not fail": { setupProposal: func(ctx context.Context) uint64 { @@ -2468,12 +2501,14 @@ func (s *TestSuite) TestExecProposal() { }, expProposalStatus: group.PROPOSAL_STATUS_SUBMITTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_NOT_RUN, + postRun: func(sdkCtx sdk.Context) {}, }, "existing proposal required": { setupProposal: func(ctx context.Context) uint64 { return 9999 }, - expErr: true, + expErr: true, + postRun: func(sdkCtx sdk.Context) {}, }, "Decision policy also applied on exactly voting period end": { setupProposal: func(ctx context.Context) uint64 { @@ -2483,6 +2518,7 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(time.Second), // Voting period is 1s expProposalStatus: group.PROPOSAL_STATUS_REJECTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_NOT_RUN, + postRun: func(sdkCtx sdk.Context) {}, }, "Decision policy also applied after voting period end": { setupProposal: func(ctx context.Context) uint64 { @@ -2492,6 +2528,7 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(time.Second).Add(time.Millisecond), // Voting period is 1s expProposalStatus: group.PROPOSAL_STATUS_REJECTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_NOT_RUN, + postRun: func(sdkCtx sdk.Context) {}, }, "exec proposal before MinExecutionPeriod should fail": { setupProposal: func(ctx context.Context) uint64 { @@ -2501,6 +2538,7 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(4 * time.Second), // min execution date is 5s later after s.blockTime expProposalStatus: group.PROPOSAL_STATUS_ACCEPTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_FAILURE, // Because MinExecutionPeriod has not passed + postRun: func(sdkCtx sdk.Context) {}, }, "exec proposal at exactly MinExecutionPeriod should pass": { setupProposal: func(ctx context.Context) uint64 { @@ -2511,6 +2549,10 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(5 * time.Second), // min execution date is 5s later after s.blockTime expProposalStatus: group.PROPOSAL_STATUS_ACCEPTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_SUCCESS, + postRun: func(sdkCtx sdk.Context) { + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, "prevent double execution when successful": { setupProposal: func(ctx context.Context) uint64 { @@ -2533,6 +2575,10 @@ func (s *TestSuite) TestExecProposal() { expBalance: true, expFromBalances: sdk.NewInt64Coin("test", 9900), expToBalances: sdk.NewInt64Coin("test", 100), + postRun: func(sdkCtx sdk.Context) { + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, "rollback all msg updates on failure": { setupProposal: func(ctx context.Context) uint64 { @@ -2545,6 +2591,7 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(minExecutionPeriod), // After min execution period end expProposalStatus: group.PROPOSAL_STATUS_ACCEPTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_FAILURE, + postRun: func(sdkCtx sdk.Context) {}, }, "executable when failed before": { setupProposal: func(ctx context.Context) uint64 { @@ -2568,6 +2615,10 @@ func (s *TestSuite) TestExecProposal() { srcBlockTime: s.blockTime.Add(minExecutionPeriod), // After min execution period end expProposalStatus: group.PROPOSAL_STATUS_ACCEPTED, expExecutorResult: group.PROPOSAL_EXECUTOR_RESULT_SUCCESS, + postRun: func(sdkCtx sdk.Context) { + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) + }, }, } for msg, spec := range specs { @@ -2614,6 +2665,8 @@ func (s *TestSuite) TestExecProposal() { toBalances := s.bankKeeper.GetAllBalances(sdkCtx, addr2) s.Require().Contains(toBalances, spec.expToBalances) } + + spec.postRun(sdkCtx) }) } } @@ -2802,6 +2855,8 @@ func (s *TestSuite) TestExecPrunedProposalsAndVotes() { s.Require().NoError(err) s.Require().Empty(res.GetVotes()) + events := sdkCtx.EventManager().ABCIEvents() + s.Require().True(eventTypeFound(events, EventProposalPruned)) } else { // Check that proposal and votes exists res, err := s.groupKeeper.Proposal(ctx, &group.QueryProposalRequest{ProposalId: proposalID}) @@ -3376,3 +3431,14 @@ func (s *TestSuite) TestTallyProposalsAtVPEnd_GroupMemberLeaving() { s.Require().NoError(s.groupKeeper.TallyProposalsAtVPEnd(ctx)) s.NotPanics(func() { module.EndBlocker(ctx, s.groupKeeper) }) } + +func eventTypeFound(events []abci.Event, eventType string) bool { + eventTypeFound := false + for _, e := range events { + if e.Type == eventType { + eventTypeFound = true + break + } + } + return eventTypeFound +} diff --git a/x/group/keeper/msg_server.go b/x/group/keeper/msg_server.go index 0112a98083..348c27c892 100644 --- a/x/group/keeper/msg_server.go +++ b/x/group/keeper/msg_server.go @@ -715,6 +715,7 @@ func (k Keeper) doTallyAndUpdate(ctx sdk.Context, p *group.Proposal, electorate } else { p.Status = group.PROPOSAL_STATUS_REJECTED } + } return nil @@ -786,6 +787,16 @@ func (k Keeper) Exec(goCtx context.Context, req *group.MsgExec) (*group.MsgExecR if err := k.pruneProposal(ctx, proposal.Id); err != nil { return nil, err } + + // Emit event for proposal finalized with its result + if err := ctx.EventManager().EmitTypedEvent( + &group.EventProposalPruned{ + ProposalId: proposal.Id, + Status: proposal.Status, + TallyResult: &proposal.FinalTallyResult, + }); err != nil { + return nil, err + } } else { store := ctx.KVStore(k.key) if err := k.proposalTable.Update(store, id, &proposal); err != nil { diff --git a/x/group/types.pb.go b/x/group/types.pb.go index 882d8e4289..f375179d8d 100644 --- a/x/group/types.pb.go +++ b/x/group/types.pb.go @@ -642,6 +642,8 @@ type GroupPolicyInfo struct { // admin is the account address of the group admin. Admin string `protobuf:"bytes,3,opt,name=admin,proto3" json:"admin,omitempty"` // metadata is any arbitrary metadata attached to the group policy. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#decision-policy-1 Metadata string `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata,omitempty"` // version is used to track changes to a group's GroupPolicyInfo structure that // would create a different result on a running proposal. @@ -695,6 +697,8 @@ type Proposal struct { // group_policy_address is the account address of group policy. GroupPolicyAddress string `protobuf:"bytes,2,opt,name=group_policy_address,json=groupPolicyAddress,proto3" json:"group_policy_address,omitempty"` // metadata is any arbitrary metadata attached to the proposal. + // the recommended format of the metadata is to be found here: + // https://docs.cosmos.network/v0.47/modules/group#proposal-4 Metadata string `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty"` // proposers are the account addresses of the proposers. Proposers []string `protobuf:"bytes,4,rep,name=proposers,proto3" json:"proposers,omitempty"` From 41a32fe4e0abc2ed5507fc14a02e61a79970b538 Mon Sep 17 00:00:00 2001 From: Marko Date: Fri, 26 May 2023 14:35:14 +0200 Subject: [PATCH 21/34] feat(baseapp): add setter for circuit breaker (backport) (#16290) --- CHANGELOG.md | 1 + baseapp/baseapp.go | 9 +++++++++ baseapp/circuit.go | 10 ++++++++++ baseapp/msg_service_router.go | 12 ++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 baseapp/circuit.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e659bf813..ae75085a18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Features +* (baseapp) [#16290](https://github.com/cosmos/cosmos-sdk/pull/16290) Add circuit breaker setter in baseapp. * (x/group) [#16191](https://github.com/cosmos/cosmos-sdk/pull/16191) Add EventProposalPruned event to group module whenever a proposal is pruned. ### Improvements diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 69a2de0e60..95994e1472 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -226,6 +226,15 @@ func (app *BaseApp) SetMsgServiceRouter(msgServiceRouter *MsgServiceRouter) { app.msgServiceRouter = msgServiceRouter } +// SetCircuitBreaker sets the circuit breaker for the BaseApp. +// The circuit breaker is checked on every message execution to verify if a transaction should be executed or not. +func (app *BaseApp) SetCircuitBreaker(cb CircuitBreaker) { + if app.msgServiceRouter == nil { + panic("must be called after message server is set") + } + app.msgServiceRouter.SetCircuit(cb) +} + // MountStores mounts all IAVL or DB stores to the provided keys in the BaseApp // multistore. func (app *BaseApp) MountStores(keys ...storetypes.StoreKey) { diff --git a/baseapp/circuit.go b/baseapp/circuit.go new file mode 100644 index 0000000000..022ee6632c --- /dev/null +++ b/baseapp/circuit.go @@ -0,0 +1,10 @@ +package baseapp + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// CircuitBreaker is an interface that defines the methods for a circuit breaker. +type CircuitBreaker interface { + IsAllowed(ctx sdk.Context, typeURL string) bool +} diff --git a/baseapp/msg_service_router.go b/baseapp/msg_service_router.go index 02192e892d..ff448086b8 100644 --- a/baseapp/msg_service_router.go +++ b/baseapp/msg_service_router.go @@ -17,6 +17,7 @@ import ( type MsgServiceRouter struct { interfaceRegistry codectypes.InterfaceRegistry routes map[string]MsgServiceHandler + circuitBreaker CircuitBreaker } var _ gogogrpc.Server = &MsgServiceRouter{} @@ -31,6 +32,10 @@ func NewMsgServiceRouter() *MsgServiceRouter { // MsgServiceHandler defines a function type which handles Msg service message. type MsgServiceHandler = func(ctx sdk.Context, req sdk.Msg) (*sdk.Result, error) +func (msr *MsgServiceRouter) SetCircuit(cb CircuitBreaker) { + msr.circuitBreaker = cb +} + // Handler returns the MsgServiceHandler for a given msg or nil if not found. func (msr *MsgServiceRouter) Handler(msg sdk.Msg) MsgServiceHandler { return msr.routes[sdk.MsgTypeURL(msg)] @@ -116,6 +121,13 @@ func (msr *MsgServiceRouter) RegisterService(sd *grpc.ServiceDesc, handler inter if err := req.ValidateBasic(); err != nil { return nil, err } + + if msr.circuitBreaker != nil { + msgURL := sdk.MsgTypeURL(req) + if !msr.circuitBreaker.IsAllowed(ctx, msgURL) { + return nil, fmt.Errorf("circuit breaker disables execution of this message: %s", msgURL) + } + } // Call the method handler from the service description with the handler object. // We don't do any decoding here because the decoding was already done. res, err := methodHandler(handler, sdk.WrapSDKContext(ctx), noopDecoder, interceptor) From 40622ff23e6871609fb5075b058f152baf0226b5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 26 May 2023 14:03:14 +0000 Subject: [PATCH 22/34] fix: allow any address in `ValidatePromptAddress` (backport #16312) (#16313) Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + client/{prompts.go => prompt_validation.go} | 17 +++++++-- client/prompt_validation_test.go | 38 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) rename client/{prompts.go => prompt_validation.go} (81%) create mode 100644 client/prompt_validation_test.go diff --git a/CHANGELOG.md b/CHANGELOG.md index ae75085a18..5575dfd7f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes +* (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`. * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. ### API Breaking Changes diff --git a/client/prompts.go b/client/prompt_validation.go similarity index 81% rename from client/prompts.go rename to client/prompt_validation.go index 050d806c49..d3e3e23217 100644 --- a/client/prompts.go +++ b/client/prompt_validation.go @@ -29,11 +29,22 @@ func ValidatePromptURL(input string) error { // ValidatePromptAddress validates that the input is a valid Bech32 address. func ValidatePromptAddress(input string) error { - if _, err := sdk.AccAddressFromBech32(input); err != nil { - return fmt.Errorf("invalid address: %w", err) + _, err := sdk.AccAddressFromBech32(input) + if err == nil { + return nil } - return nil + _, err = sdk.ValAddressFromBech32(input) + if err == nil { + return nil + } + + _, err = sdk.ConsAddressFromBech32(input) + if err == nil { + return nil + } + + return fmt.Errorf("invalid address: %w", err) } // ValidatePromptYesNo validates that the input is valid sdk.COins diff --git a/client/prompt_validation_test.go b/client/prompt_validation_test.go new file mode 100644 index 0000000000..eba30c21c4 --- /dev/null +++ b/client/prompt_validation_test.go @@ -0,0 +1,38 @@ +package client_test + +import ( + "testing" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/stretchr/testify/require" +) + +func TestValidatePromptNotEmpty(t *testing.T) { + require := require.New(t) + + require.NoError(client.ValidatePromptNotEmpty("foo")) + require.ErrorContains(client.ValidatePromptNotEmpty(""), "input cannot be empty") +} + +func TestValidatePromptURL(t *testing.T) { + require := require.New(t) + + require.NoError(client.ValidatePromptURL("https://example.com")) + require.ErrorContains(client.ValidatePromptURL("foo"), "invalid URL") +} + +func TestValidatePromptAddress(t *testing.T) { + require := require.New(t) + + require.NoError(client.ValidatePromptAddress("cosmos1huydeevpz37sd9snkgul6070mstupukw00xkw9")) + require.NoError(client.ValidatePromptAddress("cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0")) + require.NoError(client.ValidatePromptAddress("cosmosvalcons1ntk8eualewuprz0gamh8hnvcem2nrcdsgz563h")) + require.ErrorContains(client.ValidatePromptAddress("foo"), "invalid address") +} + +func TestValidatePromptCoins(t *testing.T) { + require := require.New(t) + + require.NoError(client.ValidatePromptCoins("100stake")) + require.ErrorContains(client.ValidatePromptCoins("foo"), "invalid coins") +} From 6d959001169ce78360887faf882680bf52b09ae8 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Sun, 28 May 2023 22:14:01 +0800 Subject: [PATCH 23/34] feat: support extension options for build tx (backport: #15992) (#16317) --- CHANGELOG.md | 1 + client/tx/factory.go | 28 ++++++++++++++ client/tx/tx_test.go | 67 ++++++++++++++++------------------ client/tx_config.go | 7 ++++ types/module/testutil/codec.go | 35 ++++++++++++++++++ 5 files changed, 103 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5575dfd7f2..a3cc44f064 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (baseapp) [#16290](https://github.com/cosmos/cosmos-sdk/pull/16290) Add circuit breaker setter in baseapp. * (x/group) [#16191](https://github.com/cosmos/cosmos-sdk/pull/16191) Add EventProposalPruned event to group module whenever a proposal is pruned. +* (tx) [#15992](https://github.com/cosmos/cosmos-sdk/pull/15992) Add `WithExtensionOptions` in tx Factory to allow `SetExtensionOptions` with given extension options. ### Improvements diff --git a/client/tx/factory.go b/client/tx/factory.go index 99195f2c21..aa7940a2d7 100644 --- a/client/tx/factory.go +++ b/client/tx/factory.go @@ -13,6 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -41,6 +42,7 @@ type Factory struct { feeGranter sdk.AccAddress feePayer sdk.AccAddress gasPrices sdk.DecCoins + extOptions []*codectypes.Any signMode signing.SignMode simulateAndExecute bool preprocessTxHook client.PreprocessTxFn @@ -279,6 +281,28 @@ func (f Factory) PreprocessTx(keyname string, builder client.TxBuilder) error { return f.preprocessTxHook(f.chainID, key.GetType(), builder) } +// WithExtensionOptions returns a Factory with given extension options added to the existing options, +// Example to add dynamic fee extension options: +// +// extOpt := ethermint.ExtensionOptionDynamicFeeTx{ +// MaxPriorityPrice: sdk.NewInt(1000000), +// } +// +// extBytes, _ := extOpt.Marshal() +// +// extOpts := []*types.Any{ +// { +// TypeUrl: "/ethermint.types.v1.ExtensionOptionDynamicFeeTx", +// Value: extBytes, +// }, +// } +// +// txf.WithExtensionOptions(extOpts...) +func (f Factory) WithExtensionOptions(extOpts ...*codectypes.Any) Factory { + f.extOptions = extOpts + return f +} + // BuildUnsignedTx builds a transaction to be signed given a set of messages. // Once created, the fee, memo, and messages are set. func (f Factory) BuildUnsignedTx(msgs ...sdk.Msg) (client.TxBuilder, error) { @@ -327,6 +351,10 @@ func (f Factory) BuildUnsignedTx(msgs ...sdk.Msg) (client.TxBuilder, error) { tx.SetFeePayer(f.feePayer) tx.SetTimeoutHeight(f.TimeoutHeight()) + if etx, ok := tx.(client.ExtendedTxBuilder); ok { + etx.SetExtensionOptions(f.extOptions...) + } + return tx, nil } diff --git a/client/tx/tx_test.go b/client/tx/tx_test.go index 9c687a42eb..b9eb1a7a42 100644 --- a/client/tx/tx_test.go +++ b/client/tx/tx_test.go @@ -21,6 +21,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" txtypes "github.com/cosmos/cosmos-sdk/types/tx" signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" ante "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -108,6 +109,16 @@ func TestCalculateGas(t *testing.T) { } } +func mockTxFactory(txCfg client.TxConfig) tx.Factory { + return tx.Factory{}. + WithTxConfig(txCfg). + WithAccountNumber(50). + WithSequence(23). + WithFees("50stake"). + WithMemo("memo"). + WithChainID("test-chain") +} + func TestBuildSimTx(t *testing.T) { txCfg, cdc := newTestTxConfig(t) @@ -117,17 +128,7 @@ func TestBuildSimTx(t *testing.T) { path := hd.CreateHDPath(118, 0, 0).String() _, _, err = kb.NewMnemonic("test_key1", keyring.English, path, keyring.DefaultBIP39Passphrase, hd.Secp256k1) require.NoError(t, err) - - txf := tx.Factory{}. - WithTxConfig(txCfg). - WithAccountNumber(50). - WithSequence(23). - WithFees("50stake"). - WithMemo("memo"). - WithChainID("test-chain"). - WithSignMode(txCfg.SignModeHandler().DefaultMode()). - WithKeybase(kb) - + txf := mockTxFactory(txCfg).WithSignMode(txCfg.SignModeHandler().DefaultMode()).WithKeybase(kb) msg := banktypes.NewMsgSend(sdk.AccAddress("from"), sdk.AccAddress("to"), nil) bz, err := txf.BuildSimTx(msg) require.NoError(t, err) @@ -143,16 +144,7 @@ func TestBuildUnsignedTx(t *testing.T) { _, _, err = kb.NewMnemonic("test_key1", keyring.English, path, keyring.DefaultBIP39Passphrase, hd.Secp256k1) require.NoError(t, err) - - txf := tx.Factory{}. - WithTxConfig(txConfig). - WithAccountNumber(50). - WithSequence(23). - WithFees("50stake"). - WithMemo("memo"). - WithChainID("test-chain"). - WithKeybase(kb) - + txf := mockTxFactory(txConfig).WithKeybase(kb) msg := banktypes.NewMsgSend(sdk.AccAddress("from"), sdk.AccAddress("to"), nil) tx, err := txf.BuildUnsignedTx(msg) require.NoError(t, err) @@ -163,6 +155,23 @@ func TestBuildUnsignedTx(t *testing.T) { require.Empty(t, sigs) } +func TestBuildUnsignedTxWithWithExtensionOptions(t *testing.T) { + txCfg := moduletestutil.MakeBuilderTestTxConfig() + extOpts := []*codectypes.Any{ + { + TypeUrl: "/test", + Value: []byte("test"), + }, + } + txf := mockTxFactory(txCfg).WithExtensionOptions(extOpts...) + msg := banktypes.NewMsgSend(sdk.AccAddress("from"), sdk.AccAddress("to"), nil) + tx, err := txf.BuildUnsignedTx(msg) + require.NoError(t, err) + require.NotNil(t, tx) + txb := tx.(*moduletestutil.TestTxBuilder) + require.Equal(t, extOpts, txb.ExtOptions) +} + func TestMnemonicInMemo(t *testing.T) { txConfig, cdc := newTestTxConfig(t) kb, err := keyring.New(t.Name(), "test", t.TempDir(), nil, cdc) @@ -239,13 +248,7 @@ func TestSign(t *testing.T) { requireT.NotEqual(pubKey1.Bytes(), pubKey2.Bytes()) t.Log("Pub keys:", pubKey1, pubKey2) - txfNoKeybase := tx.Factory{}. - WithTxConfig(txConfig). - WithAccountNumber(50). - WithSequence(23). - WithFees("50stake"). - WithMemo("memo"). - WithChainID("test-chain") + txfNoKeybase := mockTxFactory(txConfig) txfDirect := txfNoKeybase. WithKeybase(kb). WithSignMode(signingtypes.SignMode_SIGN_MODE_DIRECT) @@ -406,13 +409,7 @@ func TestPreprocessHook(t *testing.T) { return nil }) - txfDirect := tx.Factory{}. - WithTxConfig(txConfig). - WithAccountNumber(50). - WithSequence(23). - WithFees("50stake"). - WithMemo("memo"). - WithChainID("test-chain"). + txfDirect := mockTxFactory(txConfig). WithKeybase(kb). WithSignMode(signingtypes.SignMode_SIGN_MODE_DIRECT). WithPreprocessTxHook(preprocessHook) diff --git a/client/tx_config.go b/client/tx_config.go index 5c5fd2695e..530ced16a5 100644 --- a/client/tx_config.go +++ b/client/tx_config.go @@ -1,6 +1,7 @@ package client import ( + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx" signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" @@ -48,4 +49,10 @@ type ( SetFeeGranter(feeGranter sdk.AccAddress) AddAuxSignerData(tx.AuxSignerData) error } + + // ExtendedTxBuilder extends the TxBuilder interface, + // which is used to set extension options to be included in a transaction. + ExtendedTxBuilder interface { + SetExtensionOptions(extOpts ...*codectypes.Any) + } ) diff --git a/types/module/testutil/codec.go b/types/module/testutil/codec.go index b54085c584..3011efdae9 100644 --- a/types/module/testutil/codec.go +++ b/types/module/testutil/codec.go @@ -41,3 +41,38 @@ func MakeTestEncodingConfig(modules ...module.AppModuleBasic) TestEncodingConfig return encCfg } + +func MakeTestTxConfig() client.TxConfig { + interfaceRegistry := types.NewInterfaceRegistry() + cdc := codec.NewProtoCodec(interfaceRegistry) + return tx.NewTxConfig(cdc, tx.DefaultSignModes) +} + +type TestBuilderTxConfig struct { + client.TxConfig + TxBuilder *TestTxBuilder +} + +func MakeBuilderTestTxConfig() TestBuilderTxConfig { + return TestBuilderTxConfig{ + TxConfig: MakeTestTxConfig(), + } +} + +func (cfg TestBuilderTxConfig) NewTxBuilder() client.TxBuilder { + if cfg.TxBuilder == nil { + cfg.TxBuilder = &TestTxBuilder{ + TxBuilder: cfg.TxConfig.NewTxBuilder(), + } + } + return cfg.TxBuilder +} + +type TestTxBuilder struct { + client.TxBuilder + ExtOptions []*types.Any +} + +func (b *TestTxBuilder) SetExtensionOptions(extOpts ...*types.Any) { + b.ExtOptions = extOpts +} From 2e70efc10af3793acddbd285d4c300e1e63b34e2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:04:57 +0000 Subject: [PATCH 24/34] fix: do not overwrite comet config when set in `InterceptConfigsPreRunHandler` (backport #16395) (#16399) Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + server/util.go | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3cc44f064..cfbe88faf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes +* (server) [#16395](https://github.com/cosmos/cosmos-sdk/pull/16395) Do not override some Comet config is purposely set differently in `InterceptConfigsPreRunHandler`. * (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`. * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. diff --git a/server/util.go b/server/util.go index 9d105671d4..ea8d9ffc98 100644 --- a/server/util.go +++ b/server/util.go @@ -233,12 +233,16 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo return nil, fmt.Errorf("error in config file: %w", err) } - conf.RPC.PprofListenAddress = "localhost:6060" - conf.P2P.RecvRate = 5120000 - conf.P2P.SendRate = 5120000 - conf.Consensus.TimeoutCommit = 5 * time.Second + defaultCometCfg := tmcfg.DefaultConfig() + // The SDK is opinionated about those comet values, so we set them here. + // We verify first that the user has not changed them for not overriding them. + if conf.Consensus.TimeoutCommit == defaultCometCfg.Consensus.TimeoutCommit { + conf.Consensus.TimeoutCommit = 5 * time.Second + } + if conf.RPC.PprofListenAddress == defaultCometCfg.RPC.PprofListenAddress { + conf.RPC.PprofListenAddress = "localhost:6060" + } tmcfg.WriteConfigFile(tmCfgFile, conf) - case err != nil: return nil, err From 2cd72b74ba8e0e5cdd31d7a3aeb2bd2e0da68875 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 2 Jun 2023 14:12:59 +0200 Subject: [PATCH 25/34] chore: prepare v0.47.3 (#16248) --- .golangci.yml | 2 ++ CHANGELOG.md | 4 +++- RELEASE_NOTES.md | 22 +++++++++++----------- go.mod | 2 ++ server/util.go | 5 +++-- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index ba3b4b5b9e..4b16301cbc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,6 +2,8 @@ run: tests: false # timeout for analysis, e.g. 30s, 5m, default is 1m timeout: 5m + skip-files: + - server/grpc/gogoreflection/serverreflection.go linters: disable-all: true diff --git a/CHANGELOG.md b/CHANGELOG.md index cfbe88faf2..5965b73850 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +## [v0.47.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.3) - 2023-06-05 + ### Features * (baseapp) [#16290](https://github.com/cosmos/cosmos-sdk/pull/16290) Add circuit breaker setter in baseapp. @@ -51,7 +53,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (gov) [#15979](https://github.com/cosmos/cosmos-sdk/pull/15979) Improve gov error message when failing to convert v1 proposal to v1beta1. * (store) [#16067](https://github.com/cosmos/cosmos-sdk/pull/16067) Add local snapshots management commands. * (server) [#16061](https://github.com/cosmos/cosmos-sdk/pull/16061) Add Comet bootstrap command. -* (snapshots) [#16060](https://github.com/cosmos/cosmos-sdk/pull/16060) Support saving restoring snapshot locally. +* (snapshots) [#16060](https://github.com/cosmos/cosmos-sdk/pull/16060) Support saving and restoring snapshot locally. * (x/staking) [#16068](https://github.com/cosmos/cosmos-sdk/pull/16068) Update simulation to allow non-EOA accounts to stake. * (server) [#16142](https://github.com/cosmos/cosmos-sdk/pull/16142) Remove JSON Indentation from the GRPC to REST gateway's responses. (Saving bandwidth) * (types) [#16145](https://github.com/cosmos/cosmos-sdk/pull/16145) Rename interface `ExtensionOptionI` back to `TxExtensionOptionI` to avoid breaking change. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 08bccc7f6d..4b596e9807 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,17 +1,17 @@ -# Cosmos SDK v0.47.2 Release Notes +# Cosmos SDK v0.47.3 Release Notes -💬 [**Release Discussion**](https://github.com/cosmos/community) - -## 📝 Changelog - -Check out the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.47.2/CHANGELOG.md) for an exhaustive list of changes or [compare changes](https://github.com/cosmos/cosmos-sdk/compare/release/v0.47.1...v0.47.2) from last release. - -Refer to the [upgrading guide](https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/UPGRADING.md) when migrating from `v0.46.x` to `v0.47.0`. +💬 [**Release Discussion**](https://github.com/orgs/cosmos/discussions/categories/announcements) ## 🚀 Highlights -For this second patch release of the `v0.47.x` line, we focused on fixing bugs and improving the developer experience. Missed the v0.47.0 announcement? Read it [here](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.0). +For this third patch release of the `v0.47.x` line, some of the notable changes include: -Notably, [a fix](https://github.com/cosmos/cosmos-sdk/pull/15683) for loading archival states (thank you @catShaark). -Additionally, the release fixes an issue where querying previous block heights would return an incorrect timestamp. +* A command to be able to bootstrap comet from a local snapshot with [` comet bootstrap-state`](https://docs.cosmos.network/v0.47/run-node/run-node#local-state-sync). +* Commands to manage snapshots: Add `snapshot.Cmd(appCreator)` to your chain root command for using them. +* The default logger is now `cosmossdk.io/log`, which supports coloring 🟥🟩🟪🟦 and filtering again. +* A bug fix in `x/group` migration. Chains migrating from v0.46.x to v0.47.x must use at least v0.47.**3**. + +Check out the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.47.3/CHANGELOG.md) for an exhaustive list of changes or [compare changes](https://github.com/cosmos/cosmos-sdk/compare/release/v0.47.2...v0.47.3) from last release. + +Refer to the [upgrading guide](https://github.com/cosmos/cosmos-sdk/blob/release/v0.47.x/UPGRADING.md) when migrating from `v0.46.x` to `v0.47.0`. diff --git a/go.mod b/go.mod index 3fd531b8d4..c128bffb27 100644 --- a/go.mod +++ b/go.mod @@ -182,6 +182,8 @@ replace ( ) retract ( + // revert fix https://github.com/cosmos/cosmos-sdk/pull/16331 + v0.46.12 // subject to a bug in the group module and gov module migration [v0.46.5, v0.46.6] // subject to the dragonberry vulnerability diff --git a/server/util.go b/server/util.go index ea8d9ffc98..0d88fb1909 100644 --- a/server/util.go +++ b/server/util.go @@ -299,8 +299,9 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo // add server commands func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator types.AppCreator, appExport types.AppExporter, addStartFlags types.ModuleInitFlags) { tendermintCmd := &cobra.Command{ - Use: "tendermint", - Short: "Tendermint subcommands", + Use: "tendermint", + Aliases: []string{"comet", "cometbft"}, + Short: "Tendermint subcommands", } tendermintCmd.AddCommand( From 616841b9704dac92285834382a8aa7be89845d7b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 12:34:34 +0000 Subject: [PATCH 26/34] chore: small snapshot commands & docs improvement (backport #16404) (#16408) Co-authored-by: Julien Robert --- client/snapshot/cmd.go | 1 - client/snapshot/export.go | 6 ++---- client/snapshot/list.go | 2 +- client/snapshot/load.go | 4 ++-- docs/docs/run-node/01-run-node.md | 35 ++++++++++++++++++++++++++++--- go.mod | 2 +- server/tm_cmds.go | 2 +- simapp/go.mod | 2 +- snapshots/README.md | 23 ++++++++++---------- 9 files changed, 51 insertions(+), 26 deletions(-) diff --git a/client/snapshot/cmd.go b/client/snapshot/cmd.go index f49f2b51c2..14388bc8d0 100644 --- a/client/snapshot/cmd.go +++ b/client/snapshot/cmd.go @@ -10,7 +10,6 @@ func Cmd(appCreator servertypes.AppCreator) *cobra.Command { cmd := &cobra.Command{ Use: "snapshots", Short: "Manage local snapshots", - Long: "Manage local snapshots", } cmd.AddCommand( ListSnapshotsCmd, diff --git a/client/snapshot/export.go b/client/snapshot/export.go index 6465b7f1e2..5ce7161626 100644 --- a/client/snapshot/export.go +++ b/client/snapshot/export.go @@ -1,8 +1,6 @@ package snapshot import ( - "fmt" - "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/spf13/cobra" @@ -33,7 +31,7 @@ func ExportSnapshotCmd(appCreator servertypes.AppCreator) *cobra.Command { height = app.CommitMultiStore().LastCommitID().Version } - fmt.Printf("Exporting snapshot for height %d\n", height) + cmd.Printf("Exporting snapshot for height %d\n", height) sm := app.SnapshotManager() snapshot, err := sm.Create(uint64(height)) @@ -41,7 +39,7 @@ func ExportSnapshotCmd(appCreator servertypes.AppCreator) *cobra.Command { return err } - fmt.Printf("Snapshot created at height %d, format %d, chunks %d\n", snapshot.Height, snapshot.Format, snapshot.Chunks) + cmd.Printf("Snapshot created at height %d, format %d, chunks %d\n", snapshot.Height, snapshot.Format, snapshot.Chunks) return nil }, } diff --git a/client/snapshot/list.go b/client/snapshot/list.go index 6ff6391d42..78612bf916 100644 --- a/client/snapshot/list.go +++ b/client/snapshot/list.go @@ -22,7 +22,7 @@ var ListSnapshotsCmd = &cobra.Command{ return fmt.Errorf("failed to list snapshots: %w", err) } for _, snapshot := range snapshots { - fmt.Println("height:", snapshot.Height, "format:", snapshot.Format, "chunks:", snapshot.Chunks) + cmd.Println("height:", snapshot.Height, "format:", snapshot.Format, "chunks:", snapshot.Chunks) } return nil diff --git a/client/snapshot/load.go b/client/snapshot/load.go index 6797d58baf..7834aa21e2 100644 --- a/client/snapshot/load.go +++ b/client/snapshot/load.go @@ -22,7 +22,7 @@ const SnapshotFileName = "_snapshot" func LoadArchiveCmd() *cobra.Command { return &cobra.Command{ Use: "load ", - Short: "Load a snapshot archive file into snapshot store", + Short: "Load a snapshot archive file (.tar.gz) into snapshot store", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { ctx := server.GetServerContextFromCmd(cmd) @@ -70,7 +70,7 @@ func LoadArchiveCmd() *cobra.Command { savedSnapshot, err := snapshotStore.Save(snapshot.Height, snapshot.Format, chunks) if err != nil { - fmt.Println("failed to save snapshot", err) + cmd.Println("failed to save snapshot", err) return } quitChan <- savedSnapshot diff --git a/docs/docs/run-node/01-run-node.md b/docs/docs/run-node/01-run-node.md index 8369920707..a040380272 100644 --- a/docs/docs/run-node/01-run-node.md +++ b/docs/docs/run-node/01-run-node.md @@ -152,12 +152,41 @@ log_level: "state:info,p2p:info,consensus:info,x/staking:info,x/ibc:info,*error" ## State Sync -State sync is the act in which a node syncs the latest or close to the latest state of a blockchain. This is useful for users who don't want to sync all the blocks in history. You can read more here: https://docs.cometbft.com/v0.37/core/state-sync +State sync is the act in which a node syncs the latest or close to the latest state of a blockchain. This is useful for users who don't want to sync all the blocks in history. Read more in [CometBFT documentation](https://docs.cometbft.com/v0.37/core/state-sync). + +State sync works thanks to snapshots. Read how the SDK handles snapshots [here](https://github.com/cosmos/cosmos-sdk/blob/825245d/store/snapshots/README.md). ### Local State Sync Local state sync work similar to normal state sync except that it works off a local snapshot of state instead of one provided via the p2p network. The steps to start local state sync are similar to normal state sync with a few different designs. 1. As mentioned in https://docs.cometbft.com/v0.37/core/state-sync, one must set a height and hash in the config.toml along with a few rpc servers (the afromentioned link has instructions on how to do this). -2. Bootsrapping Comet state in order to start the node after the snapshot has been ingested. This can be done with the bootstrap command ` comet bootstrap-state` - +2. Run ` ` to restore a local snapshot (note: first load it from a file with the *load* command). +3. Bootsrapping Comet state in order to start the node after the snapshot has been ingested. This can be done with the bootstrap command ` comet bootstrap-state` + +### Snapshots Commands + +The Cosmos SDK provides commands for managing snapshots. +These commands can be added in an app with the following snippet in `cmd//root.go`: + +```go +import ( + "github.com/cosmos/cosmos-sdk/client/snapshot" +) + +func initRootCmd(/* ... */) { + // ... + rootCmd.AddCommand( + snapshot.Cmd(appCreator), + ) +} +``` + +Then following commands are available at ` snapshots [command]`: + +* **list**: list local snapshots +* **load**: Load a snapshot archive file into snapshot store +* **restore**: Restore app state from local snapshot +* **export**: Export app state to snapshot store +* **dump**: Dump the snapshot as portable archive format +* **delete**: Delete a local snapshot diff --git a/go.mod b/go.mod index c128bffb27..1914ca20b3 100644 --- a/go.mod +++ b/go.mod @@ -177,7 +177,7 @@ replace ( // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 - // Downgraded to avoid bugs in following commits which caused simulations to fail. + // replace broken goleveldb github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 63b4e718d0..772c4fc897 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -209,7 +209,7 @@ func BootstrapStateCmd(appCreator types.AppCreator) *cobra.Command { }, } - cmd.Flags().Int64("height", 0, "Block height to bootstrap state at, if not provided will use the latest block height in app state") + cmd.Flags().Int64("height", 0, "Block height to bootstrap state at, if not provided it uses the latest block height in app state") return cmd } diff --git a/simapp/go.mod b/simapp/go.mod index c6b2607840..7a2315dd68 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -170,6 +170,6 @@ replace ( // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 - // Downgraded to avoid bugs in following commits which caused simulations to fail. + // replace broken goleveldb github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/snapshots/README.md b/snapshots/README.md index c4d011f1de..6de7232468 100644 --- a/snapshots/README.md +++ b/snapshots/README.md @@ -55,16 +55,16 @@ Snapshot settings are optional. However, if set, they have an effect on how prun persisting the heights that are multiples of `state-sync.snapshot-interval` until after the snapshot is complete. If pruning is enabled (not `pruning = "nothing"`), we avoid pruning heights that are multiples of -`state-sync.snapshot-interval` in the regular logic determined by the -pruning settings and applied after every `Commit()`. This is done to prevent a -height from being removed before a snapshot is complete. Therefore, we keep -such heights until after a snapshot is done. At this point, the height is sent to +`state-sync.snapshot-interval` in the regular logic determined by the +pruning settings and applied after every `Commit()`. This is done to prevent a +height from being removed before a snapshot is complete. Therefore, we keep +such heights until after a snapshot is done. At this point, the height is sent to the `pruning.Manager` to be pruned according to the pruning settings after the next `Commit()`. To illustrate, assume that we are currently at height 960 with `pruning-keep-recent = 50`, `pruning-interval = 10`, and `state-sync.snapshot-interval = 100`. Let's assume that the snapshot that was triggered at height `900` **just finishes**. Then, we can prune height -`900` right away (that is, when we call `Commit()` at height 960 because 900 is less than `960 - 50 = 910`. +`900` right away (that is, when we call `Commit()` at height 960 because 900 is less than `960 - 50 = 910`). Let's now assume that all conditions stay the same but the snapshot at height 900 is **not complete yet**. Then, we cannot prune it to avoid deleting a height that is still being snapshotted. Therefore, we keep track @@ -78,23 +78,22 @@ Note that in both examples, if we let current height = C, and previous height P P - `pruning-keep-recent` - `pruning-interval` <= h <= P - `pruning-keep-recent` -we can prune height h. In our first example, all heights 899 - 909 fall in this range and are pruned at height 960 as long as +we can prune height h. In our first example, all heights 899 - 909 fall in this range and are pruned at height 960 as long as h is not a snapshot height (E.g. 900). That is, we always use current height to determine at which height to prune (960) while we use previous to determine which heights are to be pruned (959 - 50 - 10 = 899-909 = 959 - 50). - ## Configuration * `state-sync.snapshot-interval` - * the interval at which to take snapshots. - * the value of 0 disables snapshots. - * if pruning is enabled, it is done after a snapshot is complete for the heights that are multiples of this interval. + * the interval at which to take snapshots. + * the value of 0 disables snapshots. + * if pruning is enabled, it is done after a snapshot is complete for the heights that are multiples of this interval. * `state-sync.snapshot-keep-recent`: - * the number of recent snapshots to keep. - * 0 means keep all. + * the number of recent snapshots to keep. + * 0 means keep all. ## Snapshot Metadata From ba2f1be04c4386b4b224415f0075d0ff99357d98 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 17:49:29 +0200 Subject: [PATCH 27/34] chore: change prepare and process proposal to be NoOps by default (backport #16407) (#16410) --- CHANGELOG.md | 1 + baseapp/baseapp.go | 9 ++++++++- docs/docs/building-apps/02-app-mempool.md | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5965b73850..0d37574410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (baseapp) [#16407](https://github.com/cosmos/cosmos-sdk/pull/16407) Make `DefaultProposalHandler.ProcessProposalHandler` return a ProcessProposal NoOp when using none or a NoOp mempool. * (deps) [#16083](https://github.com/cosmos/cosmos-sdk/pull/16083) Bumps `proto-builder` image to 0.13.0. * (client) [#16075](https://github.com/cosmos/cosmos-sdk/pull/16075) Partly revert [#15953](https://github.com/cosmos/cosmos-sdk/issues/15953) and `factory.Prepare` now does nothing in offline mode. * (server) [#15984](https://github.com/cosmos/cosmos-sdk/pull/15984) Use `cosmossdk.io/log` package for logging instead of CometBFT logger. NOTE: v0.45 and v0.46 were not using CometBFT logger either. This keeps the same underlying logger (zerolog) as in v0.45.x+ and v0.46.x+ but now properly supporting filtered logging. diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 95994e1472..3a90eaf2b8 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -951,7 +951,7 @@ func NewDefaultProposalHandler(mp mempool.Mempool, txVerifier ProposalTxVerifier // FIFO order. func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler { return func(ctx sdk.Context, req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { - // If the mempool is nil or a no-op mempool, we simply return the transactions + // If the mempool is nil or NoOp we simply return the transactions // requested from CometBFT, which, by default, should be in FIFO order. _, isNoOp := h.mempool.(mempool.NoOpMempool) if h.mempool == nil || isNoOp { @@ -1008,6 +1008,13 @@ func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHand // is used in both steps, and applications must ensure that this is the case in // non-default handlers. func (h DefaultProposalHandler) ProcessProposalHandler() sdk.ProcessProposalHandler { + // If the mempool is nil or NoOp we simply return ACCEPT, + // because PrepareProposal may have included txs that could fail verification. + _, isNoOp := h.mempool.(mempool.NoOpMempool) + if h.mempool == nil || isNoOp { + return NoOpProcessProposal() + } + return func(ctx sdk.Context, req abci.RequestProcessProposal) abci.ResponseProcessProposal { for _, txBytes := range req.Txs { _, err := h.txVerifier.ProcessProposalVerifyTx(txBytes) diff --git a/docs/docs/building-apps/02-app-mempool.md b/docs/docs/building-apps/02-app-mempool.md index 51c76a4c9d..b32b965477 100644 --- a/docs/docs/building-apps/02-app-mempool.md +++ b/docs/docs/building-apps/02-app-mempool.md @@ -43,7 +43,8 @@ all transactions, it can provide greater control over transaction ordering. Allowing the application to handle ordering enables the application to define how it would like the block constructed. -Currently, there is a default `PrepareProposal` implementation provided by the application. +The Cosmos SDK defines the `DefaultProposalHandler` type, which provides applications with +`PrepareProposal` and `ProcessProposal` handlers. ```go reference https://github.com/cosmos/cosmos-sdk/blob/v0.47.0-rc1/baseapp/baseapp.go#L868-L916 @@ -116,6 +117,9 @@ A no-op mempool is a mempool where transactions are completely discarded and ign When this mempool is used, it assumed that an application will rely on CometBFT's transaction ordering defined in `RequestPrepareProposal`, which is FIFO-ordered by default. +> Note: If a NoOp mempool is used, PrepareProposal and ProcessProposal both should be aware of this as +> PrepareProposal could include transactions that could fail verification in ProcessProposal. + ### Sender Nonce Mempool The nonce mempool is a mempool that keeps transactions from an sorted by nonce in order to avoid the issues with nonces. From dda81a2275d7a9553a74068e5edd22d942ad9124 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 6 Jun 2023 16:29:25 +0200 Subject: [PATCH 28/34] refactor: avoid breaking change due to #16415 included in v0.50 (#16430) --- baseapp/circuit.go | 6 ++---- baseapp/msg_service_router.go | 8 +++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/baseapp/circuit.go b/baseapp/circuit.go index 022ee6632c..3db0bc1bdc 100644 --- a/baseapp/circuit.go +++ b/baseapp/circuit.go @@ -1,10 +1,8 @@ package baseapp -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) +import "context" // CircuitBreaker is an interface that defines the methods for a circuit breaker. type CircuitBreaker interface { - IsAllowed(ctx sdk.Context, typeURL string) bool + IsAllowed(ctx context.Context, typeURL string) (bool, error) } diff --git a/baseapp/msg_service_router.go b/baseapp/msg_service_router.go index ff448086b8..ec68ffd4c4 100644 --- a/baseapp/msg_service_router.go +++ b/baseapp/msg_service_router.go @@ -124,7 +124,13 @@ func (msr *MsgServiceRouter) RegisterService(sd *grpc.ServiceDesc, handler inter if msr.circuitBreaker != nil { msgURL := sdk.MsgTypeURL(req) - if !msr.circuitBreaker.IsAllowed(ctx, msgURL) { + + isAllowed, err := msr.circuitBreaker.IsAllowed(ctx, msgURL) + if err != nil { + return nil, err + } + + if !isAllowed { return nil, fmt.Errorf("circuit breaker disables execution of this message: %s", msgURL) } } From 48becdf19a342e7478aa5839e6c10c985cbfc63b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 18:22:35 +0200 Subject: [PATCH 29/34] docs: improve upgrading.md and changelog (backport #16429) (#16431) Co-authored-by: Julien Robert --- UPGRADING.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index f4311b7eb6..db7994f36f 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -178,6 +178,19 @@ The `params` module will be removed in `v0.48`, as mentioned [in v0.46 release]( When performing a chain migration, the params table must be initizalied manually. This was done in the modules keepers in previous versions. Have a look at `simapp.RegisterUpgradeHandlers()` for an example. +#### `x/crisis` + +With the migrations of all modules away from `x/params`, the crisis module now has a store. +The store must be created during a chain upgrade to v0.47.x. + +```go +storetypes.StoreUpgrades{ + Added: []string{ + crisistypes.ModuleName, + }, +} +``` + #### `x/gov` ##### Minimum Proposal Deposit At Time of Submission @@ -190,7 +203,7 @@ By default, the new `MinInitialDepositRatio` parameter is set to zero during mig feature is disabled. If chains wish to utilize the minimum proposal deposits at time of submission, the migration logic needs to be modified to set the new parameter to the desired value. -##### New Proposal.Proposer field +##### New `Proposal.Proposer` field The `Proposal` proto has been updated with proposer field. For proposal state migraton developers can call `v4.AddProposerAddressToProposal` in their upgrade handler to update all existing proposal and make them compatible and **this migration is optional**. @@ -246,7 +259,17 @@ func (app SimApp) RegisterUpgradeHandlers() { } ``` -The old params module is required to still be imported in your app.go in order to handle this migration. +The `x/params` module should still be imported in your app.go in order to handle this migration. + +Because the `x/consensus` module is a new module, its store must be added while upgrading to v0.47.x: + +```go +storetypes.StoreUpgrades{ + Added: []string{ + consensustypes.ModuleName, + }, +} +``` ##### `app.go` changes From 3bbc0aaed7d3270d5aaecd86d950aca33a5cecfb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:41:30 +0000 Subject: [PATCH 30/34] fix: StateSync Restore by excluding memory store (backport #16449) (#16452) Co-authored-by: Chill Validation <92176880+chillyvee@users.noreply.github.com> Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + store/rootmulti/store.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d37574410..bab7f0ec79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes * (server) [#16395](https://github.com/cosmos/cosmos-sdk/pull/16395) Do not override some Comet config is purposely set differently in `InterceptConfigsPreRunHandler`. +* (store) [#16449](https://github.com/cosmos/cosmos-sdk/pull/16449) Fix StateSync Restore by excluding memory store. * (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`. * (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration. diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index ae9e5cff7e..79865502a3 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -996,7 +996,8 @@ func (rs *Store) buildCommitInfo(version int64) *types.CommitInfo { storeInfos := []types.StoreInfo{} for _, key := range keys { store := rs.stores[key] - if store.GetStoreType() == types.StoreTypeTransient { + storeType := store.GetStoreType() + if storeType == types.StoreTypeTransient || storeType == types.StoreTypeMemory { continue } storeInfos = append(storeInfos, types.StoreInfo{ From cfc757dc5043fb2758c47c146d2912fd010c1a45 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 8 Jun 2023 11:23:26 +0200 Subject: [PATCH 31/34] chore: prepare v0.47.3 (2/2) (#16444) --- CHANGELOG.md | 3 +- RELEASE_NOTES.md | 1 + UPGRADING.md | 121 ----------------------------------------------- 3 files changed, 3 insertions(+), 122 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bab7f0ec79..151bb2345f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] -## [v0.47.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.3) - 2023-06-05 +## [v0.47.3](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.3) - 2023-06-08 ### Features @@ -62,6 +62,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes +* Fix [barberry](https://forum.cosmos.network/t/cosmos-sdk-security-advisory-barberry/10825) security vulnerability. * (server) [#16395](https://github.com/cosmos/cosmos-sdk/pull/16395) Do not override some Comet config is purposely set differently in `InterceptConfigsPreRunHandler`. * (store) [#16449](https://github.com/cosmos/cosmos-sdk/pull/16449) Fix StateSync Restore by excluding memory store. * (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4b596e9807..5989816825 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,6 +7,7 @@ Missed the v0.47.0 announcement? Read it [here](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.0). For this third patch release of the `v0.47.x` line, some of the notable changes include: +* The [barberry](https://forum.cosmos.network/t/cosmos-sdk-security-advisory-barberry/10825) security vulnerability is resolved. All chains using Cosmos SDK `<= v0.47.2` are advised to upgrade to `v0.47.3` **immediately**. A chain is safe as soon as **33%+1** of the voting power has upgraded. Coordinate with your validators to upgrade as soon as possible. * A command to be able to bootstrap comet from a local snapshot with [` comet bootstrap-state`](https://docs.cosmos.network/v0.47/run-node/run-node#local-state-sync). * Commands to manage snapshots: Add `snapshot.Cmd(appCreator)` to your chain root command for using them. * The default logger is now `cosmossdk.io/log`, which supports coloring 🟥🟩🟪🟦 and filtering again. diff --git a/UPGRADING.md b/UPGRADING.md index db7994f36f..2401b65434 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -293,124 +293,3 @@ This means chain developers need to validate the `classID` and `nftID` of an NFT Ledger support has been generalized to enable use of different apps and keytypes that use `secp256k1`. The Ledger interface remains the same, but it can now be provided through the Keyring `Options`, allowing higher-level chains to connect to different Ledger apps or use custom implementations. In addition, higher-level chains can provide custom key implementations around the Ledger public key, to enable greater flexibility with address generation and signing. This is not a breaking change, as all values will default to use the standard Cosmos app implementation unless specified otherwise. - -## [v0.46.x](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.0) - -### Go API Changes - -The `replace google.golang.org/grpc` directive can be removed from the `go.mod`, it is no more required to block the version. - -A few packages that were deprecated in the previous version are now removed. - -For instance, the REST API, deprecated in v0.45, is now removed. If you have not migrated yet, please follow the [instructions](https://docs.cosmos.network/v0.45/migrations/rest.html). - -To improve clarity of the API, some renaming and improvements has been done: - -| Package | Previous | Current | -| --------- | ---------------------------------- | ------------------------------------ | -| `simapp` | `encodingConfig.Marshaler` | `encodingConfig.Codec` | -| `simapp` | `FundAccount`, `FundModuleAccount` | Functions moved to `x/bank/testutil` | -| `types` | `AccAddressFromHex` | `AccAddressFromHexUnsafe` | -| `x/auth` | `MempoolFeeDecorator` | Use `DeductFeeDecorator` instead | -| `x/bank` | `AddressFromBalancesStore` | `AddressAndDenomFromBalancesStore` | -| `x/gov` | `keeper.DeleteDeposits` | `keeper.DeleteAndBurnDeposits` | -| `x/gov` | `keeper.RefundDeposits` | `keeper.RefundAndDeleteDeposits` | -| `x/{mod}` | package `legacy` | package `migrations` | - -For the exhaustive list of API renaming, please refer to the [CHANGELOG](https://github.com/cosmos/cosmos-sdk/blob/main/CHANGELOG.md). - -#### new packages - -Additionally, new packages have been introduced in order to further split the codebase. Aliases are available for a new API breaking migration, but it is encouraged to migrate to this new packages: - -* `errors` should replace `types/errors` when registering errors or wrapping SDK errors. -* `math` contains the `Int` or `Uint` types that are used in the SDK. -* `x/nft` an NFT base module. -* `x/group` a group module allowing to create DAOs, multisig and policies. Greatly composes with `x/authz`. - -#### `x/authz` - -* `authz.NewMsgGrant` `expiration` is now a pointer. When `nil` is used, then no expiration will be set (grant won't expire). -* `authz.NewGrant` takes a new argument: block time, to correctly validate expire time. - -### Keyring - -The keyring has been refactored in v0.46. - -* The `Unsafe*` interfaces have been removed from the keyring package. Please use interface casting if you wish to access those unsafe functions. -* The keys' implementation has been refactored to be serialized as proto. -* `keyring.NewInMemory` and `keyring.New` takes now a `codec.Codec`. -* Take `keyring.Record` instead of `Info` as first argument in: - * `MkConsKeyOutput` - * `MkValKeyOutput` - * `MkAccKeyOutput` -* Rename: - * `SavePubKey` to `SaveOfflineKey` and remove the `algo` argument. - * `NewMultiInfo`, `NewLedgerInfo` to `NewLegacyMultiInfo`, `newLegacyLedgerInfo` respectively. - * `NewOfflineInfo` to `newLegacyOfflineInfo` and move it to `migration_test.go`. - -### PostHandler - -A `postHandler` is like an `antehandler`, but is run _after_ the `runMsgs` execution. It is in the same store branch that `runMsgs`, meaning that both `runMsgs` and `postHandler`. This allows to run a custom logic after the execution of the messages. - -### IAVL - -v0.19.0 IAVL introduces a new "fast" index. This index represents the latest state of the -IAVL laid out in a format that preserves data locality by key. As a result, it allows for faster queries and iterations -since data can now be read in lexicographical order that is frequent for Cosmos-SDK chains. - -The first time the chain is started after the upgrade, the aforementioned index is created. The creation process -might take time and depends on the size of the latest state of the chain. For example, Osmosis takes around 15 minutes to rebuild the index. - -While the index is being created, node operators can observe the following in the logs: -"Upgrading IAVL storage for faster queries + execution on the live state. This may take a while". The store -key is appended to the message. The message is printed for every module that has a non-transient store. -As a result, it gives a good indication of the progress of the upgrade. - -There is also downgrade and re-upgrade protection. If a node operator chooses to downgrade to IAVL pre-fast index, and then upgrade again, the index is rebuilt from scratch. This implementation detail should not be relevant in most cases. It was added as a safeguard against operator -mistakes. - -### Modules - -#### `x/params` - -* The `x/params` module has been depreacted in favour of each module housing and providing way to modify their parameters. Each module that has parameters that are changable during runtime have an authority, the authority can be a module or user account. The Cosmos SDK team recommends migrating modules away from using the param module. An example of how this could look like can be found [here](https://github.com/cosmos/cosmos-sdk/pull/12363). -* The Param module will be maintained until April 18, 2023. At this point the module will reach end of life and be removed from the Cosmos SDK. - -#### `x/gov` - -The `gov` module has been greatly improved. The previous API has been moved to `v1beta1` while the new implementation is called `v1`. - -In order to submit a proposal with `submit-proposal` you now need to pass a `proposal.json` file. -You can still use the old way by using `submit-legacy-proposal`. This is not recommended. -More information can be found in the gov module [client documentation](https://docs.cosmos.network/v0.46/modules/gov/07_client.html). - -#### `x/staking` - -The `staking module` added a new message type to cancel unbonding delegations. Users that have unbonded by accident or wish to cancel a undelegation can now specify the amount and valdiator they would like to cancel the unbond from - -### Protobuf - -The `third_party/proto` folder that existed in [previous version](https://github.com/cosmos/cosmos-sdk/tree/v0.45.3/third_party/proto) now does not contains directly the [proto files](https://github.com/cosmos/cosmos-sdk/tree/release/v0.46.x/third_party/proto). - -Instead, the SDK uses [`buf`](https://buf.build). Clients should have their own [`buf.yaml`](https://docs.buf.build/configuration/v1/buf-yaml) with `buf.build/cosmos/cosmos-sdk` as dependency, in order to avoid having to copy paste these files. - -The protos can as well be downloaded using `buf export buf.build/cosmos/cosmos-sdk:8cb30a2c4de74dc9bd8d260b1e75e176 --output `. - -Cosmos message protobufs should be extended with `cosmos.msg.v1.signer`: - -```protobuf -message MsgSetWithdrawAddress { - option (cosmos.msg.v1.signer) = "delegator_address"; ++ - - option (gogoproto.equal) = false; - option (gogoproto.goproto_getters) = false; - - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - string withdraw_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; -} -``` - - - -When clients interract with a node they are required to set a codec in in the grpc.Dial. More information can be found in this [doc](https://docs.cosmos.network/v0.46/run-node/interact-node.html#programmatically-via-go). From 666c345ad23ddda9523cc5cd1b71187d91c26f34 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 8 Jun 2023 18:04:36 +0200 Subject: [PATCH 32/34] fix: patch barberry (#16465) --- x/auth/vesting/types/msgs.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x/auth/vesting/types/msgs.go b/x/auth/vesting/types/msgs.go index fbce860ced..f2194af569 100644 --- a/x/auth/vesting/types/msgs.go +++ b/x/auth/vesting/types/msgs.go @@ -182,6 +182,14 @@ func (msg MsgCreatePeriodicVestingAccount) ValidateBasic() error { } for i, period := range msg.VestingPeriods { + if !period.Amount.IsValid() { + return sdkerrors.ErrInvalidCoins.Wrap(period.Amount.String()) + } + + if !period.Amount.IsAllPositive() { + return sdkerrors.ErrInvalidCoins.Wrap(period.Amount.String()) + } + if period.Length < 1 { return fmt.Errorf("invalid period length of %d in period %d, length must be greater than 0", period.Length, i) } From ba224368b644694339176dbd8cd24b4f2625013e Mon Sep 17 00:00:00 2001 From: yutianwu Date: Fri, 9 Jun 2023 16:55:09 +0800 Subject: [PATCH 33/34] fix ci cases --- baseapp/block_gas_test.go | 2 +- client/prompt_validation_test.go | 6 +++--- contrib/images/simd-dlv/Dockerfile | 6 +++--- contrib/images/simd-env/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index b8bb84c5ca..4b48ccfde3 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -174,7 +174,7 @@ func TestBaseApp_BlockGas(t *testing.T) { require.Equal(t, []byte("ok"), okValue) } // check block gas is always consumed - baseGas := uint64(3620) // baseGas is the gas consumed before tx msg + baseGas := uint64(3530) // baseGas is the gas consumed before tx msg expGasConsumed := addUint64Saturating(tc.gasToConsume, baseGas) if expGasConsumed > txtypes.MaxGasWanted { // capped by gasLimit diff --git a/client/prompt_validation_test.go b/client/prompt_validation_test.go index eba30c21c4..6936d134be 100644 --- a/client/prompt_validation_test.go +++ b/client/prompt_validation_test.go @@ -24,9 +24,9 @@ func TestValidatePromptURL(t *testing.T) { func TestValidatePromptAddress(t *testing.T) { require := require.New(t) - require.NoError(client.ValidatePromptAddress("cosmos1huydeevpz37sd9snkgul6070mstupukw00xkw9")) - require.NoError(client.ValidatePromptAddress("cosmosvaloper1sjllsnramtg3ewxqwwrwjxfgc4n4ef9u2lcnj0")) - require.NoError(client.ValidatePromptAddress("cosmosvalcons1ntk8eualewuprz0gamh8hnvcem2nrcdsgz563h")) + require.NoError(client.ValidatePromptAddress("0x319D057ce294319bA1fa5487134608727e1F3e29")) + require.NoError(client.ValidatePromptAddress("0x319D057ce294319bA1fa5487134608727e1F3e29")) + require.NoError(client.ValidatePromptAddress("0x319D057ce294319bA1fa5487134608727e1F3e29")) require.ErrorContains(client.ValidatePromptAddress("foo"), "invalid address") } diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index 01216ee224..e7eac6d16f 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -13,6 +13,9 @@ COPY depinject/go.mod depinject/go.sum /work/depinject/ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/ RUN go mod download +ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__" +ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" + COPY ./ /work RUN LEDGER_ENABLED=false make COSMOS_BUILD_OPTIONS="debug,nostrip" clean build @@ -26,9 +29,6 @@ STOPSIGNAL SIGTERM VOLUME /simd WORKDIR /simd -ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__" -ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" - COPY contrib/images/simd-dlv/wrapper.sh /usr/bin/wrapper.sh COPY --from=build /work/build/simd /simd/ COPY --from=build /go/bin/dlv /usr/local/bin diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 49c001c9e1..d01c5cbc83 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -19,6 +19,9 @@ RUN git config --global url."https://${GH_TOKEN}@github.com".insteadOf "https:// RUN go mod download +ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__" +ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" + COPY ./ /work RUN LEDGER_ENABLED=false make clean build @@ -32,8 +35,5 @@ STOPSIGNAL SIGTERM VOLUME /simd WORKDIR /simd -ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__" -ENV CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" - COPY contrib/images/simd-env/wrapper.sh /usr/bin/wrapper.sh COPY --from=build /work/build/simd /simd/ From af6ab45ebd7c5315feae2d93df7fa345327b9900 Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Mon, 12 Jun 2023 10:50:15 +0800 Subject: [PATCH 34/34] revert perpare proposal fix --- baseapp/baseapp.go | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 7fe4e830b7..06067e92ba 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -891,13 +891,10 @@ func createEvents(events sdk.Events, msg sdk.Msg) sdk.Events { // PrepareProposal state internally will be discarded. will be // returned if the transaction cannot be encoded. will be returned if // the transaction is valid, otherwise will be returned. -func (app *BaseApp) PrepareProposalVerifyTx(tx sdk.Tx, bz []byte) ([]byte, error) { - var err error - if bz == nil { - bz, err = app.txEncoder(tx) - if err != nil { - return nil, err - } +func (app *BaseApp) PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error) { + bz, err := app.txEncoder(tx) + if err != nil { + return nil, err } _, _, _, _, err = app.runTx(runTxPrepareProposal, bz) //nolint:dogsled @@ -932,7 +929,7 @@ type ( // that any custom ABCI PrepareProposal and ProcessProposal handler can use // to verify a transaction. ProposalTxVerifier interface { - PrepareProposalVerifyTx(tx sdk.Tx, txBz []byte) ([]byte, error) + PrepareProposalVerifyTx(tx sdk.Tx) ([]byte, error) ProcessProposalVerifyTx(txBz []byte) (sdk.Tx, error) } @@ -973,24 +970,18 @@ func NewDefaultProposalHandler(mp mempool.Mempool, txVerifier ProposalTxVerifier // FIFO order. func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHandler { return func(ctx sdk.Context, req abci.RequestPrepareProposal) abci.ResponsePrepareProposal { - var ( - selectedTxs [][]byte - totalTxBytes int64 - ) - // If the mempool is nil or NoOp we simply return the transactions // requested from CometBFT, which, by default, should be in FIFO order. _, isNoOp := h.mempool.(mempool.NoOpMempool) if h.mempool == nil || isNoOp { - for _, txBz := range req.Txs { // req.MaxTxBytes has been ensured - bz, err := h.txVerifier.PrepareProposalVerifyTx(nil, txBz) - if err == nil { - selectedTxs = append(selectedTxs, bz) - } - } - return abci.ResponsePrepareProposal{Txs: selectedTxs} + return abci.ResponsePrepareProposal{Txs: req.Txs} } + var ( + selectedTxs [][]byte + totalTxBytes int64 + ) + iterator := h.mempool.Select(ctx, req.Txs) for iterator != nil { @@ -1000,7 +991,7 @@ func (h DefaultProposalHandler) PrepareProposalHandler() sdk.PrepareProposalHand // which calls mempool.Insert, in theory everything in the pool should be // valid. But some mempool implementations may insert invalid txs, so we // check again. - bz, err := h.txVerifier.PrepareProposalVerifyTx(memTx, nil) + bz, err := h.txVerifier.PrepareProposalVerifyTx(memTx) if err != nil { err := h.mempool.Remove(memTx) if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {