From 09dc7a4abf701291c00217ce8621af9020b02a12 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Thu, 5 Dec 2019 19:37:12 +0530 Subject: [PATCH] remix-lib tests fixes --- remix-lib/src/helpers/txResultHelper.js | 2 +- remix-lib/test/txResultHelper.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/remix-lib/src/helpers/txResultHelper.js b/remix-lib/src/helpers/txResultHelper.js index cf6f0a8e26..f608324062 100644 --- a/remix-lib/src/helpers/txResultHelper.js +++ b/remix-lib/src/helpers/txResultHelper.js @@ -27,7 +27,7 @@ function resultToRemixTx (txResult) { if (isHexString(result)) { returnValue = result } else if (execResult !== undefined) { - returnValue = execResult.return + returnValue = execResult.returnValue errorMessage = execResult.exceptionError } diff --git a/remix-lib/test/txResultHelper.js b/remix-lib/test/txResultHelper.js index 0690235a7a..21e04c4a4f 100644 --- a/remix-lib/test/txResultHelper.js +++ b/remix-lib/test/txResultHelper.js @@ -46,12 +46,11 @@ const VM_RESULT = { gasRefund: new BN(0), gasUsed: new BN(GAS_USED_INT), status: STATUS_OK, - vm: { - exception: 1, + execResult: { exceptionError: null, gasRefund: new BN(0), gasUsed: new BN(GAS_USED_INT), - return: RETURN_VALUE_BUFFER + returnValue: RETURN_VALUE_BUFFER } }, transactionHash: TRANSACTION_HASH @@ -103,8 +102,7 @@ tape('converts VM result to RemixTx', function (t) { t.equal(remixTx.return, RETURN_VALUE_HEX) t.equal(remixTx.error, null) - txResult.result.vm.exception = 0 - txResult.result.vm.exceptionError = 'this is an error' + txResult.result.execResult.exceptionError = 'this is an error' remixTx = resultToRemixTx(txResult) t.equal(remixTx.error, 'this is an error')