Skip to content

Commit

Permalink
Replace all existing switch/cases for FeeIncrement
Browse files Browse the repository at this point in the history
Remove all switch/cases for FeeIncrment except for intial wallet
creation.  Instead all set/getting of feeIncrement is done with
the mutex safe get and set.  This cleans up the code and
provides a straightforward way to get/set that field
  • Loading branch information
alexlyp committed Mar 1, 2016
1 parent 4f51acb commit ee276f6
Showing 1 changed file with 9 additions and 33 deletions.
42 changes: 9 additions & 33 deletions wallet/createtx.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,8 @@ func (w *Wallet) txToPairs(pairs map[string]dcrutil.Amount, account uint32,
// the amount of inputs as compared to the amount of
// outputs.
var feeIncrement dcrutil.Amount
switch {
case w.chainParams == &chaincfg.MainNetParams:
feeIncrement = FeeIncrementMainnet
case w.chainParams == &chaincfg.TestNetParams:
feeIncrement = FeeIncrementTestnet
default:
feeIncrement = FeeIncrementTestnet
}
feeIncrement = w.FeeIncrement()

needed += feeForSize(feeIncrement,
estimateTxSize(len(pairs)*2, len(pairs)))

Expand All @@ -422,7 +416,7 @@ func (w *Wallet) txToPairs(pairs map[string]dcrutil.Amount, account uint32,
return nil, err
}

return w.createTx(eligible, pairs, bs, w.FeeIncrement(), account,
return w.createTx(eligible, pairs, bs, feeIncrement, account,
addrFunc, w.chainParams, w.DisallowFree)
}

Expand Down Expand Up @@ -769,14 +763,8 @@ func (w *Wallet) txToMultisig(account uint32, amount dcrutil.Amount,
// case.
feeSize := estimateTxSize(numInputs, 2)
var feeIncrement dcrutil.Amount
switch {
case w.chainParams == &chaincfg.MainNetParams:
feeIncrement = FeeIncrementMainnet
case w.chainParams == &chaincfg.TestNetParams:
feeIncrement = FeeIncrementTestnet
default:
feeIncrement = FeeIncrementTestnet
}
feeIncrement = w.FeeIncrement()

feeEst := feeForSize(feeIncrement, feeSize)

if totalInput < amount+feeEst {
Expand Down Expand Up @@ -881,14 +869,8 @@ func (w *Wallet) compressWallet(maxNumIns int) error {
// and added outputs, with no change.
szEst := estimateTxSize(txInCount, 1)
var feeIncrement dcrutil.Amount
switch {
case w.chainParams == &chaincfg.MainNetParams:
feeIncrement = FeeIncrementMainnet
case w.chainParams == &chaincfg.TestNetParams:
feeIncrement = FeeIncrementTestnet
default:
feeIncrement = FeeIncrementTestnet
}
feeIncrement = w.FeeIncrement()

feeEst := feeForSize(feeIncrement, szEst)

msgtx := wire.NewMsgTx()
Expand Down Expand Up @@ -982,14 +964,8 @@ func (w *Wallet) compressEligible(eligible []wtxmgr.Credit) error {
// and added outputs, with no change.
szEst := estimateTxSize(txInCount, 1)
var feeIncrement dcrutil.Amount
switch {
case w.chainParams == &chaincfg.MainNetParams:
feeIncrement = FeeIncrementMainnet
case w.chainParams == &chaincfg.TestNetParams:
feeIncrement = FeeIncrementTestnet
default:
feeIncrement = FeeIncrementTestnet
}
feeIncrement = w.FeeIncrement()

feeEst := feeForSize(feeIncrement, szEst)

msgtx := wire.NewMsgTx()
Expand Down

0 comments on commit ee276f6

Please sign in to comment.