Skip to content

Commit 31b978f

Browse files
authored
Remove fisco-bcos (#1515)
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>
1 parent 26da2f2 commit 31b978f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+18
-3897
lines changed

.build/publish-caliper.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ cp ./README.md ./packages/caliper-cli/README.md
2121
cp ./README.md ./packages/caliper-core/README.md
2222
cp ./README.md ./packages/caliper-ethereum/README.md
2323
cp ./README.md ./packages/caliper-fabric/README.md
24-
cp ./README.md ./packages/caliper-fisco-bcos/README.md
2524

2625
cd ./packages/caliper-publish/
2726
npm ci

.github/workflows/integration-tests.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ jobs:
4141
- 'packages/caliper-tests-integration/besu_tests/**'
4242
- '.github/workflows/integration-tests.yml'
4343
- 'package-lock.json'
44-
fisco-bcos:
45-
- 'packages/caliper-cli/**'
46-
- 'packages/caliper-core/**'
47-
- 'packages/caliper-fisco-bcos/**'
48-
- 'packages/caliper-publish/**'
49-
- 'packages/caliper-tests-integration/fisco-bcos_tests/**'
50-
- '.github/workflows/integration-tests.yml'
51-
- 'package-lock.json'
5244
generator:
5345
- 'packages/caliper-cli/**'
5446
- 'packages/caliper-core/**'

CONTRIBUTING.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

@@ -61,7 +61,7 @@ The following workflow should make your contribution process clean and straighfo
6161
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.
6262
* `git remote add upstream https://github.com/hyperledger/caliper.git`
6363

64-
> The following steps follow the "feature branch" development practice, and should be performed for each of your contribution:
64+
> The following steps follow the "feature branch" development practice, and should be performed for each of your contribution:
6565
6666
4. Checkout your `main` branch that will be the starting point/state of your contribution.
6767
* `git checkout main`
@@ -74,28 +74,27 @@ The following workflow should make your contribution process clean and straighfo
7474
* `git push`
7575
7. Create a new feature branch (named `my-bug-fix`) from the updated `main` branch:
7676
* `git checkout -b my-bug-fix`
77-
* then `git push --set-upstream origin my-bug-fix` to push the new branch to your remote repository
77+
* then `git push --set-upstream origin my-bug-fix` to push the new branch to your remote repository
7878
8. Implement and test your contribution
7979
* The `.build/checks-and-unit-tests.sh` script runs the basic tests for the repository
8080
* 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>`:
8181
* `BESU`
8282
* `ETHEREUM`
8383
* `FABRIC`
84-
* `FISCO-BCOS`
8584
* `GENERATOR`
8685
> Make sure that the tests pass locally before pushing your changes and opening a PR!
8786
9. Commit your changes to your local feature branch, **adding the DCO sign-off**:
8887
* `git commit -s -m "Commit message"`
8988
* 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:
9089
* The first line is a concise description of the commit (its purpose, what does it fix, etc).
91-
* After a blank line, you can go into details about the changes of the commit.
90+
* After a blank line, you can go into details about the changes of the commit.
9291
10. Push your changes to your remote branch:
9392
* `git push`
9493
11. Open a PR using the GitHub webpage.
9594

9695
### Updating PRs
9796

98-
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.
97+
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.
9998

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

139137
### Internal packages

MAINTAINERS.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ The following is a list of packages and codeowners with familiarity in the area
3636

3737
| Component | Contact(s) |
3838
|---------------------------|------------------|
39-
| Caliper cli | A Klenik, N Lincoln, D Kelsey |
40-
| Caliper core | A Klenik, N Lincoln, D Kelsey |
41-
| Caliper publish | A Klenik, N Lincoln, D Kelsey |
42-
| Caliper ethereum | Benjamin Burns |
43-
| Caliper fabric | A Klenik, N Lincoln, D Kelsey |
44-
| Caliper fisco bcos | Chenxi Li |
45-
| Caliper gui dashboard | Jason you |
46-
| Caliper gui server | Jason you |
47-
| Caliper generator | N Lincoln, D Kelsey |
39+
| Caliper cli | A Klenik, D Kelsey |
40+
| Caliper core | A Klenik, D Kelsey |
41+
| Caliper publish | A Klenik, D Kelsey |
42+
| Caliper ethereum | |
43+
| Caliper fabric | A Klenik, D Kelsey |
44+
| Caliper gui dashboard | |
45+
| Caliper gui server | |
46+
| Caliper generator | D Kelsey |
4847

4948
<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>.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Currently supported blockchain solutions:
1818
* [Hyperledger Besu](https://github.com/hyperledger/besu), utilizing the Ethereum adapter.
1919
* [Hyperledger Fabric v1.X, v2.X](https://github.com/hyperledger/fabric)
2020
* [Ethereum](https://github.com/ethereum/go-ethereum)
21-
* [FISCO BCOS](https://github.com/FISCO-BCOS/FISCO-BCOS)
2221

2322
Currently supported performance indicators:
2423
* Success rate

0 commit comments

Comments
 (0)