Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Replace lisk-js with lisk-elements - Closes #1067
Browse files Browse the repository at this point in the history
  • Loading branch information
slaweet committed May 18, 2018
1 parent 49d1cfa commit 641d677
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"i18next": "=10.0.3",
"i18next-localstorage-cache": "=1.1.1",
"i18next-xhr-backend": "=1.4.2",
"lisk-js": "1.0.0-beta.1",
"lisk-elements": "1.0.0-beta.3",
"moment": "2.20.1",
"numeral": "=2.0.6",
"postcss": "6.0.12",
Expand Down
2 changes: 1 addition & 1 deletion src/actions/peers.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import i18next from 'i18next';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import actionTypes from '../constants/actions';
// import { getNethash } from './../utils/api/nethash';
import { errorToastDisplayed } from './toaster';
Expand Down
2 changes: 1 addition & 1 deletion src/actions/peers.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import { spy, stub, match } from 'sinon';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import actionTypes from '../constants/actions';
import netHashes from '../constants/netHashes';
import { activePeerSet, activePeerUpdate } from './peers';
Expand Down
2 changes: 1 addition & 1 deletion src/components/decryptMessage/decryptMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Input from 'react-toolbox/lib/input';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { translate } from 'react-i18next';
import ActionBar from '../actionBar';
import Authenticate from '../authenticate';
Expand Down
2 changes: 1 addition & 1 deletion src/components/decryptMessage/decryptMessage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { mount } from 'enzyme';
import sinon from 'sinon';
import { Provider } from 'react-redux';
import { I18nextProvider } from 'react-i18next';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import i18n from '../../i18n';
import store from '../../store';
import DecryptMessage from './decryptMessage';
Expand Down
2 changes: 1 addition & 1 deletion src/components/encryptMessage/encryptMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Input from 'react-toolbox/lib/input';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { translate } from 'react-i18next';
import ActionBar from '../actionBar';
import Authenticate from '../authenticate';
Expand Down
2 changes: 1 addition & 1 deletion src/components/encryptMessage/encryptMessage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from 'chai';
import { mount } from 'enzyme';
import sinon from 'sinon';
import PropTypes from 'prop-types';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import i18n from '../../i18n';
import store from '../../store';
import Authenticate from '../authenticate';
Expand Down
2 changes: 1 addition & 1 deletion src/components/login/login.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { spy } from 'sinon';
import { mount, shallow } from 'enzyme';
import { BrowserRouter as Router } from 'react-router-dom';
import configureMockStore from 'redux-mock-store';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import PropTypes from 'prop-types';
import i18n from '../../i18n';
import Login from './login';
Expand Down
2 changes: 1 addition & 1 deletion src/components/registerDelegate/registerDelegate.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { expect } from 'chai';
import { mount } from 'enzyme';
import sinon from 'sinon';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { Provider } from 'react-redux';
import { I18nextProvider } from 'react-i18next';
import i18n from '../../i18n'; // initialized i18next instance
Expand Down
2 changes: 1 addition & 1 deletion src/components/signMessage/signMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Input from 'react-toolbox/lib/input';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';

import InfoParagraph from '../infoParagraph';
import SignVerifyResult from '../signVerifyResult';
Expand Down
2 changes: 1 addition & 1 deletion src/components/verifyMessage/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { translate } from 'react-i18next';
import Input from 'react-toolbox/lib/input';
import React from 'react';
import lisk from 'lisk-js';
import lisk from 'lisk-elements';

import InfoParagraph from '../infoParagraph';
import SignVerifyResult from '../signVerifyResult';
Expand Down
2 changes: 1 addition & 1 deletion src/components/voting/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { mount } from 'enzyme';
import { Provider } from 'react-redux';
import { BrowserRouter as Router } from 'react-router-dom';
import { I18nextProvider } from 'react-i18next';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import i18n from '../../i18n';
import VotingHOC from './';
import store from '../../store';
Expand Down
2 changes: 1 addition & 1 deletion src/store/middlewares/login.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { expect } from 'chai';
import { spy, stub, mock } from 'sinon';
import middleware from './login';
Expand Down
2 changes: 1 addition & 1 deletion src/store/reducers/peers.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const peers = (state = { status: {}, options: {} }, action) => {
case actionTypes.activePeerSet:
return Object.assign({}, state, {
data: action.data.activePeer,
// options are duplicated here because lisk-js later on removes it from the 'data' object
// options are duplicated here because lisk-elements doesn't expose it as lisk-js did
options: action.data.options,
});
case actionTypes.activePeerUpdate:
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/account.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';

export const getAccount = (activePeer, address) =>
new Promise((resolve) => {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/delegate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';

export const listAccountDelegates = (activePeer, address) =>
activePeer.votes.get({ address, limit: 101 });
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/delegate.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import sinon from 'sinon';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { listAccountDelegates,
listDelegates,
getDelegate,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/forging.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import Lisk from 'lisk-js';
import Lisk from 'lisk-elements';
import { mock } from 'sinon';
import moment from 'moment';
import { getForgedBlocks, getForgedStats } from './forging';
Expand Down
2 changes: 1 addition & 1 deletion test/integration/voteDialog/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const peers = {
'Content-Type': 'application/json',
nethash: 'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
broadhash: 'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
os: 'lisk-js-api',
os: 'lisk-elements-api',
version: '1.0.0',
minVersion: '>=0.5.0',
port: 443,
Expand Down

0 comments on commit 641d677

Please sign in to comment.