From e24472f9acb54de1e1ff133e505f2cff24688307 Mon Sep 17 00:00:00 2001 From: Mark Rushakoff Date: Fri, 7 Apr 2023 14:08:31 -0400 Subject: [PATCH] style!: rename direct_aux package to directaux (#15742) --- x/tx/CHANGELOG.md | 1 + x/tx/signing/{direct_aux => directaux}/direct_aux.go | 2 +- x/tx/signing/{direct_aux => directaux}/direct_aux_test.go | 6 +++--- x/tx/signing/std/handler_map.go | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) rename x/tx/signing/{direct_aux => directaux}/direct_aux.go (99%) rename x/tx/signing/{direct_aux => directaux}/direct_aux_test.go (96%) diff --git a/x/tx/CHANGELOG.md b/x/tx/CHANGELOG.md index b7498a1f78..1b314b76b0 100644 --- a/x/tx/CHANGELOG.md +++ b/x/tx/CHANGELOG.md @@ -35,6 +35,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [#15581](https://github.com/cosmos/cosmos-sdk/pull/15581) `GetSignersOptions` and `directaux.SignModeHandlerOptions` now require a `signing.ProtoFileResolver` interface instead of `protodesc.Resolver`. +* [#15742](https://github.com/cosmos/cosmos-sdk/pull/15742) The `direct_aux` package has been renamed to `directaux` in line with Go conventions. No other types were changed during the package rename. ### Bug Fixes diff --git a/x/tx/signing/direct_aux/direct_aux.go b/x/tx/signing/directaux/direct_aux.go similarity index 99% rename from x/tx/signing/direct_aux/direct_aux.go rename to x/tx/signing/directaux/direct_aux.go index b3ac2c1332..791418d992 100644 --- a/x/tx/signing/direct_aux/direct_aux.go +++ b/x/tx/signing/directaux/direct_aux.go @@ -1,4 +1,4 @@ -package direct_aux +package directaux import ( "context" diff --git a/x/tx/signing/direct_aux/direct_aux_test.go b/x/tx/signing/directaux/direct_aux_test.go similarity index 96% rename from x/tx/signing/direct_aux/direct_aux_test.go rename to x/tx/signing/directaux/direct_aux_test.go index 2b82ce59dd..697e0abaff 100644 --- a/x/tx/signing/direct_aux/direct_aux_test.go +++ b/x/tx/signing/directaux/direct_aux_test.go @@ -1,4 +1,4 @@ -package direct_aux_test +package directaux_test import ( "context" @@ -16,7 +16,7 @@ import ( signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1" txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1" "cosmossdk.io/x/tx/signing" - "cosmossdk.io/x/tx/signing/direct_aux" + "cosmossdk.io/x/tx/signing/directaux" ) func TestDirectAuxHandler(t *testing.T) { @@ -83,7 +83,7 @@ func TestDirectAuxHandler(t *testing.T) { AuthInfoBytes: authInfoBz, BodyBytes: bodyBz, } - modeHandler, err := direct_aux.NewSignModeHandler(direct_aux.SignModeHandlerOptions{}) + modeHandler, err := directaux.NewSignModeHandler(directaux.SignModeHandlerOptions{}) require.NoError(t, err) t.Log("verify fee payer cannot use SIGN_MODE_DIRECT_AUX") diff --git a/x/tx/signing/std/handler_map.go b/x/tx/signing/std/handler_map.go index 04447c9ccb..e7f70b541a 100644 --- a/x/tx/signing/std/handler_map.go +++ b/x/tx/signing/std/handler_map.go @@ -4,7 +4,7 @@ import ( "cosmossdk.io/x/tx/signing" "cosmossdk.io/x/tx/signing/aminojson" "cosmossdk.io/x/tx/signing/direct" - "cosmossdk.io/x/tx/signing/direct_aux" + "cosmossdk.io/x/tx/signing/directaux" "cosmossdk.io/x/tx/signing/textual" ) @@ -13,7 +13,7 @@ type SignModeOptions struct { // Textual are options for SIGN_MODE_TEXTUAL Textual textual.SignModeOptions // DirectAux are options for SIGN_MODE_DIRECT_AUX - DirectAux direct_aux.SignModeHandlerOptions + DirectAux directaux.SignModeHandlerOptions // AminoJSON are options for SIGN_MODE_LEGACY_AMINO_JSON AminoJSON aminojson.SignModeHandlerOptions } @@ -26,7 +26,7 @@ func (s SignModeOptions) HandlerMap() (*signing.HandlerMap, error) { return nil, err } - directAux, err := direct_aux.NewSignModeHandler(s.DirectAux) + directAux, err := directaux.NewSignModeHandler(s.DirectAux) if err != nil { return nil, err }