Skip to content

Commit 56dd9f8

Browse files
committed
feat(go-ethereum-socketio): remove deprecated connector
- 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 #3155 Signed-off-by: Michal Bajer <[email protected]>
1 parent fdce6b3 commit 56dd9f8

Some content is hidden

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

57 files changed

+12
-5212
lines changed

.cspell.json

-2
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@
213213
"**/node_modules/**",
214214
"**/build/**",
215215
"**/src/main/typescript/generated/**",
216-
"packages/cactus-plugin-verifier-cc/**",
217216
"packages/cactus-cmd-socketio-server/**",
218-
"packages/cactus-plugin-ledger-connector-go-ethereum-socketio/**",
219217
"packages/cactus-plugin-ledger-connector-*-socketio/**"
220218
]
221219
}

.eslintignore

-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ packages/cactus-cmd-socketio-server/src/main/typescript/verifier/Verifier.ts
2323
packages/cactus-cmd-socketio-server/src/main/typescript/verifier/VerifierFactory.ts
2424
packages/cactus-cmd-socketio-server/src/test/typescript/unit/Verifier.test.ts
2525

26-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/common/core/app.ts
27-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/common/core/bin/www.ts
28-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/connector/template/ServerMonitorPlugin_template.ts
29-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/main/typescript/connector/template/ServerPlugin_template.ts
30-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_getNonceHex.ts
31-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_sendRawTransaction.ts
32-
packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/unit-test/validatorDriver_transferNumericAsset.ts
3326
packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/src/main/typescript/common/core/app.ts
3427
packages/cactus-plugin-ledger-connector-tcs-huawei-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts
3528

.github/workflows/ci.yaml

-34
Original file line numberDiff line numberDiff line change
@@ -1870,40 +1870,6 @@ jobs:
18701870
- run: npm run configure
18711871
- run: yarn jest ./packages/cactus-plugin-ledger-connector-fabric/src/test/typescript/integration/fabric-v2-2-x/run-transaction-with-ws-ids.test.ts
18721872

1873-
cplc-go-ethereum-socketio:
1874-
continue-on-error: false
1875-
env:
1876-
DEV_BUILD_DISABLED: false
1877-
FULL_BUILD_DISABLED: true
1878-
JEST_TEST_PATTERN: packages/cactus-plugin-ledger-connector-go-ethereum-socketio/src/test/typescript/(unit|integration|benchmark)/.*/*.test.ts
1879-
JEST_TEST_RUNNER_DISABLED: true
1880-
JEST_TEST_COVERAGE_PATH: ./code-coverage-ts/cplc-go-ethereum-socketio
1881-
JEST_TEST_CODE_COVERAGE_ENABLED: true
1882-
TAPE_TEST_RUNNER_DISABLED: true
1883-
needs: build-dev
1884-
runs-on: ubuntu-22.04
1885-
steps:
1886-
- name: Use Node.js ${{ env.NODEJS_VERSION }}
1887-
uses: actions/[email protected]
1888-
with:
1889-
node-version: ${{ env.NODEJS_VERSION }}
1890-
- uses: actions/[email protected]
1891-
1892-
- id: yarn-cache
1893-
name: Restore Yarn Cache
1894-
uses: actions/[email protected]
1895-
with:
1896-
key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
1897-
path: ./.yarn/
1898-
restore-keys: |
1899-
${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
1900-
- run: ./tools/ci.sh
1901-
if: ${{ env.RUN_CODE_COVERAGE == 'true' }}
1902-
- name: Upload coverage reports as artifacts
1903-
uses: actions/[email protected]
1904-
with:
1905-
name: coverage-reports-29
1906-
path: ./code-coverage-ts/**/
19071873
cplc-iroha2:
19081874
continue-on-error: false
19091875
needs:

examples/cactus-example-discounted-asset-trade/script-start-ledgers.sh

-9
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,6 @@ function start_ethereum_testnet() {
113113
popd
114114
}
115115

116-
function copy_ethereum_validator_config() {
117-
echo ">> copy_ethereum_validator_config()"
118-
cp -fr ${ROOT_DIR}/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/sample-config/* \
119-
"${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio/"
120-
generate_certificate "GoEthereumCactusValidator" "${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio/CA/"
121-
echo ">> copy_ethereum_validator_config() done."
122-
}
123-
124116
function start_indy_testnet() {
125117
echo ">> start_indy_testnet()"
126118
pushd "${ROOT_DIR}/tools/docker/indy-all-in-one"
@@ -164,7 +156,6 @@ function start_ledgers() {
164156
# Start Ethereum
165157
mkdir -p "${CONFIG_VOLUME_PATH}/connector-go-ethereum-socketio"
166158
start_ethereum_testnet
167-
copy_ethereum_validator_config
168159

169160
# Start Indy
170161
start_indy_testnet
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
export { ApiClient } from "./api-client";
22
export { DefaultConsortiumProvider } from "./default-consortium-provider";
3-
export {
4-
SocketIOApiClient,
5-
SocketLedgerEvent,
6-
SocketIOApiClientOptions,
7-
} from "./socketio-api-client";

0 commit comments

Comments
 (0)