Merge branch 'release/4.0.0' of https://github.com/LiskHQ/lisk-sdk

.eslintrc.json

@@ -4,5 +4,8 @@
 		"implicit-arrow-linebreak": "off",
 		"no-mixed-spaces-and-tabs": "off",
 		"operator-linebreak": "off"
+	},
+	"globals": {
+		"BigInt": true
 	}
 }

.gitignore

@@ -71,7 +71,7 @@ browsertest/test
 tsconfig.tsbuildinfo
 
 # Unsupported lock files
-yarn.lock
+package-lock.json
 
 # Framework specific
 **/network/configs/

.lintstagedrc.json

@@ -1,5 +1,5 @@
 {
-	"*.js": ["prettier --write", "eslint", "git add"],
-	"*.ts": ["prettier --write", "tslint --format verbose", "git add"],
-	"*.{json,md}": ["prettier --write", "git add"]
+	"*.js": ["prettier --write", "eslint"],
+	"*.ts": ["prettier --write", "tslint --format verbose"],
+	"*.{json,md}": ["prettier --write"]
 }

Jenkinsfile.sdk

@@ -3,17 +3,20 @@
 def setup(start_application=false) {
 	cleanWs()
 	unstash 'build'
+	sh '''
+	for database in $( psql --tuples-only --command='SELECT datname FROM pg_database WHERE datdba = (SELECT usesysid FROM pg_user WHERE usename = current_user);' |awk '{ print $1 }' ); do
+	  dropdb --if-exists $database
+	done
+	createdb lisk_dev
+	rm -rf /tmp/jest_rt/
+	'''
 	if(start_application) {
 		nvm(getNodejsVersion()) {
 			dir('framework') {
 				sh '''
 				# teardown_*() should have killed all node processes but we want to be sure
 				# this shouldn't hurt assuming the 'lisk-core' jenkins nodes have 1 executor
 				killall --verbose --wait node || true
-				for database in $( psql --tuples-only --command='SELECT datname FROM pg_database WHERE datdba = (SELECT usesysid FROM pg_user WHERE usename = current_user);' |awk '{ print $1 }' ); do
-				  dropdb --if-exists $database
-				done
-				createdb lisk_dev
 				NODE_ENV=test LISK_CONSOLE_LOG_LEVEL=debug NEWRELIC_LICENSE_KEY= node test/test_app >.app.log 2>&1 &
 				'''
 			}
@@ -91,7 +94,7 @@ def teardown_jest(test_name) {
 		nvm(getNodejsVersion()) {
 			sh """
 			rm -rf coverage_jest_${test_name}; mkdir -p coverage_jest_${test_name}
-			cp .coverage/${test_name}/coverage-final.json coverage_jest_${test_name}/ || echo "Jest lcov coverage not found"
+			cp framework/.coverage/${test_name}/coverage-final.json coverage_jest_${test_name}/ || echo "Jest lcov coverage not found"
 			"""
 		}
 	} catch(err) {
@@ -148,9 +151,9 @@ pipeline {
 			steps {
 				nvm(getNodejsVersion()) {
 					sh '''
-					npm ci
-					npm run bootstrap -- --ci
-					npm run build
+					npm i -g yarn
+					yarn
+					yarn build
 					# needed by one of the "Functional HTTP GET tests"
 					git rev-parse HEAD > framework/REVISION
 					'''
@@ -160,10 +163,9 @@ pipeline {
 		}
 		stage('Lint') {
 			steps {
-				setup()
 				nvm(getNodejsVersion()) {
 					sh '''
-					npm run lint
+					yarn lint
 					'''
 				}
 			}
@@ -183,7 +185,9 @@ pipeline {
 							// Save all the test results
 							sh '''
 								rm -rf coverage_elements; mkdir -p coverage_elements
-								cp -rf elements/*/.nyc_output/* elements/*/.coverage/* coverage_elements/
+								for f in $( find elements/*/.coverage/ -type f ); do
+								  cp $f coverage_elements/$( sha1sum $f | cut -d ' ' -f 1 )_$( basename $f )
+								done
 							'''
 							stash name: "coverage_elements", includes: "coverage_elements/*", allowEmpty: true
 						}
@@ -226,7 +230,21 @@ pipeline {
 				stage('Lisk Framework Integration') {
 					agent { node { label 'lisk-framework' }}
 					steps {
-						setup()
+						// jest ITs seem to need special treatment
+						nvm(getNodejsVersion()) {
+							sh '''
+							npm install --global yarn
+							yarn
+							yarn build
+							'''
+						}
+						sh '''
+						for database in $( psql --tuples-only --command='SELECT datname FROM pg_database WHERE datdba = (SELECT usesysid FROM pg_user WHERE usename = current_user);' |awk '{ print $1 }' ); do
+						  dropdb --if-exists $database
+						done
+						createdb lisk_dev
+						rm -rf /tmp/jest_rt/
+						'''
 						run_jest('integration')
 					}
 					post {
@@ -251,6 +269,7 @@ pipeline {
 		}
 		stage('Legacy Framework test (mocha)') {
 			parallel {
+				/*
 				stage('Functional HTTP GET tests') {
 					agent { node { label 'lisk-framework' }}
 					steps {
@@ -299,6 +318,7 @@ pipeline {
 						}
 					}
 				}
+				*/
 				stage('Unit tests') {
 					agent { node { label 'lisk-framework' }}
 					steps {
@@ -311,21 +331,6 @@ pipeline {
 						}
 					}
 				}
-				stage('Integration tests') {
-					agent { node { label 'lisk-framework' }}
-					options {
-						timeout(time: 10, unit: 'MINUTES')
-					}
-					steps {
-						setup()
-						run_mocha('integration')
-					}
-					post {
-						cleanup {
-							teardown_mocha('integration')
-						}
-					}
-				}
 			}
 		}
 	}
@@ -364,10 +369,10 @@ pipeline {
 					nvm(getNodejsVersion()) {
 						sh '''
 						npx nyc merge ./.nyc_output ci_coverage/coverage.json
-						npx nyc report --report-dir=ci_coverage --reporter=text --reporter=cobertura
+						node scripts/map_coverage.js ci_coverage/coverage.json
 						'''
 					}
-					cobertura coberturaReportFile: 'ci_coverage/cobertura-coverage.xml'
+					cobertura coberturaReportFile: 'coverage/cobertura-coverage.xml'
 				} catch(err) {
 					println "Could not report coverage statistics:\n${err}"
 				}

Jenkinsfile.sonar

@@ -20,7 +20,7 @@ pipeline {
 								sh """#!/bin/bash
 								${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=LiskHQ_lisk-sdk \
 												 -Dsonar.organization=liskhq \
-												 -Dsonar.exclusions=**/test/**,**/migrations/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
+												 -Dsonar.exclusions=**/test/**,**/migrations/**,**/entities/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
 												 -Dsonar.scm.revision=$GIT_COMMIT \
 												 -Dsonar.projectVersion=\${GIT_COMMIT::7} \
 												 -Dsonar.pullrequest.key=$CHANGE_ID \
@@ -32,7 +32,7 @@ pipeline {
 								sh """#!/bin/bash
 								${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=LiskHQ_lisk-sdk \
 												 -Dsonar.organization=liskhq \
-												 -Dsonar.exclusions=**/test/**,**/migrations/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
+												 -Dsonar.exclusions=**/test/**,**/migrations/**,**/entities/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
 												 -Dsonar.scm.revision=$GIT_COMMIT \
 												 -Dsonar.projectVersion=\${GIT_COMMIT::7} \
 												 -Dsonar.branch.name=$GIT_BRANCH \

commander/.mocharc.json

@@ -0,0 +1,9 @@
+{
+	"diff": true,
+	"extension": ["ts"],
+	"recursive": true,
+	"spec": "test/**/*.ts",
+	"require": ["ts-node/register", "./test/setup.js"],
+	"timeout": 10000,
+	"watch-files": ["src/**/*.ts"]
+}

commander/.nycrc

@@ -0,0 +1,4 @@
+{
+	"exclude": ["test/**", "**/*.d.ts"],
+	"extension": [".ts"]
+}