Clone refund counter in EVMResult, fix eip-2200 api tests

s1na · s1na · commit 29f14fb3c923 · 2019-11-11T15:43:53.000+01:00
diff --git a/lib/evm/evm.ts b/lib/evm/evm.ts
@@ -34,6 +34,10 @@ export interface EVMResult {
    * Contains the results from running the code, if any, as described in [[runCode]]
    */
   execResult: ExecResult
+  /**
+   * Amount of gas to refund from deleting storage values
+   */
+  gasRefund?: BN
 }
 
 /**
@@ -121,6 +125,7 @@ export default class EVM {
     } else {
       result = await this._executeCreate(message)
     }
+    result.gasRefund = this._refund.clone()
 
     const err = result.execResult.exceptionError
     if (err) {
diff --git a/tests/api/istanbul/eip-2200.js b/tests/api/istanbul/eip-2200.js
@@ -58,7 +58,7 @@ tape('Istanbul: EIP-2200: net-metering SSTORE', async (t) => {
         t.assert(res.execResult.exceptionError === undefined)
       }
       t.assert(new BN(testCase.used).eq(res.gasUsed))
-      t.assert(new BN(testCase.refund).eq(res.execResult.gasRefund))
+      t.assert(new BN(testCase.refund).eq(res.gasRefund))
     } catch (e) {
       t.fail(e.message)
     }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ tape('Istanbul: EIP-2200: net-metering SSTORE', async (t) => {`
`58`	`58`	`t.assert(res.execResult.exceptionError === undefined)`
`59`	`59`	`}`
`60`	`60`	`t.assert(new BN(testCase.used).eq(res.gasUsed))`
`61`		`- t.assert(new BN(testCase.refund).eq(res.execResult.gasRefund))`
	`61`	`+ t.assert(new BN(testCase.refund).eq(res.gasRefund))`
`62`	`62`	`} catch (e) {`
`63`	`63`	`t.fail(e.message)`
`64`	`64`	`}`