diff --git a/Makefile b/Makefile index f1bc95d..cfbfcb9 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ lint: --disable=errcheck \ --disable=gochecknoglobals \ --disable=funlen \ + --disable=gocognit \ + --disable=godox \ + --disable=wsl \ --skip-dirs=internal \ ./... diff --git a/renter/proto/renew.go b/renter/proto/renew.go index 2d0804e..9e76d1c 100644 --- a/renter/proto/renew.go +++ b/renter/proto/renew.go @@ -7,9 +7,10 @@ import ( "gitlab.com/NebulousLabs/Sia/crypto" "gitlab.com/NebulousLabs/Sia/modules" "gitlab.com/NebulousLabs/Sia/types" + + "lukechampine.com/us/ed25519" "lukechampine.com/us/hostdb" "lukechampine.com/us/renterhost" - "lukechampine.com/us/ed25519" ) // RenewContract negotiates a new file contract and initial revision for data diff --git a/renter/renterutil/hostset.go b/renter/renterutil/hostset.go index efe811a..1dfb42b 100644 --- a/renter/renterutil/hostset.go +++ b/renter/renterutil/hostset.go @@ -77,12 +77,11 @@ func (set *HostSet) AddHost(c renter.Contract) { if _, err := lh.s.Settings(); err == nil { // connection is still open; we're done return nil - } else { - // connection timed out, or some other error occurred; close our - // end (just in case) and fallthrough to the reconnection logic - lh.s.Close() - lh.s = nil } + // connection timed out, or some other error occurred; close our + // end (just in case) and fallthrough to the reconnection logic + lh.s.Close() + lh.s = nil } hostIP, err := set.hkr.ResolveHostKey(c.HostKey) if err != nil {