status-im/status-keycard-go
2
0
Fork 0
mirror of https://github.com/status-im/status-keycard-go.git synced 2025-02-12 06:16:48 +00:00
Code Issues Projects Releases Wiki Activity

improve readability

Browse Source
This commit is contained in:
Michele Balistreri 2021-10-18 16:34:15 +03:00
parent 8e55ed9e58
commit 90ab673e57
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flow.go
View File

@ -129,6 +129,16 @@ func (f *KeycardFlow) pauseAndWait(action string, status FlowStatus) error {
} }
} }
func (f *KeycardFlow) pauseAndRestart(action string, status FlowStatus) error {
err := f.pauseAndWait(action, status)
if err != nil {
return err
}
return restartErr()
}
func (f *KeycardFlow) closeKeycard(kc *keycardContext) { func (f *KeycardFlow) closeKeycard(kc *keycardContext) {
if kc != nil { if kc != nil {
kc.stop() kc.stop()
@ -159,14 +169,6 @@ func (f *KeycardFlow) connect() *keycardContext {
} }
} }
func restartOrCancel(cancel error) error {
if cancel == nil {
return restartErr()
} else {
return cancel
}
}
func (f *KeycardFlow) selectKeycard(kc *keycardContext) error { func (f *KeycardFlow) selectKeycard(kc *keycardContext) error {
appInfo, err := kc.selectApplet() appInfo, err := kc.selectApplet()
@ -175,18 +177,18 @@ func (f *KeycardFlow) selectKeycard(kc *keycardContext) error {
} }
if !appInfo.Installed { if !appInfo.Installed {
return restartOrCancel(f.pauseAndWait(SwapCard, FlowStatus{ErrorKey: ErrorNotAKeycard})) return f.pauseAndRestart(SwapCard, FlowStatus{ErrorKey: ErrorNotAKeycard})
} }
if requiredInstanceUID, ok := f.params[InstanceUID]; ok { if requiredInstanceUID, ok := f.params[InstanceUID]; ok {
if instanceUID := tox(appInfo.InstanceUID); instanceUID != requiredInstanceUID { if instanceUID := tox(appInfo.InstanceUID); instanceUID != requiredInstanceUID {
return restartOrCancel(f.pauseAndWait(SwapCard, FlowStatus{ErrorKey: InstanceUID, InstanceUID: instanceUID})) return f.pauseAndRestart(SwapCard, FlowStatus{ErrorKey: InstanceUID, InstanceUID: instanceUID})
} }
} }
if requiredKeyUID, ok := f.params[KeyUID]; ok { if requiredKeyUID, ok := f.params[KeyUID]; ok {
if keyUID := tox(appInfo.KeyUID); keyUID != requiredKeyUID { if keyUID := tox(appInfo.KeyUID); keyUID != requiredKeyUID {
return restartOrCancel(f.pauseAndWait(SwapCard, FlowStatus{ErrorKey: KeyUID, KeyUID: keyUID})) return f.pauseAndRestart(SwapCard, FlowStatus{ErrorKey: KeyUID, KeyUID: keyUID})
} }
} }