Skip to content

Commit

Permalink
feat(go-ethereum-socketio): remove deprecated connector
Browse files Browse the repository at this point in the history
- Remove `cactus-plugin-ledger-connector-go-ethereum-socketio` connector and
  any reference to it.
- Remove `SocketIOApiClient` from `cactus-api-client` since it is the
  last connector that was linked to it.
- Remove `legacy-socketio` option from `cactus-verifier-client`.

Part of hyperledger-cacti#3155

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
  • Loading branch information
outSH committed Jun 20, 2024
1 parent 45fadcd commit c35e314
Show file tree
Hide file tree
Showing 58 changed files with 22 additions and 5,167 deletions.
2 changes: 0 additions & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,7 @@
"**/node_modules/**",
"**/build/**",
"**/src/main/typescript/generated/**",
"packages/cactus-plugin-verifier-cc/**",
"packages/cactus-cmd-socketio-server/**",
"packages/cactus-plugin-ledger-connector-go-ethereum-socketio/**",
"packages/cactus-plugin-ledger-connector-*-socketio/**"
]
}
7 changes: 0 additions & 7 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier.ts
packages/cactus-cmd-socketio-server/src/main/typescript/verifier/VerifierFactory.ts
packages/cactus-cmd-socketio-server/src/test/typescript/unit/Verifier.test.ts

packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/common/core/app.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/common/core/bin/www.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/connector/template/ServerMonitorPlugin_template.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/connector/template/ServerPlugin_template.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_getNonceHex.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_sendRawTransaction.ts
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_transferNumericAsset.ts
packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/src/main/typescript/common/core/app.ts
packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts

Expand Down
44 changes: 9 additions & 35 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
---
env:
NODEJS_VERSION: v18.18.2
RUN_TRIVY_SCAN: true
RUN_TRIVY_SCAN: true
jobs:
ActionLint:
uses: ./.github/workflows/actionlint.yaml
Expand Down Expand Up @@ -1062,7 +1062,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
- run: ./tools/ci.sh

- name: Ensure .tmp Directory Exists
run: mkdir -p .tmp/benchmark-results/plugin-ledger-connector-besu/

Expand Down Expand Up @@ -1152,7 +1152,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
- run: ./tools/ci.sh

cpl-connector-stellar:
continue-on-error: false
needs:
Expand Down Expand Up @@ -1612,32 +1612,6 @@ jobs:
- run: npm run configure
- run: yarn jest ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts

cplc-go-ethereum-socketio:
continue-on-error: false
env:
DEV_BUILD_DISABLED: false
FULL_BUILD_DISABLED: true
JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts
JEST_TEST_RUNNER_DISABLED: true
TAPE_TEST_RUNNER_DISABLED: true
needs: build-dev
runs-on: ubuntu-22.04
steps:
- name: Use Node.js ${{ env.NODEJS_VERSION }}
uses: actions/setup-node@v4.0.2
with:
node-version: ${{ env.NODEJS_VERSION }}
- uses: actions/checkout@v4.1.1

- id: yarn-cache
name: Restore Yarn Cache
uses: actions/cache@v4.0.1
with:
key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
path: ./.yarn/
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
- run: ./tools/ci.sh
cplc-iroha2:
continue-on-error: false
needs:
Expand Down Expand Up @@ -1713,7 +1687,7 @@ jobs:
with:
node-version: ${{ env.NODEJS_VERSION }}
- uses: actions/checkout@v4.1.1

- id: yarn-cache
name: Restore Yarn Cache
uses: actions/cache@v4.0.1
Expand Down Expand Up @@ -2076,7 +2050,7 @@ jobs:
with:
node-version: ${{ env.NODEJS_VERSION }}
- uses: actions/checkout@v4.1.1

- id: yarn-cache
name: Restore Yarn Cache
uses: actions/cache@v4.0.1
Expand Down Expand Up @@ -2302,7 +2276,7 @@ jobs:
- uses: actions/checkout@v4.1.1
- name: ghcr.io/hyperledger/cactus-corda-all-in-one-obligation
run: DOCKER_BUILDKIT=1 docker build ./tools/docker/corda-all-in-one/ -f ./tools/docker/corda-all-in-one/corda-v4_8/Dockerfile -t cactus-corda-all-in-one-obligation

ghcr-dev-container-vscode:
runs-on: ubuntu-22.04
needs:
Expand Down Expand Up @@ -2333,7 +2307,7 @@ jobs:
- uses: actions/checkout@v4.1.1
- name: ghcr.io/hyperledger/cactus-example-supply-chain-app
run: DOCKER_BUILDKIT=1 docker build . -f ./examples/cactus-example-supply-chain-backend/Dockerfile -t cactus-example-supply-chain-app

ghcr-fabric2-all-in-one:
runs-on: ubuntu-22.04
steps:
Expand Down Expand Up @@ -2363,14 +2337,14 @@ jobs:
- uses: actions/checkout@v4.1.1
- name: ghcr.io/hyperledger/cactus-quorum-all-in-one
run: DOCKER_BUILDKIT=1 docker build ./tools/docker/quorum-all-in-one/ -f ./tools/docker/quorum-all-in-one/Dockerfile

ghcr-quorum-multi-party-all-in-one:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4.1.1
- name: ghcr.io/hyperledger/cactus-quorum-multi-party-all-in-one
run: DOCKER_BUILDKIT=1 docker build ./tools/docker/quorum-multi-party-all-in-one/ -f ./tools/docker/quorum-multi-party-all-in-one/Dockerfile -t cactus-quorum-multi-party-all-in-one

name: Cactus_CI
'on':
pull_request:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,6 @@ function start_ethereum_testnet() {
popd
}

function copy_ethereum_validator_config() {
echo ">> copy_ethereum_validator_config()"
cp -fr ${ROOT_DIR}/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/sample-config/* \
"${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio/"
generate_certificate "GoEthereumCactusValidator" "${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio/CA/"
echo ">> copy_ethereum_validator_config() done."
}

function start_indy_testnet() {
echo ">> start_indy_testnet()"
pushd "${ROOT_DIR}/tools/docker/indy-all-in-one"
Expand Down Expand Up @@ -164,7 +156,6 @@ function start_ledgers() {
# Start Ethereum
mkdir -p "${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio"
start_ethereum_testnet
copy_ethereum_validator_config

# Start Indy
start_indy_testnet
Expand Down
5 changes: 0 additions & 5 deletions packages/cactus-api-client/src/main/typescript/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
export { ApiClient } from "./api-client";
export { DefaultConsortiumProvider } from "./default-consortium-provider";
export {
SocketIOApiClient,
SocketLedgerEvent,
SocketIOApiClientOptions,
} from "./socketio-api-client";
Loading

0 comments on commit c35e314

Please sign in to comment.