feat(client/v2): Add clientCtx to commands in autocli (#17709)
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
Julien Robert
parent
c7e0bd7b54
commit
a0bd4e9fb6
@@ -109,9 +109,7 @@ func NewRootCmd() *cobra.Command {
|
||||
|
||||
autoCliOpts := tempApp.AutoCliOpts()
|
||||
autoCliOpts.Keyring = initClientCtx.Keyring
|
||||
autoCliOpts.AddressCodec = initClientCtx.AddressCodec
|
||||
autoCliOpts.ValidatorAddressCodec = initClientCtx.ValidatorAddressCodec
|
||||
autoCliOpts.ConsensusAddressCodec = initClientCtx.ConsensusAddressCodec
|
||||
autoCliOpts.ClientCtx = &initClientCtx
|
||||
|
||||
if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil {
|
||||
panic(err)
|
||||
|
||||
@@ -36,7 +36,7 @@ func NewRootCmd() *cobra.Command {
|
||||
txConfig client.TxConfig
|
||||
autoCliOpts autocli.AppOptions
|
||||
moduleBasicManager module.BasicManager
|
||||
initClientCtx client.Context
|
||||
clientCtx *client.Context
|
||||
)
|
||||
|
||||
if err := depinject.Inject(
|
||||
@@ -55,7 +55,7 @@ func NewRootCmd() *cobra.Command {
|
||||
&txConfig,
|
||||
&autoCliOpts,
|
||||
&moduleBasicManager,
|
||||
&initClientCtx,
|
||||
&clientCtx,
|
||||
); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@@ -69,6 +69,7 @@ func NewRootCmd() *cobra.Command {
|
||||
cmd.SetOut(cmd.OutOrStdout())
|
||||
cmd.SetErr(cmd.ErrOrStderr())
|
||||
|
||||
initClientCtx := *clientCtx
|
||||
initClientCtx = initClientCtx.WithCmdContext(cmd.Context())
|
||||
initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
|
||||
if err != nil {
|
||||
@@ -123,7 +124,7 @@ func ProvideClientContext(
|
||||
addressCodec address.Codec,
|
||||
validatorAddressCodec runtime.ValidatorAddressCodec,
|
||||
consensusAddressCodec runtime.ConsensusAddressCodec,
|
||||
) client.Context {
|
||||
) *client.Context {
|
||||
var err error
|
||||
|
||||
initClientCtx := client.Context{}.
|
||||
@@ -145,11 +146,11 @@ func ProvideClientContext(
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return initClientCtx
|
||||
return &initClientCtx
|
||||
}
|
||||
|
||||
func ProvideKeyring(clientCtx client.Context, addressCodec address.Codec) (clientv2keyring.Keyring, error) {
|
||||
kb, err := client.NewKeyringFromBackend(clientCtx, clientCtx.Keyring.Backend())
|
||||
func ProvideKeyring(clientCtx *client.Context, addressCodec address.Codec) (clientv2keyring.Keyring, error) {
|
||||
kb, err := client.NewKeyringFromBackend(*clientCtx, clientCtx.Keyring.Backend())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user