From d5d79381187e2b5a4b3cd5befadf873edffb55ce Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 22 Jun 2021 14:27:13 +0200 Subject: [PATCH] improve loading opcodes --- .../debugger-ui/src/reducers/assembly-items.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts b/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts index 4038cce2d9..35d428c667 100644 --- a/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts +++ b/libs/remix-ui/debugger-ui/src/reducers/assembly-items.ts @@ -20,6 +20,14 @@ export const initialState = { hasError: null } +const reducedOpcode = (opCodes) => { + const length = 50 + let bottom = opCodes.index - 10 + bottom = bottom < 0 ? 0 : bottom + const top = bottom + length + return { top, bottom, display: opCodes.code.slice(bottom, top) } +} + export const reducer = (state = initialState, action: Action) => { switch (action.type) { case 'FETCH_OPCODES_REQUEST': { @@ -34,16 +42,12 @@ export const reducer = (state = initialState, action: Action) => { const opCodes = action.payload.address === state.opCodes.address ? { ...state.opCodes, index: action.payload.index } : deepEqual(action.payload.code, state.opCodes.code) ? state.opCodes : action.payload - const top = opCodes.index - 3 > 0 ? opCodes.index - 3 : 0 - const bottom = opCodes.index + 4 < opCodes.code.length ? opCodes.index + 4 : opCodes.code.length - const display = opCodes.code.slice(top, bottom) + const reduced = reducedOpcode(opCodes) return { opCodes, - display, - index: display.findIndex(code => code === opCodes.code[opCodes.index]), - top, - bottom, + display: reduced.display, + index: reduced.display.findIndex(code => code === opCodes.code[opCodes.index]), isRequesting: false, isSuccessful: true, hasError: null