order+account: account for new dust limit w/ smaller acct in test

For the batch verify test, the dust limit is now smaller by 160
satoshis, so we reduce the main account by this amount in order to
commit a minimal diff, rather than overhaul the test to be more robust.

account/interface.go

@@ -470,19 +470,19 @@ func (o *OutputWithFee) CloseOutputs(accountValue btcutil.Amount,
 	case txscript.WitnessV0PubKeyHashTy:
 		weightEstimator.AddP2WKHOutput()
 		dustLimit = lnwallet.DustLimitForSize(
-			input.P2WKHOutputSize,
+			input.P2WPKHSize,
 		)
 
 	case txscript.ScriptHashTy:
 		weightEstimator.AddP2SHOutput()
 		dustLimit = lnwallet.DustLimitForSize(
-			input.P2SHOutputSize,
+			input.P2SHSize,
 		)
 
 	case txscript.WitnessV0ScriptHashTy:
 		weightEstimator.AddP2WSHOutput()
 		dustLimit = lnwallet.DustLimitForSize(
-			input.P2WSHOutputSize,
+			input.P2WSHSize,
 		)
 	}
 

order/batch.go

@@ -102,7 +102,7 @@ func (d *AccountDiff) validateEndingState(tx *wire.MsgTx,
 
 	state := d.EndingState
 	wrongStateErr := fmt.Errorf(
-		"unexpected state %d for ending balance %d", state,
+		"unexpected state %v for ending balance %d", state,
 		d.EndingBalance,
 	)
 

order/batch_verifier_test.go

@@ -355,7 +355,7 @@ func TestBatchVerifier(t *testing.T) {
 			TraderKey: &keychain.KeyDescriptor{
 				PubKey: acctKeySmall,
 			},
-			Value:         401_000,
+			Value:         400_840,
 			Expiry:        144,
 			State:         account.StateOpen,
 			BatchKey:      startBatchKey,
@@ -455,7 +455,7 @@ func TestBatchVerifier(t *testing.T) {
 				AccountKey:    acctKeySmall,
 				EndingState:   stateExtendedOffchain,
 				OutpointIndex: -1,
-				EndingBalance: 594,
+				EndingBalance: 434,
 			},
 		}
 		matchedOrders := map[Nonce][]*MatchedOrder{