Merge pull request web3#198 from ethereum/minerMethods

Miner methods
alexvandesande · May 12, 2015 · ae7762a · ae7762a
2 parents 373fd1b + d1e1206
commit ae7762a
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 10 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -363,6 +363,7 @@ var toAddress = function (address) {
     return '0x' + padLeft(toHex(address).substr(2), 40);
 };
 
+
 /**
  * Returns true if object is BigNumber, otherwise false
  *

diff --git a/lib/web3/eth.js b/lib/web3/eth.js
@@ -192,6 +192,18 @@ var compileSerpent = new Method({
     params: 1
 });
 
+var submitWork = new Method({
+    name: 'submitWork',
+    call: 'eth_submitWork',
+    params: 3
+});
+
+var getWork = new Method({
+    name: 'getWork',
+    call: 'eth_getWork',
+    params: 0
+});
+
 var methods = [
     getBalance,
     getStorageAt,
@@ -209,6 +221,8 @@ var methods = [
     compileSolidity,
     compileLLL,
     compileSerpent,
+    submitWork,
+    getWork
 ];
 
 /// @returns an array of objects describing web3.eth api properties

diff --git a/test/web3.eth.getWork.js b/test/web3.eth.getWork.js
@@ -0,0 +1,16 @@
+var chai = require('chai');
+var web3 = require('../index');
+var testMethod = require('./helpers/test.method.js');
+
+var method = 'getWork';
+
+var tests = [{
+    args: [],
+    formattedArgs: [],
+    result: true,
+    formattedResult: true,
+    call: 'eth_'+ method
+}];
+
+testMethod.runTests('eth', method, tests);
+
diff --git a/test/web3.eth.submitWork.js b/test/web3.eth.submitWork.js
@@ -0,0 +1,17 @@
+var chai = require('chai');
+var web3 = require('../index');
+var testMethod = require('./helpers/test.method.js');
+
+var method = 'submitWork';
+
+var tests = [
+{
+    args: ['0x567890abcdef5555', '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef', '0xcdef1234567890abcdef1234567890abcdef0x1234567890abcf1234567890ab'],
+    formattedArgs: ['0x567890abcdef5555', '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef', '0xcdef1234567890abcdef1234567890abcdef0x1234567890abcf1234567890ab'],
+    result: true,
+    formattedResult: true,
+    call: 'eth_'+ method
+}];
+
+testMethod.runTests('eth', method, tests);
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -363,6 +363,7 @@ var toAddress = function (address) { @@
         return '0x' + padLeft(toHex(address).substr(2), 40);
     };
     /**
      * Returns true if object is BigNumber, otherwise false
      *
@@ Expand Down @@