From ac97ebb1e3687cc7b27452feff41bddbcf038006 Mon Sep 17 00:00:00 2001 From: Ilan Gitter <8359193+gitteri@users.noreply.github.com> Date: Thu, 27 Jun 2024 07:56:54 -0600 Subject: [PATCH] fix bad merge --- rpcclient/infrastructure.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcclient/infrastructure.go b/rpcclient/infrastructure.go index c4c85b3039..4ca014b0ce 100644 --- a/rpcclient/infrastructure.go +++ b/rpcclient/infrastructure.go @@ -1589,9 +1589,9 @@ func (c *Client) BackendVersion() (BackendVersion, error) { // Parse the btcd version and cache it. case nil: log.Debugf("Detected btcd version: %v", info.Version) - version := Btcd - c.backendVersion = &version - return *c.backendVersion, nil + version := parseBtcdVersion(info.Version) + c.backendVersion = version + return c.backendVersion, nil default: log.Debugf("Could not detect bitcoind version from GetInfo. error: %v", err) } @@ -1604,12 +1604,12 @@ func (c *Client) BackendVersion() (BackendVersion, error) { log.Debugf("Could not detect bitcoind version from GetNetworkInfo. error: %v", err) } - // assume the network is beyond v0.19 + // assume the network is beyond v0.25 if networkInfo == nil { log.Debug("Could not detect bitcoind version. Assuming post v0.19") - version := BitcoindPost19 + version := BitcoindPost25 c.backendVersion = &version - return BitcoindPost19, nil + return BitcoindPost25, nil } // Parse the bitcoind version and cache it.