Skip to content

Commit

Permalink
Remove fisco-bcos (#1515)
Browse files Browse the repository at this point in the history
Node 16 is now out of lts. Fisco bcos will not work on node 18 or higher
due to it not being compatible with openssl 3 so caliper at the moment
can't move it's builds to node 18 or node 20. Also openssl 1.1 is now
out of support and so the connector is using crypto libraries which are
no longer supported. As we have no-one who can maintain this connector,
it should be dropped.

Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
  • Loading branch information
davidkel committed Feb 28, 2024
1 parent 26da2f2 commit 31b978f
Show file tree
Hide file tree
Showing 75 changed files with 18 additions and 3,897 deletions.
1 change: 0 additions & 1 deletion .build/publish-caliper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ cp ./README.md ./packages/caliper-cli/README.md
cp ./README.md ./packages/caliper-core/README.md
cp ./README.md ./packages/caliper-ethereum/README.md
cp ./README.md ./packages/caliper-fabric/README.md
cp ./README.md ./packages/caliper-fisco-bcos/README.md

cd ./packages/caliper-publish/
npm ci
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ jobs:
- 'packages/caliper-tests-integration/besu_tests/**'
- '.github/workflows/integration-tests.yml'
- 'package-lock.json'
fisco-bcos:
- 'packages/caliper-cli/**'
- 'packages/caliper-core/**'
- 'packages/caliper-fisco-bcos/**'
- 'packages/caliper-publish/**'
- 'packages/caliper-tests-integration/fisco-bcos_tests/**'
- '.github/workflows/integration-tests.yml'
- 'package-lock.json'
generator:
- 'packages/caliper-cli/**'
- 'packages/caliper-core/**'
Expand Down
12 changes: 5 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This guideline intends to make contribtuions to Caliper easier by:
* presenting a simple development workflow for contributors to follow;
* and providing a high-level description of the repository components.
* and providing a high-level description of the repository components.

If you have further suggestions about improving the guideline, then you can follow the presented workflow to make your contribution.

Expand Down Expand Up @@ -61,7 +61,7 @@ The following workflow should make your contribution process clean and straighfo
3. Add the upstream/original Caliper repository as a remote, using the name `upstream` (ideally done once). This will allow you to easily sync your fork with the original repository.
* `git remote add upstream https://github.com/hyperledger/caliper.git`

> The following steps follow the "feature branch" development practice, and should be performed for each of your contribution:
> The following steps follow the "feature branch" development practice, and should be performed for each of your contribution:
4. Checkout your `main` branch that will be the starting point/state of your contribution.
* `git checkout main`
Expand All @@ -74,28 +74,27 @@ The following workflow should make your contribution process clean and straighfo
* `git push`
7. Create a new feature branch (named `my-bug-fix`) from the updated `main` branch:
* `git checkout -b my-bug-fix`
* then `git push --set-upstream origin my-bug-fix` to push the new branch to your remote repository
* then `git push --set-upstream origin my-bug-fix` to push the new branch to your remote repository
8. Implement and test your contribution
* The `.build/checks-and-unit-tests.sh` script runs the basic tests for the repository
* The `BENCHMARK=<test_name> .build/benchmark-integration-test-direct.sh` script can run one of the CI integration tests, depending on the value of `<test_name>`:
* `BESU`
* `ETHEREUM`
* `FABRIC`
* `FISCO-BCOS`
* `GENERATOR`
> Make sure that the tests pass locally before pushing your changes and opening a PR!
9. Commit your changes to your local feature branch, **adding the DCO sign-off**:
* `git commit -s -m "Commit message"`
* or `git commit -s` (without the `-m` parameter) to make git open up the configured text editor where you can write a detailed, multi-line commit message:
* The first line is a concise description of the commit (its purpose, what does it fix, etc).
* After a blank line, you can go into details about the changes of the commit.
* After a blank line, you can go into details about the changes of the commit.
10. Push your changes to your remote branch:
* `git push`
11. Open a PR using the GitHub webpage.

### Updating PRs

It is possible that the maintainers/reviewers request some changes before your PR can be merged. In that case, just add your changes to your feature branch using a new signed commit (based on the above workflow), then push it to your remote branch. The PR will automatically pick up the new commit.
It is possible that the maintainers/reviewers request some changes before your PR can be merged. In that case, just add your changes to your feature branch using a new signed commit (based on the above workflow), then push it to your remote branch. The PR will automatically pick up the new commit.

> The maintainers can/will squash commits before merging to keep a simpler commit history for the project.
Expand Down Expand Up @@ -133,7 +132,6 @@ The [packages/](packages/) directory contains the following public/published pac
* [caliper-core](packages/caliper-core/): The core and common codebase of Caliper, used by the other packages.
* [caliper-ethereum](packages/caliper-ethereum/): The Ethereum and Hyperledger Besu connector implementation.
* [caliper-fabric](packages/caliper-fabric/): The Hyperledger Fabric connector implementation.
* [caliper-fisco-bcos](packages/caliper-fisco-bcos/): The FISCO-BCOS connector implementation.
* [generator-caliper](packages/generator-caliper/): The Yeaoman generator for Caliper configuration files.

### Internal packages
Expand Down
17 changes: 8 additions & 9 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ The following is a list of packages and codeowners with familiarity in the area

| Component | Contact(s) |
|---------------------------|------------------|
| Caliper cli | A Klenik, N Lincoln, D Kelsey |
| Caliper core | A Klenik, N Lincoln, D Kelsey |
| Caliper publish | A Klenik, N Lincoln, D Kelsey |
| Caliper ethereum | Benjamin Burns |
| Caliper fabric | A Klenik, N Lincoln, D Kelsey |
| Caliper fisco bcos | Chenxi Li |
| Caliper gui dashboard | Jason you |
| Caliper gui server | Jason you |
| Caliper generator | N Lincoln, D Kelsey |
| Caliper cli | A Klenik, D Kelsey |
| Caliper core | A Klenik, D Kelsey |
| Caliper publish | A Klenik, D Kelsey |
| Caliper ethereum | |
| Caliper fabric | A Klenik, D Kelsey |
| Caliper gui dashboard | |
| Caliper gui server | |
| Caliper generator | D Kelsey |

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Currently supported blockchain solutions:
* [Hyperledger Besu](https://github.com/hyperledger/besu), utilizing the Ethereum adapter.
* [Hyperledger Fabric v1.X, v2.X](https://github.com/hyperledger/fabric)
* [Ethereum](https://github.com/ethereum/go-ethereum)
* [FISCO BCOS](https://github.com/FISCO-BCOS/FISCO-BCOS)

Currently supported performance indicators:
* Success rate
Expand Down

0 comments on commit 31b978f

Please sign in to comment.