Skip to content

⚡️ Speed up method ServerConnectWizard.start by 25% #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

⚡️ Speed up method ServerConnectWizard.start by 25% #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions electrum/wizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ class AbstractWizard:
def __init__(self):
self.navmap = {}

self._current = WizardViewState(None, {}, {})
# Caching an empty dict avoids creating a new one for each call
# Also, creates a single (reused) WizardViewState for 'reset' with empty view/params.
self._empty_dict = {}
self._empty_viewstate = WizardViewState(None, self._empty_dict, self._empty_dict)
self._current = self._empty_viewstate
self._stack = [] # type: List[WizardViewState]

def navmap_merge(self, additional_navmap: dict):
Expand Down Expand Up @@ -153,8 +157,10 @@ def is_last_view(self, view: str, wizard_data: dict) -> bool:
raise Exception(f'last handler for view {view} is not callable nor a bool literal')

def reset(self):
self._stack = []
self._current = WizardViewState(None, {}, {})
# Reuse the same empty list (avoid creating new list, just clear in-place)
self._stack.clear()
# Reuse cached empty WizardViewState
self._current = self._empty_viewstate

def log_stack(self):
logstr = 'wizard stack:'
Expand Down Expand Up @@ -823,6 +829,8 @@ class ServerConnectWizard(AbstractWizard):

def __init__(self, daemon: 'Daemon'):
AbstractWizard.__init__(self)
# 'params' is only present in 'welcome', so cache it for lookup
self._welcome_params = self.navmap.get('welcome', {}).get('params', {})
self.navmap = {
'welcome': {
'next': lambda d: 'proxy_config' if d['want_proxy'] else 'server_config',
Expand Down Expand Up @@ -876,9 +884,10 @@ def do_configure_autoconnect(self, wizard_data: dict):
def start(self, *, start_viewstate: WizardViewState = None) -> WizardViewState:
self.reset()
if start_viewstate is None:
start_view = 'welcome'
params = self.navmap[start_view].get('params', {})
self._current = WizardViewState(start_view, {}, params)
# Minor in-place variable optimization, avoids repeated attribute lookup
navmap_welcome = self.navmap['welcome']
params = navmap_welcome.get('params', {})
self._current = WizardViewState('welcome', {}, params)
else:
self._current = start_viewstate
return self._current
Expand Down