Merge branch 'testing/accounts-module' of github.com:ethereum/web3.js…

… into testing/accounts-module
web3 · Mar 28, 2019 · 296dad3 · 296dad3
2 parents 881b7df + 34c14c7
commit 296dad3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/web3-core-method/lib/methods/transaction/AbstractObservedTransactionMethod.js b/packages/web3-core-method/lib/methods/transaction/AbstractObservedTransactionMethod.js
@@ -172,6 +172,6 @@ export default class AbstractObservedTransactionMethod extends AbstractMethod {
      * @returns {Boolean}
      */
     hasRevertReceiptStatus(receipt) {
-        return Boolean(parseInt(receipt.status)) === false && receipt.status !== undefined && receipt.status !== null;
+        return receipt.status === false && receipt.status !== undefined && receipt.status !== null;
     }
 }
diff --git a/...s/web3-core-method/tests/lib/methods/transaction/AbstractObservedTransactionMethodTest.js b/...s/web3-core-method/tests/lib/methods/transaction/AbstractObservedTransactionMethodTest.js
@@ -69,7 +69,7 @@ describe('AbstractObservedTransactionMethodTest', () => {
         providerMock.send.mockReturnValueOnce(Promise.resolve('transactionHash'));
 
         observableMock.subscribe = jest.fn((next, error, complete) => {
-            next({confirmations: 0, receipt: {status: '0x1'}});
+            next({confirmations: 0, receipt: {status: true}});
 
             complete();
         });
@@ -78,17 +78,17 @@ describe('AbstractObservedTransactionMethodTest', () => {
         promiEvent.on('transactionHash', transactionHashCallback);
         promiEvent.on('confirmation', confirmationCallback);
         promiEvent.on('receipt', (receipt) => {
-            expect(receipt).toEqual({status: '0x1'});
+            expect(receipt).toEqual({status: true});
 
             expect(providerMock.send).toHaveBeenCalledWith('rpcMethod', []);
 
             expect(beforeExecutionMock).toHaveBeenCalledWith(moduleInstanceMock);
 
-            expect(afterExecutionMock).toHaveBeenCalledWith({status: '0x1'});
+            expect(afterExecutionMock).toHaveBeenCalledWith({status: true});
 
             expect(transactionHashCallback).toHaveBeenCalledWith('transactionHash');
 
-            expect(confirmationCallback).toHaveBeenCalledWith(0, {status: '0x1'});
+            expect(confirmationCallback).toHaveBeenCalledWith(0, {status: true});
 
             done();
         });
@@ -120,18 +120,18 @@ describe('AbstractObservedTransactionMethodTest', () => {
         providerMock.send.mockReturnValueOnce(Promise.resolve('transactionHash'));
 
         observableMock.subscribe = jest.fn((next, error, complete) => {
-            next({count: 0, receipt: {status: '0x1'}});
+            next({count: 0, receipt: {status: true}});
 
             complete();
         });
 
-        await expect(method.execute()).resolves.toEqual({status: '0x1'});
+        await expect(method.execute()).resolves.toEqual({status: true});
 
         expect(providerMock.send).toHaveBeenCalledWith('rpcMethod', []);
 
         expect(beforeExecutionMock).toHaveBeenCalledWith(moduleInstanceMock);
 
-        expect(afterExecutionMock).toHaveBeenCalledWith({status: '0x1'});
+        expect(afterExecutionMock).toHaveBeenCalledWith({status: true});
     });
 
     it('calls execute and returns with the expected rejected Promise', async () => {
@@ -152,15 +152,15 @@ describe('AbstractObservedTransactionMethodTest', () => {
         providerMock.send.mockReturnValueOnce(Promise.resolve('transactionHash'));
 
         observableMock.subscribe = jest.fn((next, error, complete) => {
-            next({count: 0, receipt: {status: '0x0', gasUsed: 1}});
+            next({count: 0, receipt: {status: false, gasUsed: 1}});
 
             complete();
         });
 
         method.parameters = [{gas: 0}];
 
         await expect(method.execute()).rejects.toThrow(
-            `Transaction has been reverted by the EVM:\n${JSON.stringify({status: '0x0', gasUsed: 1}, null, 2)}`
+            `Transaction has been reverted by the EVM:\n${JSON.stringify({status: false, gasUsed: 1}, null, 2)}`
         );
 
         expect(providerMock.send).toHaveBeenCalledWith('rpcMethod', method.parameters);
@@ -170,7 +170,7 @@ describe('AbstractObservedTransactionMethodTest', () => {
         providerMock.send.mockReturnValueOnce(Promise.resolve('transactionHash'));
 
         observableMock.subscribe = jest.fn((next, error, complete) => {
-            next({count: 0, receipt: {status: '0x0', gasUsed: 1}});
+            next({count: 0, receipt: {status: false, gasUsed: 1}});
 
             complete();
         });
@@ -179,7 +179,7 @@ describe('AbstractObservedTransactionMethodTest', () => {
 
         await expect(method.execute()).rejects.toThrow(
             `Transaction ran out of gas. Please provide more gas:\n${JSON.stringify(
-                {status: '0x0', gasUsed: 1},
+                {status: false, gasUsed: 1},
                 null,
                 2
             )}`