Skip to content

Commit

Permalink
Merge 6a559c6 into 37b30ed
Browse files Browse the repository at this point in the history
  • Loading branch information
@nivida
nivida committed Feb 8, 2019
2 parents 37b30ed + 6a559c6 commit 8eab8fe
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
10 changes: 5 additions & 5 deletions packages/web3-providers/src/factories/ProvidersModuleFactory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import IpcProvider from '../providers/IpcProvider';
import HttpProvider from '../providers/HttpProvider';
import BatchRequest from '../batch-request/BatchRequest';
import EthereumProvider from '../providers/EthereumProvider';
import MetamaskInpageProvider from '../providers/MetamaskInpageProvider';
import MetamaskProvider from '../providers/MetamaskProvider';
import MistEthereumProvider from '../providers/MistEthereumProvider';

export default class ProvidersModuleFactory {
Expand Down Expand Up @@ -179,16 +179,16 @@ export default class ProvidersModuleFactory {
}

/**
* Returns an MetamaskInpageProvider object
* Returns an MetamaskProvider object
*
* @method createMetamaskInpageProvider
*
* @param {MetamaskInpageProvider} inpageProvider
*
* @returns {MetamaskInpageProvider}
* @returns {MetamaskProvider}
*/
createMetamaskInpageProvider(inpageProvider) {
return new MetamaskInpageProvider(inpageProvider);
createMetamaskProvider(inpageProvider) {
return new MetamaskProvider(inpageProvider);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...s/src/providers/MetamaskInpageProvider.js → ...oviders/src/providers/MetamaskProvider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
along with web3.js. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file MetamaskInpageProvider
* @file MetamaskProvider
* @author Samuel Furter <samuel@ethereum.org>
* @date 2019
*/
Expand All @@ -21,7 +21,7 @@ import JsonRpcMapper from '../mappers/JsonRpcMapper';
import JsonRpcResponseValidator from '../validators/JsonRpcResponseValidator';
import AbstractSocketProvider from '../../lib/providers/AbstractSocketProvider';

export default class MetamaskInpageProvider extends AbstractSocketProvider {
export default class MetamaskProvider extends AbstractSocketProvider {
/**
* @param {MetamaskInpageProvider} inpageProvider
*
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/resolvers/ProviderResolver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default class ProviderResolver {
}

if (provider.constructor.name === 'MetamaskInpageProvider') {
return this.providersModuleFactory.createMetamaskInpageProvider(provider);
return this.providersModuleFactory.createMetamaskProvider(provider);
}

if (provider.isEIP1193) {
Expand Down
60 changes: 30 additions & 30 deletions ...c/providers/MetamaskInpageProviderTest.js → ...sts/src/providers/MetamaskProviderTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@ import AbstractMethod from '../../__mocks__/AbstractMethod';
import JsonRpcMapper from '../../../src/mappers/JsonRpcMapper';
import JsonRpcResponseValidator from '../../../src/validators/JsonRpcResponseValidator';
import AbstractWeb3Module from '../../__mocks__/AbstractWeb3Module';
import MetamaskInpageProvider from '../../../src/providers/MetamaskInpageProvider';
import MetamaskProvider from '../../../src/providers/MetamaskProvider';

/**
* MetamaskInpageProvider test
* MetamaskProvider test
*/
describe('MetamaskInpageProviderTest', () => {
let metamaskInpageProvider, inpageProvider;
describe('MetamaskProviderTest', () => {
let metamaskProvider, inpageProvider;

beforeEach(() => {
inpageProvider = {on: jest.fn(), isConnected: jest.fn()};
metamaskInpageProvider = new MetamaskInpageProvider(inpageProvider);
metamaskProvider = new MetamaskProvider(inpageProvider);
});

it('constructor check', () => {
expect(metamaskInpageProvider.connection).toEqual(inpageProvider);
expect(metamaskProvider.connection).toEqual(inpageProvider);

expect(metamaskInpageProvider.host).toEqual('metamask');
expect(metamaskProvider.host).toEqual('metamask');

expect(metamaskInpageProvider.timeout).toEqual(null);
expect(metamaskProvider.timeout).toEqual(null);
});

it('calls registerEventListeners and the expected listeners will be registered', () => {
metamaskInpageProvider.registerEventListeners();
metamaskProvider.registerEventListeners();

expect(inpageProvider.on.mock.calls[0][0]).toEqual('accountsChanged');
expect(inpageProvider.on.mock.calls[0][1]).toBeInstanceOf(Function);
Expand All @@ -42,56 +42,56 @@ describe('MetamaskInpageProviderTest', () => {
expect(inpageProvider.on.mock.calls[4][1]).toBeInstanceOf(Function);
});
it('calls disconnect and returns true', () => {
expect(metamaskInpageProvider.disconnect()).toEqual(true);
expect(metamaskProvider.disconnect()).toEqual(true);
});

it('calls connected and returns true', () => {
inpageProvider.isConnected.mockReturnValueOnce(true);

expect(metamaskInpageProvider.connected).toEqual(true);
expect(metamaskProvider.connected).toEqual(true);

expect(inpageProvider.isConnected).toHaveBeenCalled();
});

it('calls removeAllListeners and executes the expected methods', () => {
inpageProvider.removeListener = jest.fn();

metamaskInpageProvider.removeAllListeners('socket_networkChanged');
metamaskInpageProvider.removeAllListeners('socket_accountsChanged');
metamaskInpageProvider.removeAllListeners('socket_message');
metamaskInpageProvider.removeAllListeners('socket_error');
metamaskProvider.removeAllListeners('socket_networkChanged');
metamaskProvider.removeAllListeners('socket_accountsChanged');
metamaskProvider.removeAllListeners('socket_message');
metamaskProvider.removeAllListeners('socket_error');

expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(
1,
'networkChanged',
metamaskInpageProvider.onNetworkChanged
metamaskProvider.onNetworkChanged
);

expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(
2,
'accountsChanged',
metamaskInpageProvider.onAccountsChanged
metamaskProvider.onAccountsChanged
);

expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(3, 'data', metamaskInpageProvider.onMessage);
expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(4, 'error', metamaskInpageProvider.onError);
expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(3, 'data', metamaskProvider.onMessage);
expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(4, 'error', metamaskProvider.onError);
});

it('calls removeAllSocketListeners and exectues the expected methods', () => {
inpageProvider.removeListener = jest.fn();

metamaskInpageProvider.removeAllSocketListeners();
metamaskProvider.removeAllSocketListeners();

expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(
1,
metamaskInpageProvider.SOCKET_NETWORK_CHANGED,
metamaskInpageProvider.onNetworkChanged
metamaskProvider.SOCKET_NETWORK_CHANGED,
metamaskProvider.onNetworkChanged
);

expect(inpageProvider.removeListener).toHaveBeenNthCalledWith(
2,
metamaskInpageProvider.SOCKET_ACCOUNTS_CHANGED,
metamaskInpageProvider.onAccountsChanged
metamaskProvider.SOCKET_ACCOUNTS_CHANGED,
metamaskProvider.onAccountsChanged
);
});

Expand All @@ -110,7 +110,7 @@ describe('MetamaskInpageProviderTest', () => {
callback(false, {result: true});
});

const response = await metamaskInpageProvider.send('rpc_method', []);
const response = await metamaskProvider.send('rpc_method', []);

expect(response).toEqual(true);

Expand All @@ -133,7 +133,7 @@ describe('MetamaskInpageProviderTest', () => {
callback(true, {result: true});
});

await expect(metamaskInpageProvider.send('rpc_method', [])).rejects.toEqual(true);
await expect(metamaskProvider.send('rpc_method', [])).rejects.toEqual(true);

expect(inpageProvider.send).toHaveBeenCalled();

Expand Down Expand Up @@ -162,7 +162,7 @@ describe('MetamaskInpageProviderTest', () => {
abstractMethodMock.rpcMethod = 'rpc_method';
abstractMethodMock.parameters = [];

const response = await metamaskInpageProvider.sendBatch([abstractMethodMock], moduleInstanceMock);
const response = await metamaskProvider.sendBatch([abstractMethodMock], moduleInstanceMock);

expect(response).toEqual({result: true});

Expand Down Expand Up @@ -193,7 +193,7 @@ describe('MetamaskInpageProviderTest', () => {
abstractMethodMock.rpcMethod = 'rpc_method';
abstractMethodMock.parameters = [];

await expect(metamaskInpageProvider.sendBatch([abstractMethodMock], moduleInstanceMock)).rejects.toEqual(true);
await expect(metamaskProvider.sendBatch([abstractMethodMock], moduleInstanceMock)).rejects.toEqual(true);

expect(inpageProvider.send).toHaveBeenCalled();

Expand All @@ -209,7 +209,7 @@ describe('MetamaskInpageProviderTest', () => {
callback(false, true);
});

const response = await metamaskInpageProvider.sendPayload({id: 0});
const response = await metamaskProvider.sendPayload({id: 0});

expect(response).toEqual(true);

Expand All @@ -225,7 +225,7 @@ describe('MetamaskInpageProviderTest', () => {
callback(true, false);
});

await expect(metamaskInpageProvider.sendPayload({id: 0})).rejects.toEqual(true);
await expect(metamaskProvider.sendPayload({id: 0})).rejects.toEqual(true);

expect(inpageProvider.send).toHaveBeenCalled();
});
Expand Down
14 changes: 7 additions & 7 deletions packages/web3-providers/tests/src/resolvers/ProviderResolverTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import HttpProvider from '../../../src/providers/HttpProvider';
import WebsocketProvider from '../../../src/providers/WebsocketProvider';
import IpcProvider from '../../../src/providers/IpcProvider';
import EthereumProvider from '../../../src/providers/EthereumProvider';
import MetamaskInpageProvider from '../../../src/providers/MetamaskInpageProvider';
import MetamaskProvider from '../../../src/providers/MetamaskProvider';

// Mocks
jest.mock('../../../src/factories/ProvidersModuleFactory');
jest.mock('../../../src/providers/HttpProvider');
jest.mock('../../../src/providers/WebsocketProvider');
jest.mock('../../../src/providers/IpcProvider');
jest.mock('../../../src/providers/EthereumProvider');
jest.mock('../../../src/providers/MetamaskInpageProvider');
jest.mock('../../../src/providers/MetamaskProvider');

/**
* ProviderResolver test
Expand Down Expand Up @@ -95,12 +95,12 @@ describe('ProviderResolverTest', () => {
expect(providerResolver.resolve(ipcProviderMock)).toBeInstanceOf(IpcProvider);
});

it('calls resolve with the MetamaskInpageProvider', () => {
new MetamaskInpageProvider();
const metamaskInpageProviderMock = MetamaskInpageProvider.mock.instances[0];
it('calls resolve with the MetamaskProvider', () => {
new MetamaskProvider();
const metamaskProviderMock = MetamaskProvider.mock.instances[0];

providersModuleFactoryMock.createMetamaskInpageProvider.mockReturnValueOnce(metamaskInpageProviderMock);
providersModuleFactoryMock.createMetamaskProvider.mockReturnValueOnce(metamaskProviderMock);

expect(providerResolver.resolve(metamaskInpageProviderMock)).toEqual(metamaskInpageProviderMock);
expect(providerResolver.resolve(metamaskProviderMock)).toEqual(metamaskProviderMock);
});
});

0 comments on commit 8eab8fe

Please sign in to comment.