feat: remove obsolete packages [fixes DXJ-462] (#337)

* Remove api package * Not publish interface package * Refactoring of interface package * Fix aqua imports * Change impl of isFluencePeer * Remove unused property
fluencelabs · Sep 5, 2023 · e7e6176 · e7e6176
1 parent 18a972b
commit e7e6176
Show file tree

Hide file tree

Showing 18 changed files with 587 additions and 1,333 deletions.
diff --git a/.github/release-please/config.json b/.github/release-please/config.json
@@ -8,9 +8,7 @@
     }
   ],
   "packages": {
-    "packages/client/api": {},
     "packages/core/js-client": {},
-    "packages/core/interfaces": {},
     "packages/core/marine-worker": {}
   }
 }
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,6 +1,4 @@
 {
-  "packages/client/api": "0.13.1",
   "packages/core/js-client": "0.1.1",
-  "packages/core/marine-worker": "0.3.0",
-  "packages/core/interfaces": "0.8.2"
+  "packages/core/marine-worker": "0.3.0"
 }
diff --git a/packages/@tests/aqua/package.json b/packages/@tests/aqua/package.json
@@ -17,12 +17,11 @@
     "author": "Fluence Labs",
     "license": "Apache-2.0",
     "dependencies": {
-        "@fluencelabs/js-client.api": "workspace:^",
         "@fluencelabs/js-client": "workspace:^",
         "base64-js": "1.5.1"
     },
     "devDependencies": {
-        "@fluencelabs/cli": "0.3.9",
+        "@fluencelabs/cli": "0.7.2",
         "@fluencelabs/registry": "0.8.2",
         "@fluencelabs/aqua-lib": "0.6.0",
         "@fluencelabs/trust-graph": "3.1.2"

diff --git a/packages/@tests/aqua/src/_aqua/smoke_test.ts b/packages/@tests/aqua/src/_aqua/smoke_test.ts
@@ -8,11 +8,11 @@
  * Aqua version: 0.10.2
  *
  */
-import type { IFluenceClient as IFluenceClient$$, CallParams as CallParams$$ } from '@fluencelabs/js-client.api';
+import type { IFluenceClient as IFluenceClient$$, CallParams as CallParams$$ } from '@fluencelabs/js-client';
 import {
     v5_callFunction as callFunction$$,
     v5_registerService as registerService$$,
-} from '@fluencelabs/js-client.api';
+} from '@fluencelabs/js-client';
 
 
 

diff --git a/packages/@tests/smoke/web-cra-ts/package.json b/packages/@tests/smoke/web-cra-ts/package.json
@@ -4,7 +4,6 @@
     "private": true,
     "type": "module",
     "dependencies": {
-        "@fluencelabs/js-client.api": "workspace:^",
         "@test/aqua_for_test": "workspace:^",
         "@testing-library/jest-dom": "5.16.5",
         "@testing-library/react": "13.4.0",

diff --git a/packages/client/api/.gitignore b/packages/client/api/.gitignore
diff --git a/packages/client/api/CHANGELOG.md b/packages/client/api/CHANGELOG.md
diff --git a/packages/client/api/README.md b/packages/client/api/README.md
diff --git a/packages/client/api/dtsbundle.cjs b/packages/client/api/dtsbundle.cjs
diff --git a/packages/client/api/package.json b/packages/client/api/package.json
diff --git a/packages/client/api/src/index.ts b/packages/client/api/src/index.ts
diff --git a/packages/client/api/tsconfig.json b/packages/client/api/tsconfig.json
diff --git a/packages/core/interfaces/src/fluenceClient.ts b/packages/core/interfaces/src/fluenceClient.ts
@@ -146,24 +146,6 @@ export interface IFluenceClient extends IFluenceInternalApi {
     getRelayPeerId(): string;
 }
 
-/**
- * For internal use. Checks if the object is a Fluence Peer
- */
-export const asFluencePeer = (fluencePeerCandidate: unknown): IFluenceClient => {
-    if (isFluencePeer(fluencePeerCandidate)) {
-        return fluencePeerCandidate;
-    }
 
-    throw new Error(`Argument ${fluencePeerCandidate} is not a Fluence Peer`);
-};
 
-/**
- * For internal use. Checks if the object is a Fluence Peer
- */
-export const isFluencePeer = (fluencePeerCandidate: unknown): fluencePeerCandidate is IFluenceClient => {
-    if (fluencePeerCandidate && (fluencePeerCandidate as any).__isFluenceAwesome) {
-        return true;
-    }
 
-    return false;
-};
diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json
@@ -27,7 +27,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@chainsafe/libp2p-noise": "13.0.0",
-        "@fluencelabs/interfaces": "0.8.2",
+        "@fluencelabs/interfaces": "workspace:*",
         "@libp2p/crypto": "2.0.3",
         "@libp2p/interface": "0.1.2",
         "@libp2p/mplex": "9.0.4",