tests now

decred · Oct 19, 2023 · 0b97642 · 0b97642
1 parent 62474fc
commit 0b97642
Show file tree

Hide file tree

Showing 8 changed files with 604 additions and 394 deletions.
diff --git a/client/asset/btc/btc.go b/client/asset/btc/btc.go
@@ -2205,12 +2205,7 @@ func (btc *baseWallet) fundMultiSplitTx(
 		return sum >= req, sum - req
 	}
 
-	var avail uint64
-	for _, utxo := range utxos {
-		avail += utxo.Amount
-	}
-
-	fundSplitCoins, _, spents, _, inputsSize, _, err := btc.cm.FundWithUTXOs(utxos, avail, keep, false, enough)
+	fundSplitCoins, _, spents, _, inputsSize, _, err := btc.cm.FundWithUTXOs(utxos, keep, false, enough)
 	if err != nil {
 		return false, nil, nil
 	}

diff --git a/client/asset/btc/coinmanager.go b/client/asset/btc/coinmanager.go
@@ -80,10 +80,14 @@ func NewCoinManager(
 
 func (c *CoinManager) FundWithUTXOs(
 	utxos []*CompositeUTXO,
-	avail, keep uint64,
+	keep uint64,
 	lockUnspents bool,
 	enough EnoughFunc,
 ) (coins asset.Coins, fundingCoins map[OutPoint]*UTxO, spents []*Output, redeemScripts []dex.Bytes, size, sum uint64, err error) {
+	var avail uint64
+	for _, utxo := range utxos {
+		avail += utxo.Amount
+	}
 
 	c.mtx.Lock()
 	defer c.mtx.Unlock()

diff --git a/client/asset/zec/errors.go b/client/asset/zec/errors.go
@@ -16,6 +16,11 @@ const (
 	errUTxORetrieval
 	errLockUnspent
 	errFunding
+	errNoTx
+	errGetChainInfo
+	errGetNetInfo
+	errBadInput
+	errMaxLock
 )
 
 // Error is an error code and a wrapped error.

diff --git a/client/asset/zec/regnet_test.go b/client/asset/zec/regnet_test.go
@@ -26,17 +26,17 @@ const (
 	testnetOverwinterActivationHeight = 207500
 )
 
-var (
-	tLotSize uint64 = 1e6
-	tZEC            = &dex.Asset{
-		ID:           BipID,
-		Symbol:       "zec",
-		SwapSize:     dexzec.InitTxSize,
-		SwapSizeBase: dexzec.InitTxSizeBase,
-		MaxFeeRate:   100,
-		SwapConf:     1,
-	}
-)
+// var (
+// 	tLotSize uint64 = 1e6
+// 	tZEC            = &dex.Asset{
+// 		ID:           BipID,
+// 		Symbol:       "zec",
+// 		SwapSize:     dexzec.InitTxSize,
+// 		SwapSizeBase: dexzec.InitTxSizeBase,
+// 		MaxFeeRate:   100,
+// 		SwapConf:     1,
+// 	}
+// )
 
 func TestWallet(t *testing.T) {
 	livetest.Run(t, &livetest.Config{

diff --git a/client/asset/zec/transparent_rpc.go b/client/asset/zec/transparent_rpc.go
@@ -242,13 +242,19 @@ func getWalletTransaction(c rpcCaller, txHash *chainhash.Hash) (*btc.GetTransact
 	return &tx, nil
 }
 
+func getBalance(c rpcCaller) (bal uint64, err error) {
+	return bal, c.CallRPC("getbalance", nil, &bal)
+}
+
+type networkInfo struct {
+	Connections uint32 `json:"connections"`
+}
+
 func peerCount(c rpcCaller) (uint32, error) {
-	var r struct {
-		Connections uint32 `json:"connections"`
-	}
+	var r networkInfo
 	err := c.CallRPC("getnetworkinfo", nil, &r)
 	if err != nil {
-		return 0, err
+		return 0, codedError(errGetNetInfo, err)
 	}
 	return r.Connections, nil
 }
@@ -345,27 +351,10 @@ func getTxOutput(c rpcCaller, txHash *chainhash.Hash, index uint32) (*btcjson.Ge
 	return res, c.CallRPC("gettxout", []any{txHash.String(), index, true}, &res)
 }
 
-func swapConfirmations(c rpcCaller, txHash *chainhash.Hash, vout uint32) (confs uint32, spent bool, err error) {
-	// Check for an unspent output.
-	txOut, err := getTxOutput(c, txHash, vout)
-	if err == nil && txOut != nil {
-		return uint32(txOut.Confirmations), false, nil
-	}
-	// Check wallet transactions.
-	tx, err := getWalletTransaction(c, txHash)
-	if err != nil {
-		if btc.IsTxNotFoundErr(err) {
-			return 0, false, asset.CoinNotFoundError
-		}
-		return 0, false, err
-	}
-	return uint32(tx.Confirmations), true, nil
-}
-
 func syncStatus(c rpcCaller) (*btc.SyncStatus, error) {
 	chainInfo, err := getBlockchainInfo(c)
 	if err != nil {
-		return nil, fmt.Errorf("getblockchaininfo error: %w", err)
+		return nil, newError(errGetChainInfo, "getblockchaininfo error: %w", err)
 	}
 	return &btc.SyncStatus{
 		Target:  int32(chainInfo.Headers),