Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions lib/web3/eth.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* Web3
*
*
* @module web3
*/

Expand Down Expand Up @@ -77,16 +77,16 @@ var uncleCountCall = function (args) {
/// @returns an array of objects describing web3.eth api methods

var getBalance = new Method({
name: 'getBalance',
call: 'eth_getBalance',
name: 'getBalance',
call: 'eth_getBalance',
params: 2,
inputFormatter: [utils.toAddress, formatters.inputDefaultBlockNumberFormatter],
outputFormatter: formatters.outputBigNumberFormatter
});

var getStorageAt = new Method({
name: 'getStorageAt',
call: 'eth_getStorageAt',
name: 'getStorageAt',
call: 'eth_getStorageAt',
params: 3,
inputFormatter: [null, utils.toHex, formatters.inputDefaultBlockNumberFormatter]
});
Expand All @@ -99,7 +99,7 @@ var getCode = new Method({
});

var getBlock = new Method({
name: 'getBlock',
name: 'getBlock',
call: blockCall,
params: 2,
inputFormatter: [formatters.inputBlockNumberFormatter, function (val) { return !!val; }],
Expand Down Expand Up @@ -224,6 +224,11 @@ var properties = [
name: 'mining',
getter: 'eth_mining'
}),
new Property({
name: 'hashrate',
getter: 'eth_hashrate',
outputFormatter: utils.toDecimal
}),
new Property({
name: 'gasPrice',
getter: 'eth_gasPrice',
Expand Down
38 changes: 38 additions & 0 deletions test/web3.eth.hashRate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
var chai = require('chai');
var assert = chai.assert;
var web3 = require('../index');
var FakeHttpProvider = require('./helpers/FakeHttpProvider');

var method = 'hashrate';

var tests = [{
result: '0x788a8',
formattedResult: 493736,
call: 'eth_'+ method
}];

describe('web3.eth', function () {
describe(method, function () {
tests.forEach(function (test, index) {
it('property test: ' + index, function () {

// given
var provider = new FakeHttpProvider();
web3.setProvider(provider);
provider.injectResult(test.result);
provider.injectValidation(function (payload) {
assert.equal(payload.jsonrpc, '2.0');
assert.equal(payload.method, test.call);
assert.deepEqual(payload.params, []);
});

// when
var result = web3.eth[method];

// then
assert.strictEqual(test.formattedResult, result);
});
});
});
});