cleanup

x/e2ee/keeper/keeper.go

@@ -28,16 +28,26 @@ func NewKeeper(storeKey storetypes.StoreKey, addressCodec address.Codec) Keeper
 	}
 }
 
+func (k Keeper) registerEncryptionKey(
+	ctx context.Context,
+	address string,
+	key []byte,
+) error {
+	bz, err := k.addressCodec.StringToBytes(address)
+	if err != nil {
+		return err
+	}
+	sdk.UnwrapSDKContext(ctx).KVStore(k.storeKey).Set(types.KeyPrefix(bz), key)
+	return nil
+}
+
 func (k Keeper) RegisterEncryptionKey(
 	ctx context.Context,
 	req *types.MsgRegisterEncryptionKey,
 ) (*types.MsgRegisterEncryptionKeyResponse, error) {
-	bz, err := k.addressCodec.StringToBytes(req.Address)
-	if err != nil {
+	if err := k.registerEncryptionKey(ctx, req.Address, []byte(req.Key)); err != nil {
 		return nil, err
 	}
-	sdkCtx := sdk.UnwrapSDKContext(ctx)
-	sdkCtx.KVStore(k.storeKey).Set(types.KeyPrefix(bz), []byte(req.Key))
 	return &types.MsgRegisterEncryptionKeyResponse{}, nil
 }
 
@@ -46,14 +56,7 @@ func (k Keeper) InitGenesis(
 	state *types.GenesisState,
 ) error {
 	for _, key := range state.Keys {
-		m := types.MsgRegisterEncryptionKey{
-			Address: key.Address,
-			Key:     key.Key,
-		}
-		if err := m.ValidateBasic(); err != nil {
-			return err
-		}
-		if _, err := k.RegisterEncryptionKey(ctx, &m); err != nil {
+		if err := k.registerEncryptionKey(ctx, key.Address, []byte(key.Key)); err != nil {
 			return err
 		}
 	}

x/e2ee/types/keys.go

@@ -1,8 +1,6 @@
 package types
 
 import (
-	"errors"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -39,8 +37,8 @@ func (e EncryptionKeyEntry) Validate() error {
 	if _, err := sdk.AccAddressFromBech32(e.Address); err != nil {
 		return err
 	}
-	if len(e.Key) == 0 {
-		return errors.New("key can't be nil")
+	if err := ValidateRecipientKey(e.Key); err != nil {
+		return err
 	}
 	return nil
 }

x/e2ee/types/msg.go

@@ -8,19 +8,17 @@ import (
 )
 
 func (m *MsgRegisterEncryptionKey) ValidateBasic() error {
-	if m.Address == "" {
-		return fmt.Errorf("address cannot be empty")
-	}
-	if len(m.Key) == 0 {
-		return fmt.Errorf("key cannot be empty")
-	}
-
-	if _, err := age.ParseX25519Recipient(m.Key); err != nil {
-		return err
-	}
 	// validate bech32 format of Address
 	if _, err := sdk.AccAddressFromBech32(m.Address); err != nil {
 		return fmt.Errorf("invalid address: %s", err)
 	}
+	if err := ValidateRecipientKey(m.Key); err != nil {
+		return err
+	}
 	return nil
 }
+
+func ValidateRecipientKey(key string) error {
+	_, err := age.ParseX25519Recipient(key)
+	return err
+}