From a71786f9466aa147e4b2328cd0bdada4c23e006c Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Thu, 26 Jul 2018 14:55:13 +0200 Subject: [PATCH 1/3] :white_check_mark: Fix publicKeys in test to be valid hexstrings some of them contained 'h' which lisk-elements didn't like --- src/components/savedAccounts/savedAccounts.test.js | 2 +- src/store/middlewares/savedAccounts.test.js | 4 +--- src/utils/savedAccounts.test.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/savedAccounts/savedAccounts.test.js b/src/components/savedAccounts/savedAccounts.test.js index f3dc2976da..26340448a0 100644 --- a/src/components/savedAccounts/savedAccounts.test.js +++ b/src/components/savedAccounts/savedAccounts.test.js @@ -25,7 +25,7 @@ describe('SavedAccounts', () => { const savedAccounts = [ { - publicKey: 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88', + publicKey: 'aab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88', network: networks.mainnet.code, passphrase: accounts.genesis.passphrase, }, diff --git a/src/store/middlewares/savedAccounts.test.js b/src/store/middlewares/savedAccounts.test.js index e6b05a8396..598d2ebccd 100644 --- a/src/store/middlewares/savedAccounts.test.js +++ b/src/store/middlewares/savedAccounts.test.js @@ -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(() => { @@ -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: { @@ -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, @@ -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, diff --git a/src/utils/savedAccounts.test.js b/src/utils/savedAccounts.test.js index ae4fe59603..e66224e4ab 100644 --- a/src/utils/savedAccounts.test.js +++ b/src/utils/savedAccounts.test.js @@ -10,7 +10,7 @@ describe('savedAccounts', () => { const publicKey = 'fab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88'; const accounts = [ { - publicKey: 'hab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88', + publicKey: 'aab9d261ea050b9e326d7e11587eccc343a20e64e29d8781b50fd06683cacc88', network: 0, balance: 0, }, From 68351973e70517d15f42a751c181bbd30b837da3 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Thu, 26 Jul 2018 14:57:04 +0200 Subject: [PATCH 2/3] :arrow_up: Upgrade lisk-elements and remove lisk-js --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 94d99694c0..0032bad499 100644 --- a/package.json +++ b/package.json @@ -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", From 6eaa34382bed29fdf453511a0fdcd311c394df2c Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Thu, 26 Jul 2018 16:22:22 +0200 Subject: [PATCH 3/3] Update sign message e2e test because the format of signature changed in lisk-elements https://github.com/LiskHQ/lisk-elements/compare/v1.0.0-beta.4...v1.0.0-rc.1#diff-d91294e5472a32ae93e594994fc6f393 --- test/e2e/signMessage.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/signMessage.feature b/test/e2e/signMessage.feature index 2840997951..05a84aa733 100644 --- a/test/e2e/signMessage.feature +++ b/test/e2e/signMessage.feature @@ -12,6 +12,6 @@ Feature: Sign message -----PUBLIC KEY----- c094ebee7ec0c50ebee32918655e089f6e1a604b83bcaa760293c61e0f18ab6f -----SIGNATURE----- - b4f4f29fb8bc3c540581137e522103e33e1ccac9ef5f652da53239adae3fbb990d6a25c935dd3ff5026b26095ded100cd8b45c9b2311ec2687957145f09aa50f + 469989531f65881ac1ac9579d1cda5738ce94764afebca3d57c3c749e3d37621254fccf3e145f785819e3150fc2b92097a8f65c1728e1ba8c6e005a452bdee03 -----END LISK SIGNED MESSAGE----- """