Skip to content

Commit 1e9fcdc

Browse files
STetsingSTetsing
authored
Merge branch 'master' into fix_ai_e2e_tests_for_betatest
2 parents 0637fdd + 5ea4594 commit 1e9fcdc

File tree

14 files changed

+365
-168
lines changed

14 files changed

+365
-168
lines changed

‎apps/remix-ide-e2e/src/tests/debugger.test.ts‎

Lines changed: 63 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ module.exports = {
9696
.waitForElementVisible('#stepdetail')
9797
.waitForElementVisible({
9898
locateStrategy: 'xpath',
99-
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"3")]',
99+
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"474")]',
100100
}).pause(1000)
101101
.getEditorValue((content) => {
102102
browser.assert.ok(content.indexOf(`constructor (string memory name_, string memory symbol_) {
@@ -132,7 +132,7 @@ module.exports = {
132132
.waitForElementVisible('#stepdetail')
133133
.waitForElementVisible({
134134
locateStrategy: 'xpath',
135-
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"42")]',
135+
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"131")]',
136136
})
137137
.goToVMTraceStep(261)
138138
.waitForElementPresent('.highlightLine8')
@@ -452,36 +452,72 @@ const sources = [
452452
]
453453

454454
const localVariable_step266_ABIEncoder = { // eslint-disable-line
455-
idAsk: {
456-
type: 'bytes32',
457-
value: '0x0000000000000000000000000000000000000000000000000000000000000002'
458-
},
459-
userData: {
460-
value: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4',
461-
type: 'bytes'
462-
}
455+
"userData": {
456+
"value": "0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4",
457+
"type": "bytes"
458+
},
459+
"<1>": {
460+
"length": "0x0",
461+
"value": "0x",
462+
"type": "bytes"
463+
},
464+
"<2>": {
465+
"value": "0x0000000000000000000000000000000000000000000000000000000000000000",
466+
"type": "bytes32"
467+
},
468+
"<3>": {
469+
"value": "0x0000000000000000000000000000000000000000000000000000000000000000",
470+
"type": "bytes32"
471+
},
472+
"<4>": {
473+
"value": "0",
474+
"type": "uint256"
475+
},
476+
"idAsk": {
477+
"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
478+
"type": "bytes32"
479+
}
463480
}
464481

465482
const localVariable_step717_ABIEncoder = { // eslint-disable-line
466-
idAsk: {
467-
type: 'bytes32',
468-
value: '0x0000000000000000000000000000000000000000000000000000000000000002'
469-
},
470-
idOffer: {
471-
type: 'bytes32',
472-
value: '0x0000000000000000000000000000000000000000000000000000000000000001'
473-
},
474-
ro: {
475-
length: '0xd0',
476-
type: 'bytes',
477-
value: '0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001'
478-
},
479-
userData: {
480-
value: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4',
481-
type: 'bytes'
482-
}
483+
"userData": {
484+
"value": "0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4",
485+
"type": "bytes"
486+
},
487+
"<1>": {
488+
"length": "0xd0",
489+
"value": "0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",
490+
"type": "bytes"
491+
},
492+
"<2>": {
493+
"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
494+
"type": "bytes32"
495+
},
496+
"<3>": {
497+
"value": "0x0000000000000000000000000000000000000000000000000000000000000001",
498+
"type": "bytes32"
499+
},
500+
"<4>": {
501+
"value": "84",
502+
"type": "uint256"
503+
},
504+
"idAsk": {
505+
"value": "0x0000000000000000000000000000000000000000000000000000000000000002",
506+
"type": "bytes32"
507+
},
508+
"idOffer": {
509+
"value": "0x0000000000000000000000000000000000000000000000000000000000000001",
510+
"type": "bytes32"
511+
},
512+
"ro": {
513+
"length": "0xd0",
514+
"value": "0x5b38da6a701c568545dcfcb03fcb875f56beddc45b38da6a701c568545dcfcb03fcb875f56beddc400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001",
515+
"type": "bytes"
516+
}
483517
}
484518

519+
520+
485521
const jsGetTrace = `(async () => {
486522
try {
487523
const result = await remix.call('debugger', 'getTrace', '<txhash>')

‎apps/remix-ide/src/app/tabs/debugger-tab.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
9494
* @returns {Promise<any|null>} The decoded variable value and metadata, or null if debugger backend is not initialized
9595
*/
9696
async decodeLocalVariable (variableId: number, stepIndex?: number) {
97-
console.log("debuggerBackend", this.debuggerBackend)
9897
if (!this.debuggerBackend) return null
9998
return await this.debuggerBackend.debugger.decodeLocalVariableById(stepIndex || this.debuggerBackend.step_manager.currentStepIndex, variableId)
10099
}
@@ -108,7 +107,6 @@ export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
108107
* @returns {Promise<any|null>} The decoded variable value and metadata, or null if debugger backend is not initialized
109108
*/
110109
async decodeStateVariable (variableId: number, stepIndex?: number) {
111-
console.log("debuggerBackend", this.debuggerBackend)
112110
if (!this.debuggerBackend) return null
113111
return await this.debuggerBackend.debugger.decodeStateVariableById(stepIndex || this.debuggerBackend.step_manager.currentStepIndex, variableId)
114112
}
@@ -220,7 +218,6 @@ export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
220218
* @returns {Promise<any|null>} Array of state variable metadata objects, or null if debugger backend is not initialized
221219
*/
222220
async extractStateAt (step: number) {
223-
console.log("debuggerBackend", this.debuggerBackend)
224221
if (!this.debuggerBackend) return null
225222
return await this.debuggerBackend.debugger.extractStateAt(step)
226223
}
@@ -235,7 +232,6 @@ export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
235232
* @returns {Promise<any|null>} Object mapping variable names to their decoded values, or null if debugger backend is not initialized
236233
*/
237234
async decodeStateAt (step: number, stateVars: any[], callback?: (result: any) => void) {
238-
console.log("debuggerBackend", this.debuggerBackend)
239235
if (!this.debuggerBackend) return null
240236
return await this.debuggerBackend.debugger.decodeStateAt(step, stateVars, callback)
241237
}
@@ -259,7 +255,6 @@ export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
259255
* @returns {void|null} Returns null if debugger backend is not initialized
260256
*/
261257
jumpTo (step: number) {
262-
console.log("debuggerBackend", this.debuggerBackend)
263258
if (!this.debuggerBackend) return null
264259
return this.debuggerBackend.step_manager.jumpTo(step)
265260
}

0 commit comments

Comments
 (0)