squash: move tls_helpertest.go to helpertest/ since dep loop is broken

util/tls_helpertest.go → helpertest/tls.go

@@ -1,18 +1,14 @@
-package util
+package helpertest
 
 import (
 	"crypto/tls"
 	"crypto/x509"
 	"sync"
 
+	"github.com/0xERR0R/blocky/util"
 	. "github.com/onsi/gomega"
 )
 
-// FIXME: think about how modules can be moved so this can be in helpertest
-//  Right now it can't since it depends on util, and util has test code
-//  that uses helpertest.
-//  Maybe creating util_test would fix it.
-
 const tlsTestServerName = "test.blocky.invalid"
 
 type tlsData struct {
@@ -30,7 +26,7 @@ var (
 
 func getTLSData() tlsData {
 	initTLSData.Do(func() {
-		cert, err := TLSGenerateSelfSignedCert([]string{tlsTestServerName})
+		cert, err := util.TLSGenerateSelfSignedCert([]string{tlsTestServerName})
 		Expect(err).Should(Succeed())
 
 		tlsDataStorage.ServerCfg = &tls.Config{