fix: Fix wasp-cli tests

Author: howjmay

clients/iota-go/iotajsonrpc/utils_pick_coins.go

@@ -98,6 +98,42 @@ func PickupCoins(
 	}, nil
 }
 
+func PickupCoinsWithCointype(
+	inputCoins *CoinPage,
+	targetAmount *big.Int,
+	cointype CoinType,
+) (*PickedCoins, error) {
+	coins := inputCoins.Data
+	inputCount := len(coins)
+	if inputCount <= 0 {
+		return nil, ErrNoCoinsFound
+	}
+
+	total := big.NewInt(0)
+	pickedCoins := []*Coin{}
+	for _, coin := range coins {
+		if coin.CoinType != cointype {
+			continue
+		}
+		total = total.Add(total, new(big.Int).SetUint64(coin.Balance.Uint64()))
+		pickedCoins = append(pickedCoins, coin)
+
+		if total.Cmp(targetAmount) >= 0 {
+			break
+		}
+	}
+	if total.Cmp(targetAmount) < 0 {
+		if inputCoins.HasNextPage {
+			return nil, ErrNeedMergeCoin
+		}
+	}
+	return &PickedCoins{
+		Coins:        pickedCoins,
+		TargetAmount: targetAmount,
+		TotalAmount:  total,
+	}, nil
+}
+
 func PickupCoinsSimple(coins Coins, targetAmount uint64) (Coins, error) {
 	return PickupCoinsWithFilter(coins, targetAmount, nil)
 }

tools/cluster/tests/wasp-cli.go

@@ -72,7 +72,7 @@ func (w *WaspCLITest) runCmd(args []string, f func(*exec.Cmd)) ([]string, error)
 	w.T.Helper()
 	// -w: wait for requests
 	// -d: debug output
-	cmd := exec.Command("wasp-cli", append([]string{"-c", w.dir + "/wasp-cli.json", "-w", "-d"}, args...)...) //nolint:gosec
+	cmd := exec.Command("wasp-cli", append([]string{"-c", w.dir + "/wasp-cli.json", "-w=2m", "-d"}, args...)...) //nolint:gosec
 	cmd.Dir = w.dir
 
 	stdout := new(bytes.Buffer)