Cleanup: comments and naming

psiphon/frontedHTTPClientInstance.go

@@ -127,7 +127,7 @@ func newFrontedHTTPClientInstance(
 			return nil, errors.Trace(err)
 		}
 	} else {
-		err := dialParams.prepareDialConfig(
+		err := dialParams.prepareDialConfigs(
 			config,
 			p,
 			isReplay,
@@ -259,7 +259,7 @@ func (f *frontedHTTPClientInstance) frontedHTTPClientRoundTripperSucceeded() {
 		err := SetNetworkReplayParameters[frontedHTTPDialParameters](
 			f.networkID, replayID, f.frontedHTTPDialParameters)
 		if err != nil {
-			NoticeWarning("StoreFrontedHTTPDialParameters failed: %v", errors.Trace(err))
+			NoticeWarning("SetNetworkReplayParameters failed: %v", errors.Trace(err))
 			// Continue without persisting replay changes.
 		} else {
 			f.lastStoreReplay = now
@@ -294,7 +294,7 @@ func (f *frontedHTTPClientInstance) frontedHTTPClientRoundTripperFailed() {
 		err := DeleteNetworkReplayParameters[frontedHTTPDialParameters](
 			f.networkID, replayID)
 		if err != nil {
-			NoticeWarning("DeleteFrontedHTTPDialParameters failed: %v", errors.Trace(err))
+			NoticeWarning("DeleteNetworkReplayParameters failed: %v", errors.Trace(err))
 			// Continue without resetting replay.
 		}
 	}

psiphon/frontingDialParameters.go

@@ -80,7 +80,7 @@ func makeFrontedHTTPDialParameters(
 
 	// Initialize Dial/MeekConfigs to be passed to the corresponding dialers.
 
-	err = dialParams.prepareDialConfig(
+	err = dialParams.prepareDialConfigs(
 		config,
 		p,
 		false,
@@ -96,8 +96,9 @@ func makeFrontedHTTPDialParameters(
 	return dialParams, nil
 }
 
-// prepareDialConfig is called for both new and replayed dial parameters.
-func (dialParams *frontedHTTPDialParameters) prepareDialConfig(config *Config,
+// prepareDialConfigs is called for both new and replayed dial parameters.
+func (dialParams *frontedHTTPDialParameters) prepareDialConfigs(
+	config *Config,
 	p parameters.ParametersAccessor,
 	isReplay bool,
 	tunnel *Tunnel,
@@ -108,10 +109,11 @@ func (dialParams *frontedHTTPDialParameters) prepareDialConfig(config *Config,
 
 	dialParams.isReplay = isReplay
 
-	// Initialize DialConfig to be passed to the corresponding dialers.
-
 	if isReplay {
-		err := dialParams.FrontedMeekDialParameters.prepareDialConfig(
+
+		// Initialize Dial/MeekConfigs to be passed to the corresponding dialers.
+
+		err := dialParams.FrontedMeekDialParameters.prepareDialConfigs(
 			config, p, tunnel, nil, useDeviceBinder, skipVerify,
 			disableSystemRootCAs, payloadSecure)
 		if err != nil {
@@ -351,9 +353,9 @@ func makeFrontedMeekDialParameters(
 		}
 	}
 
-	// Initialize DialConfig to be passed to the corresponding dialers.
+	// Initialize Dial/MeekConfigs to be passed to the corresponding dialers.
 
-	err = frontedMeekDialParams.prepareDialConfig(
+	err = frontedMeekDialParams.prepareDialConfigs(
 		config, p, tunnel, dialCustomHeaders, useDeviceBinder, skipVerify,
 		disableSystemRootCAs, payloadSecure)
 	if err != nil {
@@ -363,8 +365,8 @@ func makeFrontedMeekDialParameters(
 	return &frontedMeekDialParams, nil
 }
 
-// prepareDialConfig is called for both new and replayed dial parameters.
-func (f *FrontedMeekDialParameters) prepareDialConfig(
+// prepareDialConfigs is called for both new and replayed dial parameters.
+func (f *FrontedMeekDialParameters) prepareDialConfigs(
 	config *Config,
 	p parameters.ParametersAccessor,
 	tunnel *Tunnel,

psiphon/inproxy.go

@@ -460,7 +460,7 @@ func NewInproxyBrokerClientInstance(
 		}
 	} else {
 		brokerDialParams.brokerSpec = brokerSpec
-		err := brokerDialParams.prepareDialConfig(config, p, true)
+		err := brokerDialParams.prepareDialConfigs(config, p, true)
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
@@ -1104,9 +1104,9 @@ func MakeInproxyBrokerDialParameters(
 		return nil, errors.Trace(err)
 	}
 
-	// Initialize DialConfig to be passed to the corresponding dialers.
+	// Initialize Dial/MeekConfigs to be passed to the corresponding dialers.
 
-	err = brokerDialParams.prepareDialConfig(
+	err = brokerDialParams.prepareDialConfigs(
 		config,
 		p,
 		false)
@@ -1117,8 +1117,8 @@ func MakeInproxyBrokerDialParameters(
 	return brokerDialParams, nil
 }
 
-// prepareDialConfig is called for both new and replayed broker dial parameters.
-func (brokerDialParams *InproxyBrokerDialParameters) prepareDialConfig(
+// prepareDialConfigs is called for both new and replayed broker dial parameters.
+func (brokerDialParams *InproxyBrokerDialParameters) prepareDialConfigs(
 	config *Config,
 	p parameters.ParametersAccessor,
 	isReplay bool) error {
@@ -1135,7 +1135,7 @@ func (brokerDialParams *InproxyBrokerDialParameters) prepareDialConfig(
 		payloadSecure := true
 		skipVerify := false
 
-		err := brokerDialParams.FrontedHTTPDialParameters.prepareDialConfig(
+		err := brokerDialParams.FrontedHTTPDialParameters.prepareDialConfigs(
 			config, p, nil, nil, true, skipVerify,
 			config.DisableSystemRootCAs, payloadSecure)
 		if err != nil {