From 25d82fd62b99b9c64333200bf2e7f210f0377516 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Tue, 22 Aug 2023 12:42:02 +0800 Subject: [PATCH] rpcserver+sweep: fix linter re unused params --- rpcserver.go | 5 ++--- sweep/walletsweep.go | 3 +-- sweep/walletsweep_test.go | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index dadaa51c6..02bbde2b3 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -1296,7 +1296,7 @@ func (r *rpcServer) SendCoins(ctx context.Context, sweepTxPkg, err := sweep.CraftSweepAllTx( maxFeeRate, feePerKw, uint32(bestHeight), nil, targetAddr, wallet, wallet, wallet.WalletController, - r.server.cc.FeeEstimator, r.server.cc.Signer, minConfs, + r.server.cc.Signer, minConfs, ) if err != nil { return nil, err @@ -1350,8 +1350,7 @@ func (r *rpcServer) SendCoins(ctx context.Context, maxFeeRate, feePerKw, uint32(bestHeight), outputs, targetAddr, wallet, wallet, wallet.WalletController, - r.server.cc.FeeEstimator, r.server.cc.Signer, - minConfs, + r.server.cc.Signer, minConfs, ) if err != nil { return nil, err diff --git a/sweep/walletsweep.go b/sweep/walletsweep.go index 3ba6f0a35..831b0151e 100644 --- a/sweep/walletsweep.go +++ b/sweep/walletsweep.go @@ -184,8 +184,7 @@ func CraftSweepAllTx(feeRate, maxFeeRate chainfee.SatPerKWeight, blockHeight uint32, deliveryAddrs []DeliveryAddr, changeAddr btcutil.Address, coinSelectLocker CoinSelectionLocker, utxoSource UtxoSource, outpointLocker OutpointLocker, - feeEstimator chainfee.Estimator, signer input.Signer, - minConfs int32) (*WalletSweepPackage, error) { + signer input.Signer, minConfs int32) (*WalletSweepPackage, error) { // TODO(roasbeef): turn off ATPL as well when available? diff --git a/sweep/walletsweep_test.go b/sweep/walletsweep_test.go index 3b0d9f61c..4a7ceec7a 100644 --- a/sweep/walletsweep_test.go +++ b/sweep/walletsweep_test.go @@ -297,7 +297,7 @@ func TestCraftSweepAllTxCoinSelectFail(t *testing.T) { utxoLocker := newMockOutpointLocker() _, err := CraftSweepAllTx( - 0, 0, 10, nil, nil, coinSelectLocker, utxoSource, utxoLocker, nil, + 0, 0, 10, nil, nil, coinSelectLocker, utxoSource, utxoLocker, nil, 0, ) @@ -323,7 +323,7 @@ func TestCraftSweepAllTxUnknownWitnessType(t *testing.T) { utxoLocker := newMockOutpointLocker() _, err := CraftSweepAllTx( - 0, 0, 10, nil, nil, coinSelectLocker, utxoSource, utxoLocker, nil, + 0, 0, 10, nil, nil, coinSelectLocker, utxoSource, utxoLocker, nil, 0, ) @@ -348,7 +348,6 @@ func TestCraftSweepAllTx(t *testing.T) { // First, we'll make a mock signer along with a fee estimator, We'll // use zero fees to we can assert a precise output value. signer := &mock.DummySigner{} - feeEstimator := newMockFeeEstimator(0, 0) // For our UTXO source, we'll pass in all the UTXOs that we know of, // other than the final one which is of an unknown witness type. @@ -359,7 +358,7 @@ func TestCraftSweepAllTx(t *testing.T) { sweepPkg, err := CraftSweepAllTx( 0, 0, 10, nil, deliveryAddr, coinSelectLocker, utxoSource, - utxoLocker, feeEstimator, signer, 0, + utxoLocker, signer, 0, ) require.NoError(t, err, "unable to make sweep tx")