Skip to content

Commit

Permalink
Merge pull request #1104 from LiskHQ/775-update-lisk-js-to-lisk-elements
Browse files Browse the repository at this point in the history
Update lisk-js to lisk-elements - Closes #775
  • Loading branch information
slaweet committed Jul 27, 2018
2 parents 5bacb98 + 6eaa343 commit 9f8d854
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -51,8 +51,7 @@
"i18next-localstorage-cache": "=1.1.1",
"i18next-xhr-backend": "=1.4.2",
"js-sha256": "0.9.0",
"lisk-js": "0.5.1",
"lisk-elements": "1.0.0-beta.4",
"lisk-elements": "1.0.0-rc.1",
"lodash.throttle": "4.1.1",
"lolex": "=2.3.2",
"moment": "2.20.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/savedAccounts/savedAccounts.test.js
Expand Up @@ -25,7 +25,7 @@ describe('SavedAccounts', () => {

const savedAccounts = [
{
publicKey: 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88',
publicKey: 'aab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88',
network: networks.mainnet.code,
passphrase: accounts.genesis.passphrase,
},
Expand Down
4 changes: 1 addition & 3 deletions src/store/middlewares/savedAccounts.test.js
Expand Up @@ -17,6 +17,7 @@ describe('SavedAccounts middleware', () => {
const address = networks.testnet.nodes[0];
const passphrase = 'recipe bomb asset salon coil symbol tiger engine assist pact pumpkin visit';
const publicKey = 'fab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
const publicKey2 = 'aab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
const balance = 10e8;

beforeEach(() => {
Expand Down Expand Up @@ -104,7 +105,6 @@ describe('SavedAccounts middleware', () => {
});

it(`should dispatch accountSaved action on ${actionTypes.accountLoggedIn} action if given account is not saved yet`, () => {
const publicKey2 = 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
const action = {
type: actionTypes.accountLoggedIn,
data: {
Expand All @@ -124,7 +124,6 @@ describe('SavedAccounts middleware', () => {
});

it(`should dispatch accountSaved action on ${actionTypes.activeAccountSaved} action if given account is not saved yet`, () => {
const publicKey2 = 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
state.account = {
publicKey: publicKey2,
balance,
Expand All @@ -143,7 +142,6 @@ describe('SavedAccounts middleware', () => {
});

it(`should dispatch accountRemoved action on ${actionTypes.accountLoggedOut} action if given account is logged in`, () => {
const publicKey2 = 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
state.account = {
publicKey: publicKey2,
balance,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/savedAccounts.test.js
Expand Up @@ -10,7 +10,7 @@ describe('savedAccounts', () => {
const publicKey = 'fab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88';
const accounts = [
{
publicKey: 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88',
publicKey: 'aab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88',
network: 0,
balance: 0,
},
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/signMessage.feature
Expand Up @@ -12,6 +12,6 @@ Feature: Sign message
-----PUBLIC KEY-----
c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f
-----SIGNATURE-----
b4f4f29fb8bc3c540581137e522103e33e1ccac9ef5f652da53239adae3fbb990d6a25c935dd3ff5026b26095ded100cd8b45c9b2311ec2687957145f09aa50f
469989531f65881ac1ac9579d1cda5738ce94764afebca3d57c3c749e3d37621254fccf3e145f785819e3150fc2b92097a8f65c1728e1ba8c6e005a452bdee03
-----END LISK SIGNED MESSAGE-----
"""

0 comments on commit 9f8d854

Please sign in to comment.