refactor!: mv AddressCodecs aliases from runtime -> core (#19747)
Co-authored-by: Marko <marbar3778@yahoo.com>
This commit is contained in:
+5
-13
@@ -142,7 +142,7 @@ func SetupAppBuilder(inputs AppInputs) {
|
||||
app.ModuleManager.RegisterLegacyAminoCodec(inputs.LegacyAmino)
|
||||
}
|
||||
|
||||
func ProvideInterfaceRegistry(addressCodec address.Codec, validatorAddressCodec ValidatorAddressCodec, customGetSigners []signing.CustomGetSigner) (codectypes.InterfaceRegistry, error) {
|
||||
func ProvideInterfaceRegistry(addressCodec address.Codec, validatorAddressCodec address.ValidatorAddressCodec, customGetSigners []signing.CustomGetSigner) (codectypes.InterfaceRegistry, error) {
|
||||
signingOptions := signing.Options{
|
||||
AddressCodec: addressCodec,
|
||||
ValidatorAddressCodec: validatorAddressCodec,
|
||||
@@ -245,28 +245,20 @@ func ProvideAppVersionModifier(app *AppBuilder) baseapp.AppVersionModifier {
|
||||
return app.app
|
||||
}
|
||||
|
||||
type (
|
||||
// ValidatorAddressCodec is an alias for address.Codec for validator addresses.
|
||||
ValidatorAddressCodec address.Codec
|
||||
|
||||
// ConsensusAddressCodec is an alias for address.Codec for validator consensus addresses.
|
||||
ConsensusAddressCodec address.Codec
|
||||
)
|
||||
|
||||
type AddressCodecInputs struct {
|
||||
depinject.In
|
||||
|
||||
AuthConfig *authmodulev1.Module `optional:"true"`
|
||||
StakingConfig *stakingmodulev1.Module `optional:"true"`
|
||||
|
||||
AddressCodecFactory func() address.Codec `optional:"true"`
|
||||
ValidatorAddressCodecFactory func() ValidatorAddressCodec `optional:"true"`
|
||||
ConsensusAddressCodecFactory func() ConsensusAddressCodec `optional:"true"`
|
||||
AddressCodecFactory func() address.Codec `optional:"true"`
|
||||
ValidatorAddressCodecFactory func() address.ValidatorAddressCodec `optional:"true"`
|
||||
ConsensusAddressCodecFactory func() address.ConsensusAddressCodec `optional:"true"`
|
||||
}
|
||||
|
||||
// ProvideAddressCodec provides an address.Codec to the container for any
|
||||
// modules that want to do address string <> bytes conversion.
|
||||
func ProvideAddressCodec(in AddressCodecInputs) (address.Codec, ValidatorAddressCodec, ConsensusAddressCodec) {
|
||||
func ProvideAddressCodec(in AddressCodecInputs) (address.Codec, address.ValidatorAddressCodec, address.ConsensusAddressCodec) {
|
||||
if in.AddressCodecFactory != nil && in.ValidatorAddressCodecFactory != nil && in.ConsensusAddressCodecFactory != nil {
|
||||
return in.AddressCodecFactory(), in.ValidatorAddressCodecFactory(), in.ConsensusAddressCodecFactory()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user