remove unused methods

Author: keithsue

x/btcbridge/keeper/keeper_test.go

@@ -188,13 +188,13 @@ func (suite *KeeperTestSuite) TestWithdrawRunes() {
 	denom := fmt.Sprintf("%s/%s", types.RunesProtocolName, runeId)
 	coin := sdk.NewInt64Coin(denom, int64(amount))
 
-	_, err := suite.app.BtcBridgeKeeper.NewSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate))
+	_, err := suite.app.BtcBridgeKeeper.NewRunesSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate), suite.runesVault, suite.btcVault)
 	suite.ErrorIs(err, types.ErrInsufficientUTXOs, "should fail due to insufficient runes utxos")
 
 	amount = 100000000
 	coin = sdk.NewInt64Coin(denom, int64(amount))
 
-	_, err = suite.app.BtcBridgeKeeper.NewSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate))
+	_, err = suite.app.BtcBridgeKeeper.NewRunesSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate), suite.runesVault, suite.btcVault)
 	suite.ErrorIs(err, types.ErrInsufficientUTXOs, "should fail due to insufficient payment utxos")
 
 	paymentUTXOs := []*types.UTXO{
@@ -209,7 +209,7 @@ func (suite *KeeperTestSuite) TestWithdrawRunes() {
 	}
 	suite.setupUTXOs(paymentUTXOs)
 
-	req, err := suite.app.BtcBridgeKeeper.NewSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate))
+	req, err := suite.app.BtcBridgeKeeper.NewRunesSigningRequest(suite.ctx, suite.sender, coin, int64(feeRate), suite.runesVault, suite.btcVault)
 	suite.NoError(err)
 
 	suite.False(suite.app.BtcBridgeKeeper.HasUTXO(suite.ctx, runesUTXOs[0].Txid, runesUTXOs[0].Vout), "runes utxo should be spent")

x/btcbridge/keeper/params.go

@@ -86,23 +86,3 @@ func (k Keeper) GetMaxUtxoNum(ctx sdk.Context) int {
 
 	return int(params.WithdrawParams.MaxUtxoNum)
 }
-
-// EnableBridge enables the bridge deposit and withdrawal
-func (k Keeper) EnableBridge(ctx sdk.Context) {
-	params := k.GetParams(ctx)
-
-	params.DepositEnabled = true
-	params.WithdrawEnabled = true
-
-	k.SetParams(ctx, params)
-}
-
-// DisableBridge disables the bridge deposit and withdrawal
-func (k Keeper) DisableBridge(ctx sdk.Context) {
-	params := k.GetParams(ctx)
-
-	params.DepositEnabled = false
-	params.WithdrawEnabled = false
-
-	k.SetParams(ctx, params)
-}

x/btcbridge/keeper/withdraw.go

@@ -161,61 +161,6 @@ func (k Keeper) NewWithdrawRequest(ctx sdk.Context, sender string, amount string
 		Sequence: k.IncreaseWithdrawRequestSequence(ctx),
 	}
 }
-
-// NewSigningRequest creates a new withdrawal request
-func (k Keeper) NewSigningRequest(ctx sdk.Context, sender string, amount sdk.Coin, feeRate int64) (*types.SigningRequest, error) {
-	p := k.GetParams(ctx)
-	btcVault := types.SelectVaultByAssetType(p.Vaults, types.AssetType_ASSET_TYPE_BTC)
-
-	switch types.AssetTypeFromDenom(amount.Denom, p) {
-	case types.AssetType_ASSET_TYPE_BTC:
-		return k.NewBtcSigningRequest(ctx, sender, amount, feeRate, btcVault.Address)
-
-	case types.AssetType_ASSET_TYPE_RUNES:
-		runesVault := types.SelectVaultByAssetType(p.Vaults, types.AssetType_ASSET_TYPE_RUNES)
-		return k.NewRunesSigningRequest(ctx, sender, amount, feeRate, runesVault.Address, btcVault.Address)
-
-	default:
-		return nil, types.ErrAssetNotSupported
-	}
-}
-
-// NewBtcSigningRequest creates the signing request for btc withdrawal
-func (k Keeper) NewBtcSigningRequest(ctx sdk.Context, sender string, amount sdk.Coin, feeRate int64, vault string) (*types.SigningRequest, error) {
-	utxoIterator := k.GetUTXOIteratorByAddr(ctx, vault)
-
-	psbt, selectedUTXOs, changeUTXO, err := types.BuildPsbt(utxoIterator, sender, amount.Amount.Int64(), feeRate, vault, k.GetMaxUtxoNum(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	psbtB64, err := psbt.B64Encode()
-	if err != nil {
-		return nil, types.ErrFailToSerializePsbt
-	}
-
-	txHash := psbt.UnsignedTx.TxHash().String()
-
-	// spend the selected utxos
-	_ = k.SpendUTXOs(ctx, selectedUTXOs)
-
-	// lock the change utxo
-	k.lockChangeUTXOs(ctx, txHash, changeUTXO)
-
-	signingRequest := &types.SigningRequest{
-		Address:      sender,
-		Sequence:     k.IncrementSigningRequestSequence(ctx),
-		Txid:         txHash,
-		Psbt:         psbtB64,
-		CreationTime: ctx.BlockTime(),
-		Status:       types.SigningStatus_SIGNING_STATUS_PENDING,
-	}
-
-	k.SetSigningRequest(ctx, signingRequest)
-
-	return signingRequest, nil
-}
-
 // NewRunesSigningRequest creates the signing request for runes withdrawal
 func (k Keeper) NewRunesSigningRequest(ctx sdk.Context, sender string, amount sdk.Coin, feeRate int64, vault string, btcVault string) (*types.SigningRequest, error) {
 	var runeId types.RuneId