Skip to content

refactor: use slices.Contains to simplify code #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2025
Merged

refactor: use slices.Contains to simplify code #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions testframework/clightning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"os"
"path/filepath"
"regexp"
"slices"
"time"

"github.com/elementsproject/glightning/glightning"
Expand Down Expand Up @@ -346,12 +347,7 @@ func (n *CLightningNode) OpenChannel(remote LightningNode, capacity, pushAmt uin
return false
}

for _, txId := range rawMempool {
if txId == fr.FundingTxId {
return true
}
}
return false
return slices.Contains(rawMempool, fr.FundingTxId)
}, TIMEOUT)
if err != nil {
return "", fmt.Errorf("error waiting for tx in mempool: %w", err)
Expand Down
8 changes: 3 additions & 5 deletions wallet/elementsrpcwallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"math"
"slices"

"strings"

Expand Down Expand Up @@ -129,11 +130,8 @@ func (r *ElementsRpcWallet) setupWallet() error {
return err
}
var walletLoaded bool
for _, v := range loadedWallets {
if v == r.walletName {
walletLoaded = true
break
}
if slices.Contains(loadedWallets, r.walletName) {
walletLoaded = true
}
if !walletLoaded {
_, err = r.rpcClient.LoadWallet(r.walletName, true)
Expand Down