Merge namecoin/ncdns#163: Switch to upstream btcd

f3549bd01c Cirrus: Require "Modules Off" tasks to succeed (Jeremy Rand)
328ccabc66 Switch to upstream btcd (Jeremy Rand)

Pull request description:

  The last outstanding patch was merged upstream.

  Fixes https://github.com/namecoin/ncdns/issues/162

Top commit has no ACKs.

Tree-SHA512: 1ba3af16b81602e7bb3aba64feef16842555f4daa827023cb41b39258a5e28844fb9905c5758492a7f1477b4ac9e4da7c3566dc999b1725acf412630ae035a65

.cirrus.yml

@@ -16,8 +16,6 @@ task:
         GO111MODULE: "off"
         GOLANGCI_MODULES_ARGS: "--disable=gomoddirectives,gomodguard"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       fetch_script:
         - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
         - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
@@ -111,8 +109,6 @@ task:
     - env:
         GO111MODULE: "off"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       fetch_script:
         - go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
         - GOOS=windows go get -tags "$GOX_TAGS" -d -v -t github.com/$CIRRUS_REPO_FULL_NAME/...
@@ -179,8 +175,6 @@ task:
     - env:
         GO111MODULE: "off"
         MODULES_NAME: " Modules Off"
-      # TODO: Stop allowing failures once btcd v0.22.1 is released.
-      allow_failures: true
       gox_script:
         - go get github.com/mitchellh/gox
       fetch_script:

namecoin/namecoin.go

@@ -2,7 +2,7 @@ package namecoin
 
 import (
 	"github.com/btcsuite/btcd/btcjson"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"gopkg.in/hlandau/madns.v2/merr"
 
 	"github.com/namecoin/ncbtcjson"

ncdt/ncdt.go

@@ -7,7 +7,7 @@ import "fmt"
 import "os"
 import "strconv"
 import "io/ioutil"
-import "github.com/namecoin/btcd/rpcclient"
+import "github.com/btcsuite/btcd/rpcclient"
 import "github.com/namecoin/ncdns/util"
 
 var rpchost = flag.String("rpchost", "", "Namecoin RPC host:port")

ncdumpzone/ncdumpzone/ncdumpzone.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/hlandau/xlog"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"gopkg.in/hlandau/easyconfig.v1"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"
 

server/server.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hlandau/buildinfo"
 	"github.com/hlandau/xlog"
 	"github.com/miekg/dns"
-	"github.com/namecoin/btcd/rpcclient"
+	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/namecoin/ncdns/backend"
 	"github.com/namecoin/ncdns/namecoin"
 	madns "gopkg.in/hlandau/madns.v2"