From 60f4570460684d724d7def53117e580f891f9ce3 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Thu, 19 Apr 2018 21:23:09 -0400
Subject: [PATCH] move json rpc response out of txProcess

---
 remix-simulator/src/provider.js  |  4 +++-
 remix-simulator/src/server.js    |  1 -
 remix-simulator/src/txProcess.js | 10 +++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/remix-simulator/src/provider.js b/remix-simulator/src/provider.js
index 76c6e33ba3..c834278251 100644
--- a/remix-simulator/src/provider.js
+++ b/remix-simulator/src/provider.js
@@ -37,7 +37,9 @@ Provider.prototype.sendAsync = function (payload, callback) {
     callback(null, jsonRPCResponse(payload.id, 1))
   }
   if (payload.method === 'eth_sendTransaction') {
-    processTx(this.accounts, payload, false, callback)
+    processTx(this.accounts, payload, false, (_err, result) => {
+      callback(null, jsonRPCResponse(payload.id, result))
+    })
   }
   if (payload.method === 'eth_getTransactionReceipt') {
     executionContext.web3().eth.getTransactionReceipt(payload.params[0], (error, receipt) => {
diff --git a/remix-simulator/src/server.js b/remix-simulator/src/server.js
index f287755a53..705d4a5dba 100644
--- a/remix-simulator/src/server.js
+++ b/remix-simulator/src/server.js
@@ -27,4 +27,3 @@ app.use(function (req, res) {
 })
 
 app.listen(8545, () => log('Remix Simulator listening on port 8545!'))
-
diff --git a/remix-simulator/src/txProcess.js b/remix-simulator/src/txProcess.js
index 9139b8706b..f79c3550c5 100644
--- a/remix-simulator/src/txProcess.js
+++ b/remix-simulator/src/txProcess.js
@@ -3,10 +3,6 @@ var TxExecution = RemixLib.execution.txExecution
 var TxRunner = RemixLib.execution.txRunner
 var executionContext = RemixLib.execution.executionContext
 
-function jsonRPCResponse (id, result) {
-  return {'id': id, 'jsonrpc': '2.0', 'result': result}
-}
-
 function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, isCall, callback) {
   let finalCallback = function (err, result) {
     if (err) {
@@ -18,10 +14,10 @@ function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, i
       if (toReturn === '0x') {
         toReturn = '0x0'
       }
-      return callback(null, jsonRPCResponse(payload.id, toReturn))
+      return callback(null, toReturn)
     }
 
-    callback(null, jsonRPCResponse(payload.id, result.transactionHash))
+    callback(null, result.transactionHash)
   }
 
   TxExecution.callFunction(from, to, data, value, gasLimit, null, txRunner, callbacks, finalCallback, isCall)
@@ -32,7 +28,7 @@ function createContract (payload, from, data, value, gasLimit, txRunner, callbac
     if (err) {
       return callback(err)
     }
-    callback(null, jsonRPCResponse(payload.id, result.transactionHash))
+    callback(null, result.transactionHash)
   }
 
   TxExecution.createContract(from, data, value, gasLimit, txRunner, callbacks, finalCallback)