Remove patching - replace with testrpc/ethereumjs-vm forks

exec.js

@@ -39,18 +39,9 @@ if (argv.silent) {
   log = () => {}
 } 
 
-// Patch our local testrpc if necessary & run the modified testrpc with large block limit,
-// on (hopefully) unused port. (Changes here should be also be added to the before() block
-// of test/run.js).
+// Run the modified testrpc with large block limit, on (hopefully) unused port. 
+// (Changes here should be also be added to the before() block of test/run.js).
 if (!argv.norpc) {
-  const patchRequired = `./${modulesDir}/ethereumjs-vm/lib/opFns.js`
-  const patchInstalled = `./${modulesDir}/ethereumjs-vm/lib/opFns.js.orig`;
-  
-  if (!shell.test('-e', patchInstalled)) {
-    log('Patching local testrpc...');
-    shell.exec(`patch -b ${patchRequired} ./${solcoverDir}/hookIntoEvents.patch`);
-  }
-  
   try {
     log(`Launching testrpc on port ${port}`);
     

package.json

@@ -13,7 +13,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "ethereumjs-testrpc": "https://github.com/ethereumjs/testrpc.git#5ba3c45b2ca306ab589f4a4c649d9afc39042680",
+    "ethereumjs-testrpc": "https://github.com/cgewecke/testrpc.git#solcover",
     "istanbul": "^0.4.5",
     "mkdirp": "^0.5.1",
     "shelljs": "^0.7.4",

test/run.js

@@ -26,8 +26,8 @@ describe('run', () => {
     // CI (Ubuntu) doesn't seem to be freeing  server resources until the parent process of these
     // tests exits so there are errors launching testrpc repeatedly on the same port. Tests #2 through
     // #last will use this instance of testrpc (port 8557). Test #1 uses the instance launched by
-    // the run script (which also installs the patch). This allows us to end run CI container issues
-    // AND verify that the script in exec actually works.
+    // the run script. This allows us to end run CI container issues AND verify that the script in 
+    // exec actually works.
     if (launchTestRpc) {
       port = 8557;
       script = `node ./exec.js --dir "./mock" --port ${port} --norpc --testing --silent`; // --silent