chore: fix client tests

Author: dOrgJelli

packages/client/src/__tests__/core/error-structure.spec.ts

@@ -92,7 +92,7 @@ describe("Error structure", () => {
       expect(prev.reason).toContain(
         "A URI Resolver returned an error."
       );
-      expect(prev.uri).toEqual("wrapscan.io/polywrap/ens-uri-resolver@1.0.0");
+      expect(prev.uri).toEqual("wrap://embed/http-uri-resolver@1.0.0");
     });
 
     describe("Wasm wrapper - Assemblyscript", () => {

packages/client/src/__tests__/core/uri-resolution.spec.ts

@@ -37,7 +37,7 @@ describe("URI resolution", () => {
     const result = await client.tryResolveUri({ uri, resolutionContext });
 
     const expectResult = UriResolutionResult.ok(
-      Uri.from("wrap://ipfs/QmSAXrSLcmGUkQRrApAtG5qTPmuRMMX2Zf1wihpguDQfbm")
+      Uri.from("wrap://ipfs/QmeHyySwhkYvKqaPNtcq7wYDb1M9QnaqbaX1eDNDqW5fdt")
     );
 
     if (expectResult.ok) {

packages/client/src/__tests__/core/wrap-features/interface-implementation-case.ts

@@ -4,7 +4,7 @@ import {
   PolywrapClient,
   UriMap,
 } from "../../../index";
-import { PolywrapClientConfigBuilder } from "@polywrap/client-config-builder-js";
+import { PolywrapClientConfigBuilder, Sys } from "@polywrap/client-config-builder-js";
 import { UriResolver } from "@polywrap/uri-resolvers-js";
 import { mockPluginRegistration } from "../../helpers";
 import { GetPathToTestWrappers } from "@polywrap/test-cases";
@@ -269,6 +269,7 @@ export const interfaceInvokeCase = (implementation: string) => {
         .setRedirect(oldInterfaceUri.uri, newInterfaceUri.uri)
         .addInterfaceImplementation(oldInterfaceUri.uri, implementation1Uri.uri)
         .addInterfaceImplementation(newInterfaceUri.uri, implementation2Uri.uri)
+        .setPackage(newInterfaceUri.uri, Sys.bundle.httpResolver.package!)
         .build();
 
       const client = new PolywrapClient(config);

packages/client/src/__tests__/e2e.spec.ts

@@ -3,7 +3,10 @@ import { subinvokeCase } from "./core/wrap-features/subinvoke-case";
 import { envTestCases } from "./core/wrap-features/env-case";
 import { interfaceInvokeCase } from "./core/wrap-features/interface-implementation-case";
 
+jest.setTimeout(60000);
+
 export const supportedImplementations = ["as", "rs"];
+
 describe.each(supportedImplementations)(
   "client <-> wrappers end to end",
   (i) => {

packages/config-bundle/src/index.ts

@@ -1,13 +1,15 @@
 import { IWrapPackage } from "@polywrap/core-js";
 
-export interface Bundle {
-  [name: string]: {
-    uri: string;
-    package?: IWrapPackage;
-    implements?: string[];
-    redirectFrom?: string[];
-    env?: {
-      [prop: string]: unknown;
-    };
+export interface BundlePackage {
+  uri: string;
+  package?: IWrapPackage;
+  implements?: string[];
+  redirectFrom?: string[];
+  env?: {
+    [prop: string]: unknown;
   };
 }
+
+export interface Bundle {
+  [name: string]: BundlePackage;
+}

packages/config-bundles/sys/src/common.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import { IWrapPackage } from "@polywrap/core-js";
-import { Bundle } from "@polywrap/config-bundle-types-js";
+import { Bundle, BundlePackage } from "@polywrap/config-bundle-types-js";
 import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js";
 
 // $start: bundle
@@ -17,7 +17,19 @@ export const ipfsProviders: string[] = [
   "https://ipfs.io",
 ];
 
-export const bundle: Bundle = {
+export interface SysCommonBundle extends Bundle {
+  logger: BundlePackage;
+  datetime: BundlePackage;
+  concurrent: BundlePackage;
+  http: BundlePackage;
+  githubResolver: BundlePackage;
+  httpResolver: BundlePackage;
+  wrapscanResolver: BundlePackage;
+  ipfsHttpClient: BundlePackage;
+  ipfsResolver: BundlePackage;
+}
+
+export const bundle: SysCommonBundle = {
   logger: {
     uri: "plugin/logger@1.0.0",
     package: loggerPlugin({}) as IWrapPackage,

packages/config-bundles/sys/src/node.ts

@@ -2,14 +2,19 @@
 import * as Common from "./common";
 
 import { IWrapPackage } from "@polywrap/core-js";
-import { Bundle } from "@polywrap/config-bundle-types-js";
+import { BundlePackage } from "@polywrap/config-bundle-types-js";
 import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js";
 
 // $start: bundle-node
 import { fileSystemPlugin } from "@polywrap/file-system-plugin-js";
 import * as fileSystemResolver from "./embeds/file-system-resolver/wrap";
 
-export const bundle: Bundle = {
+interface SysNodeBundle extends Common.SysCommonBundle {
+  fileSystem: BundlePackage;
+  fileSystemResolver: BundlePackage;
+}
+
+export const bundle: SysNodeBundle = {
   ...Common.bundle,
   fileSystem: {
     uri: "plugin/file-system@1.0",

packages/config-bundles/web3/src/index.ts

@@ -1,13 +1,24 @@
 /* eslint-disable */
 import { IWrapPackage } from "@polywrap/core-js";
-import { Bundle } from "@polywrap/config-bundle-types-js";
+import { Bundle, BundlePackage } from "@polywrap/config-bundle-types-js";
 import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js";
 
 // $start: bundle
 import * as Sys from "@polywrap/sys-config-bundle-js";
 import * as EthWallet from "@polywrap/ethereum-wallet-js";
 
-export const bundle: Bundle = {
+export interface Web3Bundle extends Bundle {
+  concurrent: BundlePackage;
+  http: BundlePackage;
+  ipfsHttpClient: BundlePackage;
+  ipfsResolver: BundlePackage;
+  ethereumWallet: BundlePackage;
+  ensTextRecordResolver: BundlePackage;
+  ensContenthashResolver: BundlePackage;
+  ensIpfsContenthashResolver: BundlePackage;
+}
+
+export const bundle: Web3Bundle = {
   concurrent: Sys.bundle.concurrent,
   http: Sys.bundle.http,
   ipfsHttpClient: Sys.bundle.ipfsHttpClient,
@@ -39,8 +50,8 @@ export const bundle: Bundle = {
     ],
     redirectFrom: ["wrapscan.io/polywrap/ens-text-record-uri-resolver@1.0"],
   },
-  ensResolver: {
-    uri: "wrapscan.io/polywrap/ens-uri-resolver@1.0",
+  ensContenthashResolver: {
+    uri: "wrapscan.io/polywrap/ens-contenthash-uri-resolver@1.0",
     implements: [ExtendableUriResolver.defaultExtInterfaceUris[0].uri],
   },
   ensIpfsContenthashResolver: {