Skip to content

Commit 3f1dbff

Browse files
committed
Remove fabric-shim-crypto package
The crypto package was removed from the Go shim in 2.0 so updating chaincode node to match Signed-off-by: James Taylor <[email protected]>
1 parent d9cfc3d commit 3f1dbff

File tree

26 files changed

+7
-1735
lines changed

26 files changed

+7
-1735
lines changed

COMPATIBILITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Fabric v1.4.2, and Fabric v2.x will, by default, start up docker image to host t
3636

3737
With Fabric v2.x, the chaincode container can be configured to be started by other means, and not the Peer. In this case, the environment used is not in the control of Fabric.
3838

39-
Node modules that are produced are `fabric-contract-api`, `fabric-shim`, `fabric-shim-crypto` & `fabric-shim-api`
39+
Node modules that are produced are `fabric-contract-api`, `fabric-shim` & `fabric-shim-api`
4040

4141
### Supported Runtimes
4242

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/)
1616

1717
- `apis` contains the `fabric-contract-api` and `fabric-shim-api` modules
1818
- `tools` contains a set of scripts for build tooling (evolved from the `build` folder that existed previously)
19-
- `libraries` contains the `fabric-shim` and `fabric-shim-crypto` modules
19+
- `libraries` contains the `fabric-shim` module
2020
- `docker` contains the scripts and dockerfile for the nodeenv image
2121
- `docs` contains the `apidocs` building scripts
2222

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[![fabric-contract-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-contract-api)](https://www.npmjs.com/package/fabric-contract-api)
55
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
66
[![fabric-shim-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-api)](https://www.npmjs.com/package/fabric-shim-api)
7-
[![fabric-shim-crypto npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-crypto)](https://www.npmjs.com/package/fabric-shim-crypto)
87
[![Discord](https://img.shields.io/discord/905194001349627914?label=discord)](https://discordapp.com/channels/905194001349627914/943090527920877598)
98

109
This is the project to support the writing of Contracts with the node.js runtime.

RELEASING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ The following artifacts are created as a result of releasing Fabric Chaincode No
88
- [fabric-contract-api](https://www.npmjs.com/package/fabric-contract-api)
99
- [fabric-shim](https://www.npmjs.com/package/fabric-shim)
1010
- [fabric-shim-api](https://www.npmjs.com/package/fabric-shim-api)
11-
- [fabric-shim-crypto](https://www.npmjs.com/package/fabric-shim-crypto)
1211

1312
**Note:** A docker image with a matching V.R version is required before releasing a new version of Fabric.
1413

ci/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ stages:
8383
node common/scripts/install-run-rush.js rebuild
8484
displayName: 'Full rebuild'
8585
- script: |
86-
npx cobertura-merge -o merged_coverage.xml shimcrypto=./libraries/fabric-shim-crypto/coverage/cobertura-coverage.xml shim=./libraries/fabric-shim/coverage/cobertura-coverage.xml contractapi=./apis/fabric-contract-api/coverage/cobertura-coverage.xml -p
86+
npx cobertura-merge -o merged_coverage.xml shim=./libraries/fabric-shim/coverage/cobertura-coverage.xml contractapi=./apis/fabric-contract-api/coverage/cobertura-coverage.xml -p
8787
condition: or(succeeded(), failed())
8888
- task: PublishTestResults@2
8989
condition: or(succeeded(), failed()) # publish either way
@@ -210,7 +210,7 @@ stages:
210210
node common/scripts/install-run-rush.js install
211211
node common/scripts/install-run-rush.js start-verdaccio # script will check for the ci variable and use built images
212212
mkdir -p $(Build.SourcesDirectory)/audit && cd $(Build.SourcesDirectory)/audit && npm init -y
213-
npm install --registry http://localhost:4873 fabric-shim fabric-shim-crypto fabric-shim-api fabric-contract-api --save
213+
npm install --registry http://localhost:4873 fabric-shim fabric-shim-api fabric-contract-api --save
214214
npm audit --audit-level=moderate
215215
displayName: 'Run npm audit'
216216

ci/updatePackageJson.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ if (input.dependencies) {
2020
if (input.dependencies['fabric-ledger']) input.dependencies['fabric-ledger'] = ver;
2121
if (input.dependencies['fabric-shim']) input.dependencies['fabric-shim'] = ver;
2222
if (input.dependencies['fabric-shim-api']) input.dependencies['fabric-shim-api'] = ver;
23-
if (input.dependencies['fabric-shim-crypto']) input.dependencies['fabric-shim-crypto'] = ver;
2423
}
2524
fs.writeFileSync(filename, JSON.stringify(input, null, 2));

common/config/rush/pnpm-lock.yaml

Lines changed: 1 addition & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_jsdoc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
[![fabric-contract-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-contract-api)](https://www.npmjs.com/package/fabric-contract-api)
33
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
44
[![fabric-shim-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-api)](https://www.npmjs.com/package/fabric-shim-api)
5-
[![fabric-shim-crypto npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-crypto)](https://www.npmjs.com/package/fabric-shim-crypto)
65
[![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-chaincode-dev)
76

87
## Overview

docs/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ The following packages are available from the npm Registry:
2323
- [fabric-contract-api](https://www.npmjs.com/package/fabric-contract-api)
2424
- [fabric-shim](https://www.npmjs.com/package/fabric-shim)
2525
- [fabric-shim-api](https://www.npmjs.com/package/fabric-shim-api)
26-
- [fabric-shim-crypto](https://www.npmjs.com/package/fabric-shim-crypto)
2726

2827
Check the [release notes](https://github.com/hyperledger/fabric-chaincode-node/releases) for the changes in each version.
2928

libraries/fabric-shim-crypto/.npmignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)