diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2023-03-20 16:31:29 +0100 |
|---|---|---|
| committer | Jeroen Wijenbergh <46386452+jwijenbergh@users.noreply.github.com> | 2023-09-25 09:43:37 +0200 |
| commit | 30f6a4c9991b42ebade54221dbf7f9e0f20e94f4 (patch) | |
| tree | 56e9be1fb98c6579a17a6aabea197b07a6c80467 | |
| parent | 2388b826cc8c0507bc840a728d005450d91adf4b (diff) | |
Client: Remove servers argument to transition
| -rw-r--r-- | client/client.go | 4 | ||||
| -rw-r--r-- | client/fsm.go | 2 | ||||
| -rw-r--r-- | client/server.go | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/client/client.go b/client/client.go index 295fa04..31110bd 100644 --- a/client/client.go +++ b/client/client.go @@ -185,8 +185,8 @@ func (c *Client) Register( log.Logger.Infof("Previous configuration not found") } - // Go to the No Server state with the saved servers after we're done - defer c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + // Go to the No Server state after we're done + defer c.FSM.GoTransition(StateNoServer) // Let's Connect! doesn't care about discovery if c.isLetsConnect() { diff --git a/client/fsm.go b/client/fsm.go index d1d2d9e..9f140e3 100644 --- a/client/fsm.go +++ b/client/fsm.go @@ -180,7 +180,7 @@ func (c *Client) GoBack() error { } // FIXME: Arbitrary back transitions don't work because we need the appropriate data - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) return nil } diff --git a/client/server.go b/client/server.go index 684d780..00e55e8 100644 --- a/client/server.go +++ b/client/server.go @@ -193,7 +193,7 @@ func (c *Client) RemoveSecureInternet() error { } // No error because we can only have one secure internet server and if there are no secure internet servers, this is a NO-OP c.Servers.RemoveSecureInternet() - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) // Save the config if err := c.Config.Save(&c); err != nil { // TODO(jwijenbergh): Not sure why INFO level, yet stacktrace... @@ -215,7 +215,7 @@ func (c *Client) RemoveInstituteAccess(url string) error { } // No error because this is a NO-OP if the server doesn't exist c.Servers.RemoveInstituteAccess(url) - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) // Save the config if err := c.Config.Save(&c); err != nil { // TODO(jwijenbergh): Not sure why INFO level, yet stacktrace... @@ -237,7 +237,7 @@ func (c *Client) RemoveCustomServer(url string) error { } // No error because this is a NO-OP if the server doesn't exist c.Servers.RemoveCustomServer(url) - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) // Save the config if err := c.Config.Save(&c); err != nil { // TODO(jwijenbergh): Not sure why INFO level, yet stacktrace... @@ -296,7 +296,7 @@ func (c *Client) AddInstituteServer(url string) (err error) { return err } - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) return nil } @@ -360,7 +360,7 @@ func (c *Client) AddSecureInternetHomeServer(orgID string) (err error) { _ = c.RemoveSecureInternet() return err } - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) return nil } @@ -408,7 +408,7 @@ func (c *Client) AddCustomServer(url string) (err error) { return err } - c.FSM.GoTransitionWithData(StateNoServer, c.Servers) + c.FSM.GoTransition(StateNoServer) return nil } |