Skip to content
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

config: fix cln listconfig output #298

Merged
merged 3 commits into from
Jun 8, 2024
Merged

config: fix cln listconfig output #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72700d7
config: fix cln listconfig output so it properly matches how liquidsw…
grubles Jun 5, 2024
d52c805
quick fixups
grubles Jun 6, 2024
fbe6cfb
rename the legacy option too
grubles Jun 7, 2024
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
2 changes: 1 addition & 1 deletion clightning/clightning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ func (cl *ClightningClient) SetPeerswapConfig(config *Config) {
LiquidRpcHost: config.Liquid.RpcHost,
LiquidRpcPort: config.Liquid.RpcPort,
LiquidRpcWallet: config.Liquid.RpcWallet,
LiquidDisabled: *config.Liquid.LiquidSwaps,
LiquidSwaps: *config.Liquid.LiquidSwaps,
PeerswapDir: config.PeerswapDir,
}
}
Expand Down
8 changes: 4 additions & 4 deletions clightning/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const (
liquidRpcUserOption = "peerswap-elementsd-rpcuser"
liquidRpcPasswordOption = "peerswap-elementsd-rpcpassword"
liquidRpcPasswordFilepathOption = "peerswap-elementsd-rpcpasswordfile"
liquidDisabledOption = "peerswap-elementsd-disabled"
liquidSwapsOption = "peerswap-elementsd-swaps"
liquidRpcWalletOption = "peerswap-elementsd-rpcwallet"

bitcoinRpcHostOption = "peerswap-bitcoin-rpchost"
Expand All @@ -28,7 +28,7 @@ var legacyOptions = []string{
liquidRpcUserOption,
liquidRpcPasswordOption,
liquidRpcPasswordFilepathOption,
liquidDisabledOption,
liquidSwapsOption,
liquidRpcWalletOption,
bitcoinRpcHostOption,
bitcoinRpcPortOption,
Expand All @@ -53,7 +53,7 @@ type PeerswapClightningConfig struct {
LiquidRpcHost string `json:"liquid.rpchost"`
LiquidRpcPort uint `json:"liquid.rpcport"`
LiquidRpcWallet string `json:"liquid.rpcwallet"`
LiquidDisabled bool `json:"liquid.disabled"`
LiquidSwaps bool `json:"liquid.swaps"`

PeerswapDir string `json:"peerswap-dir"`
}
Expand Down Expand Up @@ -112,7 +112,7 @@ func (cl *ClightningClient) RegisterOptions() error {
return err
}

err = cl.Plugin.RegisterNewBoolOption(liquidDisabledOption, "enable/disable liquid", false)
err = cl.Plugin.RegisterNewBoolOption(liquidSwapsOption, "enable/disable liquid", false)
if err != nil {
return err
}
Expand Down
Loading