Skip to content

Commit

Permalink
first lwf release (#3)
Browse files Browse the repository at this point in the history
* Change e2e tests order and frequency - Closes LiskArchive#1015

* Update package.json

* Lwf port (#2)
  • Loading branch information
lwfofficial authored Jan 6, 2018
1 parent a1a033b commit 045e669
Show file tree
Hide file tree
Showing 102 changed files with 276 additions and 378 deletions.
20 changes: 14 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def fail(reason) {

/* comment out the next line to allow concurrent builds on the same branch */
properties([disableConcurrentBuilds(), pipelineTriggers([])])
node('lisk-nano') {
node('lwf-nano') {
try {
stage ('Checkout and Start Lisk Core') {
stage ('Checkout and Start LWF Core') {
try {
deleteDir()
checkout scm
Expand Down Expand Up @@ -68,7 +68,7 @@ node('lisk-nano') {
'''
} catch (err) {
echo "Error: ${err}"
fail('Stopping build: Lisk Core failed to start')
fail('Stopping build: LWF Core failed to start')
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ node('lisk-nano') {
stage ('Run E2E Tests') {
try {
ansiColor('xterm') {
withCredentials([string(credentialsId: 'lisk-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) {
withCredentials([string(credentialsId: 'lwf-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) {
sh '''
N=${EXECUTOR_NUMBER:-0}; N=$((N+1))
Expand All @@ -146,9 +146,17 @@ node('lisk-nano') {
# Run end-to-end tests
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL http://127.0.0.1:400$N --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet
if [ -z $CHANGE_BRANCH ]; then
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL https://testnet.lisk.io --cucumberOpts.tags @testnet --params.useTestnetPassphrase true
else
echo "Skipping @testnet end-to-end tests because we're not on 'development' branch"
fi
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --params.liskCoreURL http://127.0.0.1:400$N
if [ -z $CHANGE_BRANCH ]; then
npm run --silent e2e-test -- --params.baseURL file://$WORKSPACE/app/build/index.html --cucumberOpts.tags @testnet --params.useTestnetPassphrase true --params.network testnet
else
echo "Skipping @testnet end-to-end tests because we're not on 'development' branch"
fi
'''
}
}
Expand Down
70 changes: 8 additions & 62 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
# Lisk Nano

[![Build Status](https://jenkins.lisk.io/buildStatus/icon?job=lisk-nano/development)](https://jenkins.lisk.io/job/lisk-nano/job/development)
[![Coverage Status](https://coveralls.io/repos/github/LiskHQ/lisk-nano/badge.svg?branch=development)](https://coveralls.io/github/LiskHQ/lisk-nano?branch=development)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
[![Join the chat at https://gitter.im/LiskHQ/lisk](https://badges.gitter.im/LiskHQ/lisk.svg)](https://gitter.im/LiskHQ/lisk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![devDependencies Status](https://david-dm.org/liskHQ/lisk-nano/dev-status.svg)](https://david-dm.org/liskHQ/lisk-nano?type=dev)
# LWF-Nano

## Development

```
git clone https://github.com/LiskHQ/lisk-nano.git
cd lisk-nano
git clone https://github.com/lwfcoin/lwf-nano.git
cd lwf-nano
npm install
npm run dev
```
Expand Down Expand Up @@ -38,7 +32,7 @@ npm run build
### Start


Start the Electron client. Before staring you need to make sure the application is built. If you need to built the entire application, run
Start the Electron client. Before starting you need to make sure the application is built. If you need to built the entire application, run

```
npm run build
Expand Down Expand Up @@ -80,57 +74,6 @@ Build package for Linux (on Linux).
npm run pack
```

## Run unit tests

### Single run
```
npm run test
```

### Run each time a file changes
```
npm run test-live
```

## Run end-to-end tests

### Setup

Setup protractor

```
./node_modules/protractor/bin/webdriver-manager update
```

Setup a lisk test node to run on localhost:4000 as described in https://github.com/LiskHQ/lisk#tests

And run it with [pm2](http://pm2.keymetrics.io/).

### Run

Start the development version of lisk-nano:

```
npm run dev
```

Run the protractor tests (replace `~/git/lisk/` with your path to lisk core):

```
./e2e-test-setup.sh ~/git/lisk/
npm run e2e-test
```

## Launch React Storybook

To launch storybook sandbox with components run
```
npm run storybook
```
and go to

http://localhost:6006/



## Authors
Expand All @@ -144,18 +87,21 @@ http://localhost:6006/

## License

Copyright © 2017-2018 LWF
Copyright © 2017-2018 Oxycoin
Copyright © 2016-2017 Lisk Foundation

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the [GNU General Public License](https://github.com/LiskHQ/lisk-nano/tree/master/LICENSE) along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the [GNU General Public License](https://github.com/lwfcoin/lwf-nano/tree/master/LICENSE) along with this program. If not, see <http://www.gnu.org/licenses/>.

***

This program also incorporates work previously released with lisk-nano `0.1.2` (and earlier) versions under the [MIT License](https://opensource.org/licenses/MIT). To comply with the requirements of that license, the following permission notice, applicable to those parts of the code only, is included below:

Copyright © 2017-2018 Oxycoin
Copyright © 2016-2017 Lisk Foundation
Copyright © 2015 Crypti

Expand Down
Binary file removed app/assets/lisk.icns
Binary file not shown.
Binary file removed app/assets/lisk.ico
Binary file not shown.
Binary file removed app/assets/lisk.png
Binary file not shown.
Binary file added app/assets/lwf.icns
Binary file not shown.
Binary file added app/assets/lwf.ico
Binary file not shown.
Binary file added app/assets/lwf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
owner: LiskHQ
repo: lisk-nano
owner: lwfcoin
repo: lwf-nano
provider: github
12 changes: 6 additions & 6 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "lisk-nano",
"version": "1.3.0",
"description": "Lisk Nano",
"name": "lwf-nano",
"version": "1.3.1",
"description": "LWF Nano",
"main": "./build/main.js",
"author":{
"name": "Lisk Foundation",
"email": "admin@lisk.io"
"author": {
"name": "LWF Logistics S.a.r.l-s",
"email": "info@lwf.io"
}
}
4 changes: 2 additions & 2 deletions app/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ app.on('window-all-closed', () => {

// This will override the values defined in the app’s .plist file (macOS)
if (process.platform === 'darwin') {
const copyright = `Copyright © 2016 - ${new Date().getFullYear()} Lisk Foundation`;
app.setAboutPanelOptions({ applicationName: 'Lisk Nano', copyright });
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`;
app.setAboutPanelOptions({ applicationName: 'LWF Nano', copyright });
}

app.on('activate', () => {
Expand Down
26 changes: 13 additions & 13 deletions app/src/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ const addAboutMenuForMac = ({ template, name }) => {
};

const addAboutMenuForNonMac = ({ template, electron }) => {
const copyright = `Copyright © 2016 - ${new Date().getFullYear()} Lisk Foundation`;
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`;
template[template.length - 1].submenu.push({
label: i18n.t('About'),
click(item, focusedWindow) {
if (focusedWindow) {
const options = {
buttons: ['OK'],
icon: `${__dirname}/assets/images/LISK.png`,
message: `${i18n.t('Lisk Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`,
icon: `${__dirname}/assets/images/LWF.png`,
message: `${i18n.t('LWF Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`,
};
electron.dialog.showMessageBox(focusedWindow, options, () => {});
}
Expand Down Expand Up @@ -116,31 +116,31 @@ const menu = {
label: i18n.t('Help'),
submenu: [
{
label: i18n.t('Lisk Website'),
click: menu.onClickLink.bind(null, electron, 'https://lisk.io'),
label: i18n.t('LWF Website'),
click: menu.onClickLink.bind(null, electron, 'https://lwf.io'),
},
{
label: i18n.t('Lisk Chat'),
click: menu.onClickLink.bind(null, electron, 'https://lisk.chat'),
label: i18n.t('LWF Chat'),
click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'),
},
{
label: i18n.t('Lisk Explorer'),
click: menu.onClickLink.bind(null, electron, 'https://explorer.lisk.io'),
label: i18n.t('LWF Explorer'),
click: menu.onClickLink.bind(null, electron, 'https://explorer.lwf.io'),
},
{
label: i18n.t('Lisk Forum'),
click: menu.onClickLink.bind(null, electron, 'https://forum.lisk.io'),
label: i18n.t('LWF Forum'),
click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'),
},
{
type: 'separator',
},
{
label: i18n.t('Report Issue...'),
click: menu.onClickLink.bind(null, electron, 'https://lisk.zendesk.com/hc/en-us/requests/new'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/issues'),
},
{
label: i18n.t('What\'s New...'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/LiskHQ/lisk-nano/releases'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/releases'),
},
],
},
Expand Down
10 changes: 5 additions & 5 deletions app/src/menu.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ describe('MenuBuilder', () => {
setApplicationMenu: spy(),
buildFromTemplate: template => (template),
},
app: { getName: () => ('Lisk Nano'), getVersion: () => ('some version') },
app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') },
};
});

it('Builds the electron about menu when os is mac', () => {
process.platform = 'darwin';
const template = menu.build(electron);
expect(template[0].label).to.equal('Lisk Nano');
expect(template[0].label).to.equal('LWF Nano');
expect(template[0].submenu[0].role).to.equal('about');
expect(template[0].submenu[0].label).to.equal('About');
expect(template[0].submenu[1].role).to.equal('quit');
Expand All @@ -37,11 +37,11 @@ describe('MenuBuilder', () => {
expect(submenu[submenu.length - 1].label).to.equal('About');

// make sure the mac about menu was not added
expect(template[0].label).to.not.equal('Lisk Nano');
expect(template[0].label).to.not.equal('LWF Nano');
});

it('Should open link on click', () => {
menu.onClickLink(electron, 'https://lisk.io');
expect(electron.shell.openExternal).to.have.been.calledWith('https://lisk.io');
menu.onClickLink(electron, 'https://lwf.io');
expect(electron.shell.openExternal).to.have.been.calledWith('https://lwf.io');
});
});
2 changes: 1 addition & 1 deletion app/src/modules/win.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('Electron Browser Window Wrapper', () => {
buildFromTemplate: () => (electron.Menu),
popup: spy(),
},
app: { getName: () => ('Lisk Nano'), getVersion: () => ('some version') },
app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') },
};

afterEach(() => {
Expand Down
Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.ico
Binary file not shown.
34 changes: 17 additions & 17 deletions i18n/locales/de/common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
" Make sure that you are using the latest version of Lisk Nano.": "Stelle sicher, dass du die neuste Version von Lisk Nano benutzt.",
" Make sure that you are using the latest version of LWF Nano.": "Stelle sicher, dass du die neuste Version von LWF Nano benutzt.",
"Vote_noun": "Abstimmung",
"Vote_verb": "Abstimmen",
"About": "Über",
Expand Down Expand Up @@ -48,29 +48,29 @@
"Failed to connect to node {{address}}": "Verbindung zum Node {{address}} fehlgeschlagen",
"Failed to connect: Node {{address}} is not active": "Verbindung fehlgeschlagen: Node {{address}} ist nicht aktiv",
"Fee": "Gebühr",
"Fee: {{amount}} LSK": "Gebühr: {{amount}} LSK",
"Fee: {{fee}} LSK": "Gebühr: {{fee}} LSK",
"Fee: {{amount}} LWF": "Gebühr: {{amount}} LWF",
"Fee: {{fee}} LWF": "Gebühr: {{fee}} LWF",
"Forget": "Vergessen",
"Forging": "Forging",
"From / To": "Von / An",
"Help": "Hilfe",
"Hide passphrase": "Passphrase ausblenden",
"Insufficient funds": "Nicht genügend Guthaben",
"Insufficient funds for {{amount}} LSK fee": "Nicht genügend Guthaben für {{amount}} LSK Gebühren",
"Insufficient funds for {{amount}} LWF fee": "Nicht genügend Guthaben für {{amount}} LWF Gebühren",
"Invalid": "Ungültig",
"LSK Earned": "LSK verdient",
"LSK received": "LSK erhalten",
"LWF Earned": "LWF verdient",
"LWF received": "LWF erhalten",
"Language": "Sprache",
"Last 24 hours": "Die letzten 24 Stunden",
"Last {{count}} days": "Letzter {{count}} Tag",
"Last {{count}} days_plural": "Die letzten {{count}} Tage",
"Later": "Später",
"Lisk Address": "Lisk Adresse",
"Lisk Chat": "Lisk Chat",
"Lisk Explorer": "Lisk Explorer",
"Lisk Forum": "Lisk Forum",
"Lisk Nano": "Lisk Nano",
"Lisk Website": "Lisk Webseite",
"LWF Address": "LWF Adresse",
"LWF Chat": "LWF Chat",
"LWF Explorer": "LWF Explorer",
"LWF Forum": "LWF Forum",
"LWF Nano": "LWF Nano",
"LWF Website": "LWF Webseite",
"Login": "Einloggen",
"Losing access to this passphrase will mean no funds can be sent from this account.": "Das Verlieren der Passphrase führt dazu, dass kein Geld mehr von diesem Konto versendet werden kann.",
"Mainnet": "Mainnet",
Expand Down Expand Up @@ -117,7 +117,7 @@
"Public key : ": "Public Key:",
"Quit": "Beenden",
"Rank": "Rang",
"Receive LSK": "LSK erhalten",
"Receive LWF": "LWF erhalten",
"Recipient Address": "Empfängeradresse",
"Recipient PublicKey": "Public Key des Empfängers ",
"Redo": "Wiederholen",
Expand All @@ -144,8 +144,8 @@
"Select a network": "Wähle ein Netzwerk",
"Select all": "Alles auswählen",
"Send": "Senden",
"Send Lisk from Blockchain Application": "Lisk von einer Blockchain Anwendung verschicken",
"Send Lisk to Blockchain Application": "Lisk an eine Blockchain Anwendung schicken",
"Send LWF from Blockchain Application": "LWF von einer Blockchain Anwendung verschicken",
"Send LWF to Blockchain Application": "LWF an eine Blockchain Anwendung schicken",
"Send to this address": "Zu dieser Adresse senden",
"Sender PublicKey": "Public Key des Senders",
"Set maximum amount": "Übernehme den maximalen Betrag",
Expand Down Expand Up @@ -205,8 +205,8 @@
"You have already registered as a delegate.": "Du bist bereits als Delegierter registriert.",
"You have not forged any blocks yet": "Du hast noch keine Blöcke geforged",
"You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.": "Um Blöcke forgen (erstellen) zu können, musst du Delegierter werden. Wenn du dich schon als Delegierter registriert hast, wurde deine Registrierung noch nicht verarbeitet.",
"You've received {{value}} LSK.": "Du hast {{value}} LSK erhalten.",
"Your transaction of {{amount}} LSK to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} LSK zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.",
"You've received {{value}} LWF.": "Du hast {{value}} LWF erhalten.",
"Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} LWF zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.",
"Your votes were successfully submitted. It can take several seconds before they are processed.": "Deine Stimmen wurden erfolgreich abgegeben. Es kann einige Sekunden dauern, bis sie verarbeitet sind.",
"Zero not allowed": "Null ist nicht erlaubt",
"confirmation": "Bestätigung",
Expand Down
Loading

0 comments on commit 045e669

Please sign in to comment.