reject deleting discontinued objects

e2e/tests/storage_test.go

@@ -11,8 +11,6 @@ import (
 	"testing"
 	"time"
 
-	paymenttypes "github.com/bnb-chain/greenfield/x/payment/types"
-
 	sdkmath "cosmossdk.io/math"
 	ctypes "github.com/cometbft/cometbft/rpc/core/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -30,6 +28,7 @@ import (
 	"github.com/bnb-chain/greenfield/sdk/types"
 	storageutils "github.com/bnb-chain/greenfield/testutil/storage"
 	types2 "github.com/bnb-chain/greenfield/types"
+	paymenttypes "github.com/bnb-chain/greenfield/x/payment/types"
 	sptypes "github.com/bnb-chain/greenfield/x/sp/types"
 	storagetypes "github.com/bnb-chain/greenfield/x/storage/types"
 )

x/payment/keeper/grpc_query_test.go

@@ -41,13 +41,13 @@ func TestParamsByTimestampQuery(t *testing.T) {
 	require.NoError(t, err)
 
 	response, err := keeper.ParamsByTimestamp(ctx, &types.QueryParamsByTimestampRequest{
-		Timestamp: before.Unix(),
+		Timestamp: before.Unix() + 1,
 	})
 	require.NoError(t, err)
 	require.True(t, newReserveTime != response.Params.VersionedParams.ReserveTime)
 
 	response, err = keeper.ParamsByTimestamp(ctx, &types.QueryParamsByTimestampRequest{
-		Timestamp: after.Unix(),
+		Timestamp: after.Unix() + 1,
 	})
 	require.NoError(t, err)
 	require.True(t, newReserveTime == response.Params.VersionedParams.ReserveTime)

x/storage/keeper/keeper.go

@@ -987,6 +987,11 @@ func (k Keeper) DeleteObject(
 		return types.ErrNoSuchObject
 	}
 
+	if objectInfo.ObjectStatus == types.OBJECT_STATUS_DISCONTINUED {
+		return types.ErrInvalidObjectStatus.Wrapf("The object %s is discontined, will be deleted automatically",
+			objectInfo.ObjectName)
+	}
+
 	if objectInfo.SourceType != opts.SourceType {
 		return types.ErrSourceTypeMismatch
 	}