rpcserver+sweep: fix linter re unused params

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

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?
 

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")