From 39b9f2042cb223ac352e639630d8562bfe2cdd8a Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 7 Oct 2022 07:21:56 +0000 Subject: [PATCH 1/2] gofmt -s util --- util/util.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/util/util.go b/util/util.go index 9b16030..1d30ba2 100644 --- a/util/util.go +++ b/util/util.go @@ -47,14 +47,15 @@ func SplitDomainTail(name string) (tail, rest string) { // If ANCHOR is the first label, basename is an empty string. // // Examples, where anchor="bit": -// "a.b.c.d." -> merr.ErrNotInZone -// "a.b.c.d.bit." -> subname="a.b.c", basename="d", rootname="bit" -// "d.bit." -> subname="", basename="d", rootname="bit" -// "bit." -> subname="", basename="", rootname="bit" -// "bit.x.y.z." -> subname="", basename="", rootname="bit.x.y.z" -// "d.bit.x.y.z." -> subname="", basename="d", rootname="bit.x.y.z" -// "c.d.bit.x.y.z." -> subname="c", basename="d", rootname="bit.x.y.z" -// "a.b.c.d.bit.x.y.z." -> subname="a.b.c", basename="d", rootname="bit.x.y.z" +// +// "a.b.c.d." -> merr.ErrNotInZone +// "a.b.c.d.bit." -> subname="a.b.c", basename="d", rootname="bit" +// "d.bit." -> subname="", basename="d", rootname="bit" +// "bit." -> subname="", basename="", rootname="bit" +// "bit.x.y.z." -> subname="", basename="", rootname="bit.x.y.z" +// "d.bit.x.y.z." -> subname="", basename="d", rootname="bit.x.y.z" +// "c.d.bit.x.y.z." -> subname="c", basename="d", rootname="bit.x.y.z" +// "a.b.c.d.bit.x.y.z." -> subname="a.b.c", basename="d", rootname="bit.x.y.z" func SplitDomainByFloatingAnchor(qname, anchor string) (subname, basename, rootname string, err error) { qname = strings.TrimRight(qname, ".") parts := strings.Split(qname, ".") From 4afc731c198b1a7d97b02a69efe1b10fc65c89f2 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 7 Oct 2022 07:26:56 +0000 Subject: [PATCH 2/2] Re-order imports Reported by gofmt. --- server/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/server.go b/server/server.go index f2a8631..9a8a6f8 100644 --- a/server/server.go +++ b/server/server.go @@ -9,13 +9,14 @@ import ( "strings" "sync" + "github.com/btcsuite/btcd/rpcclient" "github.com/hlandau/buildinfo" "github.com/hlandau/xlog" "github.com/miekg/dns" - "github.com/btcsuite/btcd/rpcclient" + madns "gopkg.in/hlandau/madns.v2" + "github.com/namecoin/ncdns/backend" "github.com/namecoin/ncdns/namecoin" - madns "gopkg.in/hlandau/madns.v2" ) var log, Log = xlog.New("ncdns.server")