Fix: address go vet warnings

- go vet: "literal copies lock value from *httpServer: net/http.Server contains sync.Once contains sync.Mutex"; in this case, functionality is unchanged
- go vet: "possible formatting directive in Error call"; this is in test code

psiphon/common/utils_test.go

@@ -34,7 +34,7 @@ func TestMakeRandomPeriod(t *testing.T) {
 	res1, err := MakeRandomPeriod(min, max)
 
 	if err != nil {
-		t.Error("MakeRandomPeriod failed: %s", err)
+		t.Errorf("MakeRandomPeriod failed: %s", err)
 	}
 
 	if res1 < min {
@@ -48,7 +48,7 @@ func TestMakeRandomPeriod(t *testing.T) {
 	res2, err := MakeRandomPeriod(min, max)
 
 	if err != nil {
-		t.Error("MakeRandomPeriod failed: %s", err)
+		t.Errorf("MakeRandomPeriod failed: %s", err)
 	}
 
 	if res1 == res2 {
@@ -104,7 +104,7 @@ func TestCompress(t *testing.T) {
 
 	decompressedData, err := Decompress(compressedData)
 	if err != nil {
-		t.Error("Uncompress failed: %s", err)
+		t.Errorf("Uncompress failed: %s", err)
 	}
 
 	if bytes.Compare(originalData, decompressedData) != 0 {

psiphon/server/meek.go

@@ -172,7 +172,7 @@ func (server *MeekServer) Run() error {
 	// Note: Serve() will be interrupted by listener.Close() call
 	var err error
 	if server.tlsConfig != nil {
-		httpsServer := HTTPSServer{Server: *httpServer}
+		httpsServer := HTTPSServer{Server: httpServer}
 		err = httpsServer.ServeTLS(server.listener, server.tlsConfig)
 	} else {
 		err = httpServer.Serve(server.listener)

psiphon/server/net.go

@@ -61,7 +61,7 @@ import (
 // HTTPSServer is a wrapper around http.Server which adds the
 // ServeTLS function.
 type HTTPSServer struct {
-	http.Server
+	*http.Server
 }
 
 // ServeTLS is similar to http.Serve, but uses TLS.

psiphon/server/webServer.go

@@ -90,7 +90,7 @@ func RunWebServer(
 	// https://blog.cloudflare.com/the-complete-guide-to-golang-net-http-timeouts
 
 	server := &HTTPSServer{
-		http.Server{
+		&http.Server{
 			MaxHeaderBytes: MAX_API_PARAMS_SIZE,
 			Handler:        serveMux,
 			ReadTimeout:    WEB_SERVER_IO_TIMEOUT,