message: removed merge artifact
diff: - PolywrapClient,
  import * as TestCases from "./test-cases";
  import { makeMemoryStoragePlugin } from "./memory-storage";
  import {
  @@ -267,8 +266,8 @@ describe("wasm-rs test cases", () => {
  });
  describe.skip("Wasm-rs benchmarking", () => {
  - const wrapperPath = `${GetPathToTestWrappers()}/wasm-rs/benchmarks`
  - const wrapperUri = `fs/${wrapperPath}/build`
  + const wrapperPath = `${GetPathToTestWrappers()}/wasm-rs/benchmarks`;
  + const wrapperUri = `fs/${wrapperPath}/build`;
  let cacheFiles = new Map<string, string>();
  const mockFunc = `
  @@ -300,11 +299,9 @@ describe.skip("Wasm-rs benchmarking", () => {
  const msTime = endTime - startTime;
  //Make sure the wrapper works correctly
  - await TestCases.runBigNumberTypeTest(
  - new PolywrapClient(), wrapperUri
  - );
  + await TestCases.runBigNumberTypeTest(await getClient(), wrapperUri);
  - return msTime
  + return msTime;
  };
  beforeEach(() => {
  @@ -324,17 +321,23 @@ describe.skip("Wasm-rs benchmarking", () => {
  //Build the wrapper with no previously cached images
  const firstBuildTimeNew = await buildImage("new");
  - console.log(`1st build - no cache (new): ${firstBuildTimeNew.toFixed(2)}ms`);
  + console.log(
  + `1st build - no cache (new): ${firstBuildTimeNew.toFixed(2)}ms`
  + );
  //Build the wrapper again
  const secondBuildTimeNew = await buildImage("new");
  - console.log(`2nd build - with cache (new): ${secondBuildTimeNew.toFixed(2)}ms`);
  + console.log(
  + `2nd build - with cache (new): ${secondBuildTimeNew.toFixed(2)}ms`
  + );
  //Modify the source code and measure build time
  modifySource();
  - const timeAfterSourceNew = await buildImage("new",);
  - console.log(`3rd build - modified source (new): ${timeAfterSourceNew.toFixed(2)}ms`);
  + const timeAfterSourceNew = await buildImage("new");
  + console.log(
  + `3rd build - modified source (new): ${timeAfterSourceNew.toFixed(2)}ms`
  + );
  restoreSource();
  @@ -342,18 +345,26 @@ describe.skip("Wasm-rs benchmarking", () => {
  execSync(`docker system prune -a -f`);
  const firstBuildTimeCurrent = await buildImage("current");
  - console.log(`1st build - no cache (current): ${firstBuildTimeCurrent.toFixed(2)}ms`);
  + console.log(
  + `1st build - no cache (current): ${firstBuildTimeCurrent.toFixed(2)}ms`
  + );
  const secondBuildTimeCurrent = await buildImage("current");
  - console.log(`2nd build - with cache (current): ${secondBuildTimeCurrent.toFixed(2)}ms`);
  + console.log(
  + `2nd build - with cache (current): ${secondBuildTimeCurrent.toFixed(2)}ms`
  + );
  modifySource();
  const timeAfterSourceCurrent = await buildImage("current");
  - console.log(`3rd build - modified source (current): ${timeAfterSourceCurrent.toFixed(2)}ms`);
  + console.log(
  + `3rd build - modified source (current): ${timeAfterSourceCurrent.toFixed(
  + 2
  + )}ms`
  + );
  restoreSource();
  expect(timeAfterSourceNew).toBeLessThan(timeAfterSourceCurrent);
  - })
  -})
  + });
  +});
  