Rename some missing return to returnValue (#604)

ethereumjs · Sep 23, 2019 · 00d8fe3 · 00d8fe3
1 parent 3456922
commit 00d8fe3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/examples/run-blockchain/index.ts b/examples/run-blockchain/index.ts
@@ -39,7 +39,7 @@ async function main() {
 
   await vm.runBlockchain(blockchain)
 
-  const blockchainHead = await promisify(vm.blockchain.getHead.bind(vm.blockchain))()
+  const blockchainHead = await promisify<any>(vm.blockchain.getHead.bind(vm.blockchain))()
 
   console.log('--- Finished processing the BlockChain ---')
   console.log('New head:', '0x' + blockchainHead.hash().toString('hex'))

diff --git a/examples/run-code-browser/index.js b/examples/run-code-browser/index.js
@@ -21,7 +21,7 @@ const PUSH1 = '60'
 // Note that numbers added are hex values, so '20' would be '32' as decimal e.g.
 const code = [PUSH1, '03', PUSH1, '05', ADD, STOP]
 
-vm.on('step', function(data) {
+vm.on('step', function (data) {
   console.log(`Opcode: ${data.opcode.name}\tStack: ${data.stack}`)
 })
 
@@ -30,7 +30,7 @@ vm.runCode({
   gasLimit: new BN(0xffff),
 })
   .then(results => {
-    console.log('Returned : ' + results.return.toString('hex'))
+    console.log('Returned : ' + results.returnValue.toString('hex'))
     console.log('gasUsed  : ' + results.gasUsed.toString())
   })
   .catch(console.error)
diff --git a/examples/run-solidity-contract/index.ts b/examples/run-solidity-contract/index.ts
@@ -151,7 +151,7 @@ async function getGreeting(vm: VM, contractAddress: Buffer, caller: Buffer) {
     throw greetResult.execResult.exceptionError
   }
 
-  const results = abi.rawDecode(['string'], greetResult.execResult.return)
+  const results = abi.rawDecode(['string'], greetResult.execResult.returnValue)
 
   return results[0]
 }

diff --git a/examples/run-transactions-complete/index.ts b/examples/run-transactions-complete/index.ts
@@ -61,7 +61,7 @@ async function runTx(vm: VM, rawTx: any, privateKey: Buffer) {
   })
 
   console.log('gas used: ' + results.gasUsed.toString())
-  console.log('returned: ' + results.execResult.return.toString('hex'))
+  console.log('returned: ' + results.execResult.returnValue.toString('hex'))
 
   const createdAddress = results.createdAddress
 

diff --git a/tests/VMTestsRunner.js b/tests/VMTestsRunner.js
@@ -55,7 +55,7 @@ module.exports = function runVMTest (options, testData, t, cb) {
       }
 
       if (testData.out.slice(2)) {
-        t.equal(results.return.toString('hex'), testData.out.slice(2), 'valid return value')
+        t.equal(results.returnValue.toString('hex'), testData.out.slice(2), 'valid return value')
       }
 
       if (testData.log && testData.logs.length !== 0) {