Skip to content
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

fix: debugger tool tests #122

Merged
merged 4 commits into from
Dec 12, 2023
Merged

fix: debugger tool tests #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5e1012
Merge branch 'main' into nmv/update-debugger-with-instruction-heatmap
vasyl-ivanchuk Dec 12, 2023
20ef5fb
fix: debugger and source viewers tests
vasyl-ivanchuk Dec 12, 2023
6b88f2d
Merge branch 'nmv/update-debugger-with-instruction-heatmap' into fix-…
vasyl-ivanchuk Dec 12, 2023
13c6aec
test: remove unused mock
vasyl-ivanchuk Dec 12, 2023
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
32 changes: 19 additions & 13 deletions packages/app/src/components/debugger/SourceViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,8 @@
<span
class="instruction-list-item-text-container"
:style="{
color:
traceCountPercentage[
`${address}_${Object.keys(pcLineMapping).find((key) => pcLineMapping[parseInt(key)] === item.index)}`
] > 0.4
? 'white'
: 'black',
backgroundColor: `rgba(200, 0, 0, ${
traceCountPercentage[
`${address}_${Object.keys(pcLineMapping).find((key) => pcLineMapping[parseInt(key)] === item.index)}`
]
}`,
color: item.traceCountPercentage > 0.4 ? 'white' : 'black',
backgroundColor: `rgba(200, 0, 0, ${item.traceCountPercentage}`,
}"
>
<span class="instruction-list-item-text" v-html="highlight(item.label, searchText)"></span>
Expand Down Expand Up @@ -86,9 +77,11 @@ const props = defineProps({
},
traceCountPercentage: {
type: Object as PropType<{ [key: string]: number }>,
required: true,
},
pcLineMapping: {
type: Object as PropType<{ [key: number]: number }>,
required: true,
},
});

Expand All @@ -100,7 +93,10 @@ type InstructionNode = {
expandable: boolean;
};

type VirtualInstructionNode = InstructionNode & { index: number };
type VirtualInstructionNode = InstructionNode & {
index: number;
traceCountPercentage: number;
};

const expanded = ref<number[]>([]);
const isReady = ref(false);
Expand Down Expand Up @@ -155,7 +151,17 @@ watchEffect(() => {
}
return val;
})
.map((item, index) => ({ ...item, index, line: item.line }));
.map((item, index) => ({
...item,
index,
line: item.line,
traceCountPercentage:
props.traceCountPercentage[
`${props.address}_${Object.keys(props.pcLineMapping).find(
(key) => props.pcLineMapping[parseInt(key)] === index
)}`
],
}));
if (isReady.value) {
rebuild();
}
Expand Down
14 changes: 4 additions & 10 deletions packages/app/src/composables/useTrace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,24 +205,18 @@ export function useTraceNavigation(trace: ComputedRef<TraceFile | null>, initial
return {};
}

let maxCount = 0;
const countDictionary = trace.value.steps.reduce((acc: { [key: string]: number }, step) => {
const key = `${step.contract_address}_${step.pc}`;
if (acc[key]) {
acc[key] += 1;
} else {
acc[key] = 1;
}
acc[key] = (acc[key] || 0) + 1;
maxCount = Math.max(maxCount, acc[key]);
return acc;
}, {});

const countPercentageDictionary: { [key: string]: number } = {};

for (const [key, value] of Object.entries(countDictionary)) {
countPercentageDictionary[key] =
value /
Object.entries(countDictionary)
.map((x) => x[1])
.reduce((a, b) => Math.max(a, b));
countPercentageDictionary[key] = value / maxCount;
}

return countPercentageDictionary;
Expand Down
28 changes: 28 additions & 0 deletions packages/app/tests/components/debugger/SourceViewer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source: ["Hello World"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -49,6 +51,8 @@ describe("SourceViewer:", () => {
source: ["Hello World"],
errors: ["Error text"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -68,6 +72,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source: ["Hello", "", "World"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -85,6 +91,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source: ["foo", ".func_begin", "Hello", "World", "!", ".func_end"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -107,6 +115,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source: ["foo", ".func_begin", "Hello", "World", "!", ".func_end"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -133,6 +143,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source: ["foo", ".func_begin", "Hello", "World", "!", ".func_end"],
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -159,6 +171,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source,
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -184,6 +198,8 @@ describe("SourceViewer:", () => {
address: "0x00",
source,
container,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand Down Expand Up @@ -218,6 +234,8 @@ describe("SourceViewer:", () => {
line: 2,
step: {},
},
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -242,6 +260,8 @@ describe("SourceViewer:", () => {
source,
container: container as unknown as HTMLElement,
activeStep: { address: "0x00", line: 2, step: {} } as ActiveStep,
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -268,6 +288,8 @@ describe("SourceViewer:", () => {
},
container,
searchText: "Wo",
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -294,6 +316,8 @@ describe("SourceViewer:", () => {
},
container,
searchText: "o",
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand All @@ -315,6 +339,8 @@ describe("SourceViewer:", () => {
container: container as unknown as HTMLElement,
activeStep: { address: "0x00", line: 2, step: {} } as ActiveStep,
activeLines: [1, 3],
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand Down Expand Up @@ -342,6 +368,8 @@ describe("SourceViewer:", () => {
container: container as unknown as HTMLElement,
activeStep: { address: "0x00", line: 2, step: {} } as ActiveStep,
activeLines: [1],
traceCountPercentage: {},
pcLineMapping: {},
},
global: {
plugins: [i18n],
Expand Down
2 changes: 2 additions & 0 deletions packages/app/tests/views/DebuggerView.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ describe("DebuggerView:", () => {
}),
index: ref(0),
total: computed(() => 2),
traceCountPercentage: computed(() => ({})),
});
const { unmount, container } = render(DebuggerView, {
global: {
Expand Down Expand Up @@ -486,6 +487,7 @@ describe("DebuggerView:", () => {
}),
index: ref(1),
total: computed(() => 2),
traceCountPercentage: computed(() => ({})),
});
const { unmount, container } = render(DebuggerView, {
global: {
Expand Down
Loading