Skip to content

Commit

Permalink
Remove fabric-shim-crypto package
Browse files Browse the repository at this point in the history
The crypto package was removed from the Go shim in 2.0 so updating chaincode node to match

Signed-off-by: James Taylor <jamest@uk.ibm.com>
  • Loading branch information
jt-nti committed May 4, 2022
1 parent d9cfc3d commit 3f1dbff
Show file tree
Hide file tree
Showing 26 changed files with 7 additions and 1,735 deletions.
2 changes: 1 addition & 1 deletion COMPATIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Fabric v1.4.2, and Fabric v2.x will, by default, start up docker image to host t

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.

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

### Supported Runtimes

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/)

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

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[![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)
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
[![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)
[![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)
[![Discord](https://img.shields.io/discord/905194001349627914?label=discord)](https://discordapp.com/channels/905194001349627914/943090527920877598)

This is the project to support the writing of Contracts with the node.js runtime.
Expand Down
1 change: 0 additions & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ The following artifacts are created as a result of releasing Fabric Chaincode No
- [fabric-contract-api](https://www.npmjs.com/package/fabric-contract-api)
- [fabric-shim](https://www.npmjs.com/package/fabric-shim)
- [fabric-shim-api](https://www.npmjs.com/package/fabric-shim-api)
- [fabric-shim-crypto](https://www.npmjs.com/package/fabric-shim-crypto)

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

Expand Down
4 changes: 2 additions & 2 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ stages:
node common/scripts/install-run-rush.js rebuild
displayName: 'Full rebuild'
- script: |
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
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
condition: or(succeeded(), failed())
- task: PublishTestResults@2
condition: or(succeeded(), failed()) # publish either way
Expand Down Expand Up @@ -210,7 +210,7 @@ stages:
node common/scripts/install-run-rush.js install
node common/scripts/install-run-rush.js start-verdaccio # script will check for the ci variable and use built images
mkdir -p $(Build.SourcesDirectory)/audit && cd $(Build.SourcesDirectory)/audit && npm init -y
npm install --registry http://localhost:4873 fabric-shim fabric-shim-crypto fabric-shim-api fabric-contract-api --save
npm install --registry http://localhost:4873 fabric-shim fabric-shim-api fabric-contract-api --save
npm audit --audit-level=moderate
displayName: 'Run npm audit'
Expand Down
1 change: 0 additions & 1 deletion ci/updatePackageJson.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ if (input.dependencies) {
if (input.dependencies['fabric-ledger']) input.dependencies['fabric-ledger'] = ver;
if (input.dependencies['fabric-shim']) input.dependencies['fabric-shim'] = ver;
if (input.dependencies['fabric-shim-api']) input.dependencies['fabric-shim-api'] = ver;
if (input.dependencies['fabric-shim-crypto']) input.dependencies['fabric-shim-crypto'] = ver;
}
fs.writeFileSync(filename, JSON.stringify(input, null, 2));
76 changes: 1 addition & 75 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/_jsdoc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
[![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)
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
[![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)
[![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)
[![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-chaincode-dev)

## Overview
Expand Down
1 change: 0 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ The following packages are available from the npm Registry:
- [fabric-contract-api](https://www.npmjs.com/package/fabric-contract-api)
- [fabric-shim](https://www.npmjs.com/package/fabric-shim)
- [fabric-shim-api](https://www.npmjs.com/package/fabric-shim-api)
- [fabric-shim-crypto](https://www.npmjs.com/package/fabric-shim-crypto)

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

Expand Down
2 changes: 0 additions & 2 deletions libraries/fabric-shim-crypto/.npmignore

This file was deleted.

Loading

0 comments on commit 3f1dbff

Please sign in to comment.