Merge pull request #173 from ethereum/failing_develop

Fixed tests
web3 · Apr 20, 2015 · cdf02ec · cdf02ec
2 parents c06d75b + a827076
commit cdf02ec
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 26 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/web3/formatters.js b/lib/web3/formatters.js
@@ -91,6 +91,7 @@ var inputTransactionFormatter = function (options){
 var outputTransactionFormatter = function (tx){
     tx.blockNumber = utils.toDecimal(tx.blockNumber);
     tx.transactionIndex = utils.toDecimal(tx.transactionIndex);
+    tx.nonce = utils.toDecimal(tx.nonce);
     tx.gas = utils.toDecimal(tx.gas);
     tx.gasPrice = utils.toBigNumber(tx.gasPrice);
     tx.value = utils.toBigNumber(tx.value);
@@ -113,7 +114,6 @@ var outputBlockFormatter = function(block) {
     block.timestamp = utils.toDecimal(block.timestamp);
     block.number = utils.toDecimal(block.number);
 
-    block.minGasPrice = utils.toBigNumber(block.minGasPrice);
     block.difficulty = utils.toBigNumber(block.difficulty);
     block.totalDifficulty = utils.toBigNumber(block.totalDifficulty);
 

diff --git a/test/formatters.outputBlockFormatter.js b/test/formatters.outputBlockFormatter.js
@@ -16,7 +16,6 @@ describe('formatters', function () {
                 difficulty: '0x3e8',
                 totalDifficulty: '0x3e8',
                 number: '0x3e8',
-                minGasPrice: '0x3e8',
                 gasLimit: '0x3e8',
                 gasUsed: '0x3e8',
                 timestamp: '0x3e8',
@@ -34,7 +33,6 @@ describe('formatters', function () {
                 difficulty: new BigNumber(1000),
                 totalDifficulty: new BigNumber(1000),
                 number: 1000,
-                minGasPrice: new BigNumber(1000),
                 gasLimit: 1000,
                 gasUsed: 1000,
                 timestamp: 1000,

diff --git a/test/formatters.outputTransactionFormatter.js b/test/formatters.outputTransactionFormatter.js
@@ -13,6 +13,7 @@ describe('formatters', function () {
                 value: '0x3e8',
                 gas: '0x3e8',
                 gasPrice: '0x3e8',
+                nonce: '0xb',
                 transactionIndex: '0x1',
                 blockNumber: '0x3e8',
                 blockHash: '0x34234bf23bf4234'
@@ -23,6 +24,7 @@ describe('formatters', function () {
                 value: new BigNumber(1000),
                 gas: 1000,
                 gasPrice: new BigNumber(1000),
+                nonce: 11,
                 blockNumber: 1000,
                 blockHash: '0x34234bf23bf4234',
                 transactionIndex: 1

diff --git a/test/web3.eth.getBlock.js b/test/web3.eth.getBlock.js
@@ -19,7 +19,6 @@ var blockResult = {
     "size":  "0x027f07",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x9f759",
-    "minGasPrice": "0x9f759",
     "gasUsed": "0x9f759",
     "timestamp": "0x54e34e8e",
     "transactions": ['0x460cfb8472af2c5fd05b5a2','0x460cfb8472af2c5fd05b5a2'],
@@ -40,7 +39,6 @@ var formattedBlockResult = {
     "size":  163591,
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": 653145,
-    "minGasPrice": new BigNumber(653145),
     "gasUsed": 653145,
     "timestamp": 1424182926,
     "transactions": ['0x460cfb8472af2c5fd05b5a2','0x460cfb8472af2c5fd05b5a2'],
@@ -61,13 +59,12 @@ var blockResultWithTx = {
     "size":  "0x027f07",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x9f759",
-    "minGasPrice": "0x9f759",
     "gasUsed": "0x9f759",
     "timestamp": "0x54e34e8e",
     "transactions": [{
         "status": "mined",
         "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-        "nonce":"0x",
+        "nonce":"0x2",
         "blockHash": "0x6fd9e2a26ab",
         "blockNumber": "0x15df",
         "transactionIndex":  "0x1",
@@ -95,13 +92,12 @@ var formattedBlockResultWithTx = {
     "size":  163591,
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": 653145,
-    "minGasPrice": new BigNumber(653145),
     "gasUsed": 653145,
     "timestamp": 1424182926,
     "transactions": [{
         "status": "mined",
         "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-        "nonce":"0x",
+        "nonce": 2,
         "blockHash": "0x6fd9e2a26ab",
         "blockNumber": 5599,
         "transactionIndex":  1,

diff --git a/test/web3.eth.getTransaction.js b/test/web3.eth.getTransaction.js
@@ -8,7 +8,7 @@ var method = 'getTransaction';
 var txResult = {
     "status": "mined",
     "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-    "nonce":"0x",
+    "nonce":"0x5",
     "blockHash": "0x6fd9e2a26ab",
     "blockNumber": "0x15df",
     "transactionIndex":  "0x1",
@@ -22,7 +22,7 @@ var txResult = {
 var formattedTxResult = {
     "status": "mined",
     "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-    "nonce":"0x",
+    "nonce":5,
     "blockHash": "0x6fd9e2a26ab",
     "blockNumber": 5599,
     "transactionIndex":  1,

diff --git a/test/web3.eth.getTransactionFromBlock.js b/test/web3.eth.getTransactionFromBlock.js
@@ -8,7 +8,7 @@ var method = 'getTransactionFromBlock';
 var txResult = {
     "status": "mined",
     "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-    "nonce":"0x",
+    "nonce":"0xb",
     "blockHash": "0x6fd9e2a26ab",
     "blockNumber": "0x15df",
     "transactionIndex":  "0x1",
@@ -22,7 +22,7 @@ var txResult = {
 var formattedTxResult = {
     "status": "mined",
     "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-    "nonce":"0x",
+    "nonce":11,
     "blockHash": "0x6fd9e2a26ab",
     "blockNumber": 5599,
     "transactionIndex":  1,

diff --git a/test/web3.eth.getUncle.js b/test/web3.eth.getUncle.js
@@ -20,7 +20,6 @@ var blockResult = {
     "size":  "0x027f07",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x9f759",
-    "minGasPrice": "0x9f759",
     "gasUsed": "0x9f759",
     "timestamp": "0x54e34e8e",
     "transactions": ['0x460cfb8472af2c5fd05b5a2','0x460cfb8472af2c5fd05b5a2'],
@@ -41,7 +40,6 @@ var formattedBlockResult = {
     "size":  163591,
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": 653145,
-    "minGasPrice": new BigNumber(653145),
     "gasUsed": 653145,
     "timestamp": 1424182926,
     "transactions": ['0x460cfb8472af2c5fd05b5a2','0x460cfb8472af2c5fd05b5a2'],
@@ -62,13 +60,12 @@ var blockResultWithTx = {
     "size":  "0x027f07",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": "0x9f759",
-    "minGasPrice": "0x9f759",
     "gasUsed": "0x9f759",
     "timestamp": "0x54e34e8e",
     "transactions": [{
         "status": "mined",
         "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-        "nonce":"0x",
+        "nonce":"0x2",
         "blockHash": "0x6fd9e2a26ab",
         "blockNumber": "0x15df",
         "transactionIndex":  "0x1",
@@ -96,13 +93,12 @@ var formattedBlockResultWithTx = {
     "size":  163591,
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "gasLimit": 653145,
-    "minGasPrice": new BigNumber(653145),
     "gasUsed": 653145,
     "timestamp": 1424182926,
     "transactions": [{
         "status": "mined",
         "hash":"0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b",
-        "nonce":"0x",
+        "nonce": 2,
         "blockHash": "0x6fd9e2a26ab",
         "blockNumber": 5599,
         "transactionIndex":  1,