FSM: Fix new keyword linting error

4 files changed, 21 insertions, 21 deletions

diff --git a/client/client_test.go b/client/client_test.go
index b12919e..8ded272 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -82,15 +82,15 @@ func TestServer(t *testing.T) {
 		"org.letsconnect-vpn.app.linux",
 		"0.1.0-test",
 		dir,
-		func(old FSMStateID, new FSMStateID, data interface{}) bool {
+		func(oldState FSMStateID, newState FSMStateID, data interface{}) bool {
 			// test if main server server list succeeds
-			if new == StateMain {
+			if newState == StateMain {
 				_, listErr := state.ServerList()
 				if listErr != nil {
 					t.Fatalf("Got server list error: %v", listErr)
 				}
 			}
-			go stateCallback(ck, old, new, data)
+			go stateCallback(ck, oldState, newState, data)
 			return true
 		},
 		false,
@@ -137,8 +137,8 @@ func TestTokenExpired(t *testing.T) {
 		"org.letsconnect-vpn.app.linux",
 		"0.1.0-test",
 		dir,
-		func(old FSMStateID, new FSMStateID, data interface{}) bool {
-			go stateCallback(ck, old, new, data)
+		func(oldState FSMStateID, newState FSMStateID, data interface{}) bool {
+			go stateCallback(ck, oldState, newState, data)
 			return true
 		},
 		false,
@@ -196,8 +196,8 @@ func TestInvalidProfileCorrected(t *testing.T) {
 		"org.letsconnect-vpn.app.linux",
 		"0.1.0-test",
 		dir,
-		func(old FSMStateID, new FSMStateID, data interface{}) bool {
-			go stateCallback(ck, old, new, data)
+		func(oldState FSMStateID, newState FSMStateID, data interface{}) bool {
+			go stateCallback(ck, oldState, newState, data)
 			return true
 		},
 		false,
@@ -253,8 +253,8 @@ func TestConfigStartup(t *testing.T) {
 		"org.letsconnect-vpn.app.linux",
 		"0.1.0-test",
 		dir,
-		func(old FSMStateID, new FSMStateID, data interface{}) bool {
-			go stateCallback(ck, old, new, data)
+		func(oldState FSMStateID, newState FSMStateID, data interface{}) bool {
+			go stateCallback(ck, oldState, newState, data)
 			return true
 		},
 		false,
@@ -314,8 +314,8 @@ func TestPreferTCP(t *testing.T) {
 		"org.letsconnect-vpn.app.linux",
 		"0.1.0-test",
 		dir,
-		func(old FSMStateID, new FSMStateID, data interface{}) bool {
-			go stateCallback(ck, old, new, data)
+		func(oldState FSMStateID, newState FSMStateID, data interface{}) bool {
+			go stateCallback(ck, oldState, newState, data)
 			return true
 		},
 		false,
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
index 6f074fb..e7b2379 100644
--- a/cmd/cli/main.go
+++ b/cmd/cli/main.go
@@ -111,8 +111,8 @@ func printConfig(url string, srvType srvtypes.Type) {
 		"org.eduvpn.app.linux",
 		fmt.Sprintf("%s-cli", version.Version),
 		"configs",
-		func(old client.FSMStateID, new client.FSMStateID, data interface{}) bool {
-			stateCallback(c, old, new, data)
+		func(oldState client.FSMStateID, newState client.FSMStateID, data interface{}) bool {
+			stateCallback(c, oldState, newState, data)
 			return true
 		},
 		true,
diff --git a/exports/exports.go b/exports/exports.go
index 6df8c33..1347c35 100644
--- a/exports/exports.go
+++ b/exports/exports.go
@@ -150,8 +150,8 @@ func Register(
 		C.GoString(name),
 		C.GoString(version),
 		C.GoString(configDirectory),
-		func(old client.FSMStateID, new client.FSMStateID, data interface{}) bool {
-			return stateCallback(cb, old, new, data)
+		func(oldState client.FSMStateID, newState client.FSMStateID, data interface{}) bool {
+			return stateCallback(cb, oldState, newState, data)
 		},
 		debug != 0,
 	)
diff --git a/internal/fsm/fsm_test.go b/internal/fsm/fsm_test.go
index ebbf4c7..abe73e7 100644
--- a/internal/fsm/fsm_test.go
+++ b/internal/fsm/fsm_test.go
@@ -149,9 +149,9 @@ func TestGoTransitionRequired(t *testing.T) {
 
 	for _, c := range cases {
 		curr := machine.Current
-		machine.StateCallback = func(_ StateID, new StateID, data interface{}) bool {
-			if c.WantErr == "" && new != c.In {
-				t.Fatalf("new state is not what we want, got: %v, want: %v", new, c.In)
+		machine.StateCallback = func(_ StateID, newState StateID, data interface{}) bool {
+			if c.WantErr == "" && newState != c.In {
+				t.Fatalf("new state is not what we want, got: %v, want: %v", newState, c.In)
 			}
 			v, ok := data.(string)
 			if !ok {
@@ -217,9 +217,9 @@ func TestGoTransition(t *testing.T) {
 		machine.StateCallback = func(StateID, StateID, interface{}) bool {
 			return c.Handle
 		}
-		machine.StateCallback = func(_ StateID, new StateID, data interface{}) bool {
-			if c.WantErr == "" && new != c.In {
-				t.Fatalf("new state is not what we want, got: %v, want: %v", new, c.In)
+		machine.StateCallback = func(_ StateID, newState StateID, data interface{}) bool {
+			if c.WantErr == "" && newState != c.In {
+				t.Fatalf("new state is not what we want, got: %v, want: %v", newState, c.In)
 			}
 			v, ok := data.(string)
 			if !ok {