Skip to content

Commit bcad3be

Browse files
outSHoutSH
committed
build(deps): wip replace packages
Signed-off-by: Michal Bajer <[email protected]>
1 parent 960a12f commit bcad3be

22 files changed

+66
-39
lines changed

‎extensions/cactus-plugin-object-store-ipfs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This plugin uses OpenAPI to generate the API paths. There are three endpoints de
4646
Firstly create an instance of the plugin.
4747

4848
```typescript
49-
import { create } from "ipfs-http-client";
49+
import { create } from "kubo-rpc-client";
5050

5151
const logLevel: LogLevelDesc = "TRACE";
5252
const ipfsClientOrOptions = create();

‎packages/cactus-plugin-odap-hermes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
"web3-utils": "1.6.1"
6969
},
7070
"devDependencies": {
71+
"@hyperledger/cacti-esm-compat-hacks": "2.0.0-alpha.2",
7172
"@types/crypto-js": "4.0.1",
7273
"@types/express": "4.17.19",
7374
"@types/tape": "4.13.4",
7475
"crypto-js": "4.0.0",
7576
"fabric-network": "2.2.19",
76-
"ipfs-http-client": "60.0.1",
7777
"typescript": "4.9.5"
7878
},
7979
"engines": {

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/backup-gateway-after-client-crash.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -53,6 +52,7 @@ import {
5352
ReceiptType,
5453
Web3SigningCredential,
5554
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
55+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5656
import Web3 from "web3";
5757

5858
import { makeSessionDataChecks } from "../make-checks";
@@ -161,7 +161,8 @@ beforeAll(async () => {
161161

162162
const ipfsApiUrl = await ipfsContainer.getApiUrl();
163163

164-
const ipfsClientOrOptions = create({
164+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
165+
const ipfsClientOrOptions = kuboRpcModule.create({
165166
url: ipfsApiUrl,
166167
});
167168

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/client-crash-after-delete-asset.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
5251
ReceiptType,
5352
Web3SigningCredential,
5453
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
54+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5555
import Web3 from "web3";
5656

5757
import { makeSessionDataChecks } from "../make-checks";
@@ -158,7 +158,8 @@ beforeAll(async () => {
158158

159159
const ipfsApiUrl = await ipfsContainer.getApiUrl();
160160

161-
const ipfsClientOrOptions = create({
161+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
162+
const ipfsClientOrOptions = kuboRpcModule.create({
162163
url: ipfsApiUrl,
163164
});
164165

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/client-crash-after-lock-asset.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
5251
ReceiptType,
5352
Web3SigningCredential,
5453
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
54+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5555
import Web3 from "web3";
5656

5757
import { makeSessionDataChecks } from "../make-checks";
@@ -158,7 +158,8 @@ beforeAll(async () => {
158158

159159
const ipfsApiUrl = await ipfsContainer.getApiUrl();
160160

161-
const ipfsClientOrOptions = create({
161+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
162+
const ipfsClientOrOptions = kuboRpcModule.create({
162163
url: ipfsApiUrl,
163164
});
164165

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/client-crash-after-transfer-initiation.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express, { Express } from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -19,6 +18,7 @@ import {
1918
PluginOdapGateway,
2019
} from "../../../main/typescript/gateway/plugin-odap-gateway";
2120
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
21+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
2222
import {
2323
AssetProfile,
2424
ClientV1Request,
@@ -93,7 +93,8 @@ beforeAll(async () => {
9393

9494
const ipfsApiUrl = await ipfsContainer.getApiUrl();
9595

96-
const ipfsClientOrOptions = create({
96+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
97+
const ipfsClientOrOptions = kuboRpcModule.create({
9798
url: ipfsApiUrl,
9899
});
99100

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-api-call-with-ledger-connector.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -53,6 +52,7 @@ import {
5352
PluginFactoryLedgerConnector,
5453
Web3SigningCredential,
5554
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
55+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5656

5757
import { makeSessionDataChecks } from "../make-checks";
5858
import {
@@ -65,6 +65,7 @@ import {
6565
} from "../../../main/typescript/gateway/besu-odap-gateway";
6666
import { ClientGatewayHelper } from "../../../main/typescript/gateway/client/client-helper";
6767
import { ServerGatewayHelper } from "../../../main/typescript/gateway/server/server-helper";
68+
6869
/**
6970
* Use this to debug issues with the fabric node SDK
7071
* ```sh
@@ -152,7 +153,8 @@ beforeAll(async () => {
152153

153154
const ipfsApiUrl = await ipfsContainer.getApiUrl();
154155

155-
const ipfsClientOrOptions = create({
156+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
157+
const ipfsClientOrOptions = kuboRpcModule.create({
156158
url: ipfsApiUrl,
157159
});
158160

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-api-call.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -18,6 +17,8 @@ import {
1817
import { Configuration } from "@hyperledger/cactus-core-api";
1918

2019
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
20+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
21+
2122
import {
2223
PluginOdapGateway,
2324
IPluginOdapGatewayConstructorOptions,
@@ -33,6 +34,7 @@ import { FabricOdapGateway } from "../../../main/typescript/gateway/fabric-odap-
3334
import { ClientGatewayHelper } from "../../../main/typescript/gateway/client/client-helper";
3435
import { ServerGatewayHelper } from "../../../main/typescript/gateway/server/server-helper";
3536

37+
3638
const MAX_RETRIES = 5;
3739
const MAX_TIMEOUT = 5000;
3840

@@ -78,7 +80,8 @@ beforeAll(async () => {
7880

7981
const ipfsApiUrl = await ipfsContainer.getApiUrl();
8082

81-
const ipfsClientOrOptions = create({
83+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
84+
const ipfsClientOrOptions = kuboRpcModule.create({
8285
url: ipfsApiUrl,
8386
});
8487

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-rollback.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
5251
ReceiptType,
5352
Web3SigningCredential,
5453
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
54+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5555
import Web3 from "web3";
5656

5757
import {
@@ -155,7 +155,8 @@ beforeAll(async () => {
155155

156156
const ipfsApiUrl = await ipfsContainer.getApiUrl();
157157

158-
const ipfsClientOrOptions = create({
158+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
159+
const ipfsClientOrOptions = kuboRpcModule.create({
159160
url: ipfsApiUrl,
160161
});
161162

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -16,6 +15,7 @@ import { v4 as uuidV4 } from "uuid";
1615
import { Configuration } from "@hyperledger/cactus-core-api";
1716
import { PluginOdapGateway } from "../../../main/typescript/gateway/plugin-odap-gateway";
1817
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
18+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
1919
import {
2020
AssetProfile,
2121
ClientV1Request,
@@ -66,7 +66,8 @@ beforeAll(async () => {
6666

6767
const ipfsApiUrl = await ipfsContainer.getApiUrl();
6868

69-
const ipfsClientOrOptions = create({
69+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
70+
const ipfsClientOrOptions = kuboRpcModule.create({
7071
url: ipfsApiUrl,
7172
});
7273

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/server-crash-after-create-asset.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
55
import { AddressInfo } from "net";
66
import { v4 as uuidv4 } from "uuid";
77
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
8-
import { create } from "ipfs-http-client";
98
import bodyParser from "body-parser";
109
import express from "express";
1110
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
5251
ReceiptType,
5352
Web3SigningCredential,
5453
} from "@hyperledger/cactus-plugin-ledger-connector-besu";
54+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
5555
import Web3 from "web3";
5656

5757
import { makeSessionDataChecks } from "../make-checks";
@@ -157,7 +157,8 @@ beforeAll(async () => {
157157

158158
const ipfsApiUrl = await ipfsContainer.getApiUrl();
159159

160-
const ipfsClientOrOptions = create({
160+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
161+
const ipfsClientOrOptions = kuboRpcModule.create({
161162
url: ipfsApiUrl,
162163
});
163164

‎packages/cactus-plugin-odap-hermes/src/test/typescript/integration/server-crash-after-transfer-initiation.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express, { Express } from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -15,6 +14,7 @@ import {
1514
} from "@hyperledger/cactus-common";
1615
import { Configuration } from "@hyperledger/cactus-core-api";
1716
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
17+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
1818
import {
1919
AssetProfile,
2020
ClientV1Request,
@@ -93,7 +93,8 @@ beforeAll(async () => {
9393

9494
const ipfsApiUrl = await ipfsContainer.getApiUrl();
9595

96-
const ipfsClientOrOptions = create({
96+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
97+
const ipfsClientOrOptions = kuboRpcModule.create({
9798
url: ipfsApiUrl,
9899
});
99100

‎packages/cactus-plugin-odap-hermes/src/test/typescript/unit/client/commit-final.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { SHA256 } from "crypto-js";
33
import bodyParser from "body-parser";
44
import { v4 as uuidv4 } from "uuid";
55
import http, { Server } from "http";
6-
import { create } from "ipfs-http-client";
76
import {
87
OdapMessageType,
98
PluginOdapGateway,
@@ -21,6 +20,7 @@ import {
2120
import { Configuration } from "@hyperledger/cactus-core-api";
2221
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
2322
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
23+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
2424
import express from "express";
2525
import { AddressInfo } from "net";
2626

@@ -76,7 +76,8 @@ beforeAll(async () => {
7676

7777
const ipfsApiUrl = await ipfsContainer.getApiUrl();
7878

79-
const ipfsClientOrOptions = create({
79+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
80+
const ipfsClientOrOptions = kuboRpcModule.create({
8081
url: ipfsApiUrl,
8182
});
8283

‎packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/logging.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -17,6 +16,8 @@ import { v4 as uuidV4 } from "uuid";
1716
import { Configuration } from "@hyperledger/cactus-core-api";
1817
import { PluginOdapGateway } from "../../../../main/typescript/gateway/plugin-odap-gateway";
1918
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
19+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
20+
2021
import {
2122
OdapLocalLog,
2223
SessionData,
@@ -86,7 +87,8 @@ beforeAll(async () => {
8687

8788
const ipfsApiUrl = await ipfsContainer.getApiUrl();
8889

89-
const ipfsClientOrOptions = create({
90+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
91+
const ipfsClientOrOptions = kuboRpcModule.create({
9092
url: ipfsApiUrl,
9193
});
9294

‎packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/recover-success.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
33
import { v4 as uuidv4 } from "uuid";
44
import "jest-extended";
55
import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
6-
import { create } from "ipfs-http-client";
76
import bodyParser from "body-parser";
87
import express from "express";
98
import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -16,6 +15,7 @@ import { v4 as uuidV4 } from "uuid";
1615
import { Configuration } from "@hyperledger/cactus-core-api";
1716
import { PluginOdapGateway } from "../../../../main/typescript/gateway/plugin-odap-gateway";
1817
import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
18+
import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
1919
import {
2020
RecoverSuccessV1Message,
2121
SessionData,
@@ -70,7 +70,8 @@ beforeAll(async () => {
7070
const ipfsApiUrl = await ipfsContainer.getApiUrl();
7171
// t.comment(`Go IPFS Test Container API URL: ${ipfsApiUrl}`);
7272

73-
const ipfsClientOrOptions = create({
73+
const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
74+
const ipfsClientOrOptions = kuboRpcModule.create({
7475
url: ipfsApiUrl,
7576
});
7677

0 commit comments

Comments
 (0)