From 54daf844e07bc096a289871664252381b17b5fab Mon Sep 17 00:00:00 2001 From: constwz Date: Wed, 10 Jul 2024 11:42:57 +0800 Subject: [PATCH] fix: Remove cross-chain operation restrictions --- x/storage/keeper/keeper.go | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/x/storage/keeper/keeper.go b/x/storage/keeper/keeper.go index 199424d12..55ae29e7f 100644 --- a/x/storage/keeper/keeper.go +++ b/x/storage/keeper/keeper.go @@ -221,7 +221,7 @@ func (k Keeper) DeleteBucket(ctx sdk.Context, operator sdk.AccAddress, bucketNam if !found { return types.ErrNoSuchBucket } - if bucketInfo.SourceType != opts.SourceType { + if bucketInfo.SourceType != types.SOURCE_TYPE_ORIGIN && bucketInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch } @@ -417,10 +417,6 @@ func (k Keeper) UpdateBucketInfo(ctx sdk.Context, operator sdk.AccAddress, bucke if !found { return types.ErrNoSuchBucket } - // check bucket source - if bucketInfo.SourceType != opts.SourceType { - return types.ErrSourceTypeMismatch - } if ctx.IsUpgraded(upgradetypes.Hulunbeier) { sp := k.MustGetPrimarySPForBucket(ctx, bucketInfo) @@ -987,10 +983,6 @@ func (k Keeper) CancelCreateObject( return types.ErrObjectNotCreated.Wrapf("Object status: %s", objectInfo.ObjectStatus.String()) } - if objectInfo.SourceType != opts.SourceType { - return types.ErrSourceTypeMismatch - } - var creator sdk.AccAddress owner := sdk.MustAccAddressFromHex(objectInfo.Owner) if objectInfo.Creator != "" { @@ -1056,7 +1048,7 @@ func (k Keeper) DeleteObject( objectInfo.ObjectName) } - if objectInfo.SourceType != opts.SourceType { + if objectInfo.SourceType != types.SOURCE_TYPE_ORIGIN && objectInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch } @@ -1211,10 +1203,6 @@ func (k Keeper) CopyObject( return sdkmath.ZeroUint(), errors.Wrapf(types.ErrNoSuchObject, "src object name (%s)", srcObjectName) } - if srcObjectInfo.SourceType != opts.SourceType { - return sdkmath.ZeroUint(), types.ErrSourceTypeMismatch - } - if srcObjectInfo.IsUpdating { return sdkmath.ZeroUint(), types.ErrAccessDenied.Wrapf("the object is being updated, can not be copied") } @@ -1552,7 +1540,7 @@ func (k Keeper) DeleteGroup(ctx sdk.Context, operator sdk.AccAddress, groupName if !found { return types.ErrNoSuchGroup } - if groupInfo.SourceType != opts.SourceType { + if groupInfo.SourceType != types.SOURCE_TYPE_ORIGIN && groupInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch } // check permission @@ -1588,7 +1576,7 @@ func (k Keeper) LeaveGroup( if !found { return types.ErrNoSuchGroup } - if groupInfo.SourceType != opts.SourceType { + if groupInfo.SourceType != types.SOURCE_TYPE_ORIGIN && groupInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch } @@ -1610,7 +1598,7 @@ func (k Keeper) LeaveGroup( } func (k Keeper) UpdateGroupMember(ctx sdk.Context, operator sdk.AccAddress, groupInfo *types.GroupInfo, opts types.UpdateGroupMemberOptions) error { - if groupInfo.SourceType != opts.SourceType { + if groupInfo.SourceType != types.SOURCE_TYPE_ORIGIN && groupInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch } @@ -1665,7 +1653,7 @@ func (k Keeper) UpdateGroupMember(ctx sdk.Context, operator sdk.AccAddress, grou } func (k Keeper) RenewGroupMember(ctx sdk.Context, operator sdk.AccAddress, groupInfo *types.GroupInfo, opts types.RenewGroupMemberOptions) error { - if groupInfo.SourceType != opts.SourceType { + if groupInfo.SourceType != types.SOURCE_TYPE_ORIGIN && groupInfo.SourceType != opts.SourceType { return types.ErrSourceTypeMismatch }