Merge pull request #5351 from wpaulino/signet-bitcoind

config+chainreg: fix default rpc params for signet bitcoind
This commit is contained in:
Olaoluwa Osuntokun 2021-06-02 08:09:58 -07:00 committed by GitHub
commit aa5c844633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -378,8 +378,10 @@ func NewChainControl(cfg *Config, blockCache *blockcache.BlockCache) (
rpcPort -= 2 rpcPort -= 2
bitcoindHost = fmt.Sprintf("%v:%d", bitcoindHost = fmt.Sprintf("%v:%d",
bitcoindMode.RPCHost, rpcPort) bitcoindMode.RPCHost, rpcPort)
if (cfg.Bitcoin.Active && cfg.Bitcoin.RegTest) || if (cfg.Bitcoin.Active &&
(cfg.Bitcoin.RegTest || cfg.Bitcoin.SigNet)) ||
(cfg.Litecoin.Active && cfg.Litecoin.RegTest) { (cfg.Litecoin.Active && cfg.Litecoin.RegTest) {
conn, err := net.Dial("tcp", bitcoindHost) conn, err := net.Dial("tcp", bitcoindHost)
if err != nil || conn == nil { if err != nil || conn == nil {
switch { switch {

View File

@ -1756,7 +1756,7 @@ func extractBitcoindRPCParams(networkName string,
switch networkName { switch networkName {
case "mainnet": case "mainnet":
chainDir = "" chainDir = ""
case "regtest", "testnet3": case "regtest", "testnet3", "signet":
chainDir = networkName chainDir = networkName
default: default:
return "", "", "", "", fmt.Errorf("unexpected networkname %v", networkName) return "", "", "", "", fmt.Errorf("unexpected networkname %v", networkName)