Skip to content

Commit

Permalink
[FABN-1135] Remove nodechaincode
Browse files Browse the repository at this point in the history
- Removed nodechaincode from tape int tests
- Fix linting rules for FABN-1395

Signed-off-by: heatherlp <[email protected]>
Change-Id: Idb89807cb6ea9df3acafbcd8ff52b1c47590ed9f
  • Loading branch information
heatherlp committed Oct 23, 2019
1 parent 24d8f7a commit aff0982
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 346 deletions.
4 changes: 3 additions & 1 deletion build/tasks/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ gulp.task('eslint', () => {
'fabric-network/**/*.js',
'fabric-client/**/*.js',
'fabric-ca-client/lib/*.js',
'fabric-common/**/*.js',
'!coverage/**',
'!docs/**',
'!fabric-network/coverage/**',
Expand All @@ -21,9 +22,10 @@ gulp.task('eslint', () => {
'!fabric-client/node_modules/**',
'!fabric-ca-client/coverage/**',
'!fabric-ca-client/node_modules/**',
'!fabric-common/node_modules/**',
'!fabric-common/coverage/**',
'!node_modules/**',
'!test/typescript/**/*.js',
'!tmp/**',
'!fabric-protos/**',
]).pipe(eslint())
.pipe(eslint.format())
Expand Down
1 change: 0 additions & 1 deletion build/tasks/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ gulp.task('run-tape-e2e', ['docker-ready'],
'test/integration/fabric-ca-identity-service-tests.js',
'test/integration/fabric-ca-certificate-service-tests.js',
'test/integration/fabric-ca-services-tests.js',
'test/integration/nodechaincode/e2e.js',
'test/integration/e2e.js',
'test/integration/network-e2e/e2e.js',
'test/integration/network-e2e/e2e-hsm.js',
Expand Down
3 changes: 0 additions & 3 deletions build/tasks/tslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const tslint = require('gulp-tslint');

gulp.task('tslint', () => {
return gulp.src([
// 'fabric-ca/**/*.ts',
'fabric-client/**/*.ts',
'fabric-network/**/*.ts',
'test/**/*.ts',
Expand All @@ -17,8 +16,6 @@ gulp.task('tslint', () => {
'!fabric-network/node_modules/**',
'!fabric-client/coverage/**',
'!fabric-client/node_modules/**',
'!fabric-ca-client/coverage/**',
'!fabric-ca-client/node_modules/**',
]).pipe(tslint({
formatter: 'prose'
})).pipe(tslint.report({
Expand Down
1 change: 0 additions & 1 deletion docs/sdk-node-ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ the pipeline job configuration template here https://ci-docs.readthedocs.io/en/l
- Every Gerrit patchset triggers a verify job and run the below tests from the `Jenkinsfile`

- gulp
- gulp ca
- gulp test

All the above tests run on the Hyperledger infarstructure x86_64 build nodes. All these nodes uses
Expand Down
11 changes: 0 additions & 11 deletions test/integration/grpc.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ test('\n\n*** GRPC message size tests ***\n\n', async (t) => {
await e2eUtils.instantiateChaincode(userOrg, testUtil.CHAINCODE_UPGRADE_PATH, version, 'golang', true, false, t);
await e2eUtils.installChaincode(userOrg, testUtil.NODE_CHAINCODE_UPGRADE_PATH, testUtil.METADATA_PATH, version, 'node', t, true);
await e2eUtils.installChaincode('org2', testUtil.NODE_CHAINCODE_UPGRADE_PATH, testUtil.METADATA_PATH, version, 'node', t, true);
await e2eUtils.instantiateChaincode(userOrg, testUtil.NODE_CHAINCODE_UPGRADE_PATH, version, 'node', true, false, t);

const connection_profile = {
version: '1.0',
Expand Down Expand Up @@ -105,14 +104,10 @@ test('\n\n*** GRPC message size tests ***\n\n', async (t) => {
// use the connection profile defined peer which includes a GRPC max setting
response = await sendToConnectionProfile(client, channel, connection_profile, go_cc, 1);
checkResponse(t, response, 'Test golang cc able to use connection profile set with grpc max receive', 'Received|max|1024');
response = await sendToConnectionProfile(client, channel, connection_profile, node_cc, 1);
checkResponse(t, response, 'Test node cc able to use connection profile set with grpc max receive', 'Received|max|1024');

// use the NodeSDK configuration to set the sizes
response = await send(client, channel, url, go_cc, opts, 1, -1, 1024, null, null);
checkResponse(t, response, 'Test golang cc able to set config for grpc max receive', 'Received|max|1024');
response = await send(client, channel, url, node_cc, opts, 1, -1, 1024, null, null);
checkResponse(t, response, 'Test node cc able to set config for grpc max receive', 'Received|max|1024');

response = await send(client, channel, url, go_cc, opts, 1, 1024, -1, null, null);
checkResponse(t, response, 'Test golang cc able to set config for grpc max send', 'Sent|max|1024');
Expand All @@ -121,8 +116,6 @@ test('\n\n*** GRPC message size tests ***\n\n', async (t) => {

response = await send(client, channel, url, go_cc, opts, 1, -1, -1, null, 1024);
checkResponse(t, response, 'Test golang cc able to set config for legacy sdk max receive', 'Received|max|1024');
response = await send(client, channel, url, node_cc, opts, 1, -1, -1, null, 1024);
checkResponse(t, response, 'Test node cc able to set config for legacy sdk max receive', 'Received|max|1024');

response = await send(client, channel, url, go_cc, opts, 1, -1, -1, 1024, null);
checkResponse(t, response, 'Test golang cc able to set config for legacy sdk max send', 'Sent|max|1024');
Expand All @@ -133,8 +126,6 @@ test('\n\n*** GRPC message size tests ***\n\n', async (t) => {
opts[GRPC_RECEIVE] = 1024;
response = await send(client, channel, url, go_cc, opts, 1, -1, -1, -1, -1);
checkResponse(t, response, 'Test golang cc able to set peer for grpc max receive', 'Received|max|1024');
response = await send(client, channel, url, node_cc, opts, 1, -1, -1, -1, -1);
checkResponse(t, response, 'Test node cc able to set peer for grpc max receive', 'Received|max|1024');
delete opts[GRPC_RECEIVE];

opts[GRPC_SEND] = 1024;
Expand All @@ -147,8 +138,6 @@ test('\n\n*** GRPC message size tests ***\n\n', async (t) => {
opts[SDK_RECEIVE] = 1024;
response = await send(client, channel, url, go_cc, opts, 1, -1, -1, -1, -1);
checkResponse(t, response, 'Test golang cc able to set peer for legacy sdk max receive', 'Received|max|1024');
response = await send(client, channel, url, node_cc, opts, 1, -1, -1, -1, -1);
checkResponse(t, response, 'Test node cc able to set peer for legacy sdk max receive', 'Received|max|1024');
delete opts[SDK_RECEIVE];

opts[SDK_SEND] = 1024;
Expand Down
12 changes: 0 additions & 12 deletions test/integration/nodechaincode/e2e.js

This file was deleted.

42 changes: 0 additions & 42 deletions test/integration/nodechaincode/install-chaincode.js

This file was deleted.

45 changes: 0 additions & 45 deletions test/integration/nodechaincode/instantiate-chaincode.js

This file was deleted.

47 changes: 0 additions & 47 deletions test/integration/nodechaincode/invoke.js

This file was deleted.

46 changes: 0 additions & 46 deletions test/integration/nodechaincode/query.js

This file was deleted.

Loading

0 comments on commit aff0982

Please sign in to comment.