Remove TargetAPIEncoding test workaround

ClientLibrary/clientlib/clientlib_test.go

@@ -29,7 +29,6 @@ import (
 	"time"
 
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/protocol"
 )
 
 func setupConfig(t *testing.T, disableFetcher bool) []byte {
@@ -45,10 +44,6 @@ func setupConfig(t *testing.T, disableFetcher bool) []byte {
 		t.Fatalf("json.Unmarshal failed: %v", err)
 	}
 
-	// Use the legacy encoding to both exercise that case, and facilitate a gradual
-	// network upgrade to new encoding support.
-	config["TargetAPIEncoding"] = protocol.PSIPHON_API_ENCODING_JSON
-
 	if disableFetcher {
 		config["DisableRemoteServerListFetcher"] = true
 	}

psiphon/controller_test.go

@@ -351,6 +351,14 @@ func TestTunnelPool(t *testing.T) {
 		})
 }
 
+func TestLegacyAPIEncoding(t *testing.T) {
+	controllerRun(t,
+		&controllerRunConfig{
+			protocol:             protocol.TUNNEL_PROTOCOL_OBFUSCATED_SSH,
+			useLegacyAPIEncoding: true,
+		})
+}
+
 type controllerRunConfig struct {
 	expectNoServerEntries    bool
 	protocol                 string
@@ -363,6 +371,7 @@ type controllerRunConfig struct {
 	disruptNetwork           bool
 	transformHostNames       bool
 	useFragmentor            bool
+	useLegacyAPIEncoding     bool
 }
 
 func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
@@ -426,9 +435,9 @@ func controllerRun(t *testing.T, runConfig *controllerRunConfig) {
 		modifyConfig["ObfuscatedSSHMaxPadding"] = 8192
 	}
 
-	// Use the legacy encoding to both exercise that case, and facilitate a
-	// gradual network upgrade to new encoding support.
-	modifyConfig["TargetAPIEncoding"] = protocol.PSIPHON_API_ENCODING_JSON
+	if runConfig.useLegacyAPIEncoding {
+		modifyConfig["TargetAPIEncoding"] = protocol.PSIPHON_API_ENCODING_JSON
+	}
 
 	configJSON, _ = json.Marshal(modifyConfig)
 

psiphon/memory_test/memory_test.go

@@ -36,7 +36,6 @@ import (
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/parameters"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/prng"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/protocol"
 )
 
 // memory_test is a memory stress test suite that repeatedly reestablishes
@@ -114,10 +113,6 @@ func runMemoryTest(t *testing.T, testMode int) {
 	modifyConfig["StaggerConnectionWorkersMilliseconds"] = 100
 	modifyConfig["IgnoreHandshakeStatsRegexps"] = true
 
-	// Use the legacy encoding to both exercise that case, and facilitate a
-	// gradual network upgrade to new encoding support.
-	modifyConfig["TargetAPIEncoding"] = protocol.PSIPHON_API_ENCODING_JSON
-
 	configJSON, _ = json.Marshal(modifyConfig)
 
 	config, err := psiphon.LoadConfig(configJSON)

psiphon/server/server_test.go

@@ -613,6 +613,19 @@ func TestSteeringIP(t *testing.T) {
 		})
 }
 
+func TestLegacyAPIEncoding(t *testing.T) {
+	runServer(t,
+		&runServerConfig{
+			tunnelProtocol:       "OSSH",
+			requireAuthorization: true,
+			doTunneledWebRequest: true,
+			doTunneledNTPRequest: true,
+			doDanglingTCPConn:    true,
+			doLogHostProvider:    true,
+			useLegacyAPIEncoding: true,
+		})
+}
+
 type runServerConfig struct {
 	tunnelProtocol       string
 	clientTunnelProtocol string
@@ -640,6 +653,7 @@ type runServerConfig struct {
 	inspectFlows         bool
 	doSteeringIP         bool
 	doTargetBrokerSpecs  bool
+	useLegacyAPIEncoding bool
 }
 
 var (
@@ -1266,6 +1280,10 @@ func runServer(t *testing.T, runConfig *runServerConfig) {
 		clientConfig.MeekAdditionalHeaders = headers
 	}
 
+	if runConfig.useLegacyAPIEncoding {
+		clientConfig.TargetAPIEncoding = protocol.PSIPHON_API_ENCODING_JSON
+	}
+
 	if doInproxy {
 
 		// Limitation: can't exercise DisableTunnels = true since the client

psiphon/tactics_test.go

@@ -30,7 +30,6 @@ import (
 	"time"
 
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/errors"
-	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common/protocol"
 )
 
 func TestStandAloneGetTactics(t *testing.T) {
@@ -66,10 +65,6 @@ func TestStandAloneGetTactics(t *testing.T) {
 		config.ClientPlatform = testClientPlatform
 	}
 
-	// Use the legacy encoding to both exercise that case, and facilitate a
-	// gradual network upgrade to new encoding support.
-	config.TargetAPIEncoding = protocol.PSIPHON_API_ENCODING_JSON
-
 	err = config.Commit(false)
 	if err != nil {
 		t.Fatalf("error committing configuration file: %s", err)