From c68046256852e25ee64f90db49ddb05f0e5722d1 Mon Sep 17 00:00:00 2001
From: pablomendezroyo <mendez4a@gmail.com>
Date: Mon, 30 Oct 2023 14:49:15 +0100
Subject: [PATCH] fix int tests imports

---
 .../dappmanager/test/integration/fetchRelease.test.int.ts  | 3 +--
 .../integration/integrationSpecs/buildReleaseManifest.ts   | 2 +-
 .../test/integration/ipfs/ipfsGateway.test.int.ts          | 2 +-
 .../dappmanager/test/integration/packageHasPid.test.int.ts | 7 +++++--
 .../test/integration/resilienceFeatures.test.int.ts        | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/dappmanager/test/integration/fetchRelease.test.int.ts b/packages/dappmanager/test/integration/fetchRelease.test.int.ts
index 583b3c0fb..3dc2e1e5b 100644
--- a/packages/dappmanager/test/integration/fetchRelease.test.int.ts
+++ b/packages/dappmanager/test/integration/fetchRelease.test.int.ts
@@ -4,7 +4,6 @@ import path from "path";
 import { omit } from "lodash-es";
 import { Manifest, SetupWizard, getImageTag } from "@dappnode/types";
 import * as calls from "../../src/calls/index.js";
-import { ManifestWithImage } from "../../src/types.js";
 import {
   getTestMountpoint,
   clearDbs,
@@ -21,7 +20,7 @@ import { shell } from "@dappnode/utils";
 import { dockerComposeUp } from "@dappnode/dockerapi";
 import { ComposeEditor, writeDefaultsToLabels } from "@dappnode/dockercompose";
 import { getContainerName, validatePath } from "@dappnode/utils";
-import { RequestedDnp } from "@dappnode/common";
+import { ManifestWithImage, RequestedDnp } from "@dappnode/common";
 
 describe("Fetch releases", () => {
   // This mountpoints have files inside created by docker with the root
diff --git a/packages/dappmanager/test/integration/integrationSpecs/buildReleaseManifest.ts b/packages/dappmanager/test/integration/integrationSpecs/buildReleaseManifest.ts
index a65b71cd3..7c6d1801d 100644
--- a/packages/dappmanager/test/integration/integrationSpecs/buildReleaseManifest.ts
+++ b/packages/dappmanager/test/integration/integrationSpecs/buildReleaseManifest.ts
@@ -1,9 +1,9 @@
 import { isEqual } from "lodash-es";
 import { ipfs } from "@dappnode/ipfs";
 import { parseManifest } from "@dappnode/manifest";
-import { ManifestWithImage } from "../../../src/types.js";
 import { ipfsAddManifest, ipfsAddFileFromFs } from "../testIpfsUtils.js";
 import { saveNewImageToDisk } from "./mockImage.js";
+import { ManifestWithImage } from "@dappnode/common";
 
 /**
  * Release type: `Manifest-type`
diff --git a/packages/dappmanager/test/integration/ipfs/ipfsGateway.test.int.ts b/packages/dappmanager/test/integration/ipfs/ipfsGateway.test.int.ts
index d0d4a8630..025080464 100644
--- a/packages/dappmanager/test/integration/ipfs/ipfsGateway.test.int.ts
+++ b/packages/dappmanager/test/integration/ipfs/ipfsGateway.test.int.ts
@@ -1,11 +1,11 @@
 import "mocha";
 import { expect } from "chai";
 import { mockManifestWithImage } from "../../testUtils.js";
-import { ManifestWithImage } from "../../../src/types.js";
 import { uploadManifestRelease } from "../integrationSpecs/buildReleaseManifest.js";
 import { uploadDirectoryRelease } from "../integrationSpecs/buildReleaseDirectory.js";
 import { ipfs } from "@dappnode/ipfs";
 import { getManifest } from "@dappnode/installer";
+import { ManifestWithImage } from "@dappnode/common";
 
 describe("IPFS remote", function () {
   this.timeout(100000 * 5);
diff --git a/packages/dappmanager/test/integration/packageHasPid.test.int.ts b/packages/dappmanager/test/integration/packageHasPid.test.int.ts
index 3a33632f6..c21e5767f 100644
--- a/packages/dappmanager/test/integration/packageHasPid.test.int.ts
+++ b/packages/dappmanager/test/integration/packageHasPid.test.int.ts
@@ -2,9 +2,12 @@ import "mocha";
 import fs from "fs";
 import { expect } from "chai";
 import { mockPackageData, shellSafe } from "../testUtils.js";
-import { packageToInstallHasPid, getServicesSharingPid } from "@dappnode/utils";
+import {
+  packageToInstallHasPid,
+  getServicesSharingPid,
+  ComposeServicesSharingPid
+} from "@dappnode/utils";
 import { ComposeFileEditor } from "@dappnode/dockercompose";
-import { ComposeServicesSharingPid } from "../../src/types.js";
 
 describe("Module > compose > pid", () => {
   // Example package
diff --git a/packages/dappmanager/test/integration/resilienceFeatures.test.int.ts b/packages/dappmanager/test/integration/resilienceFeatures.test.int.ts
index e386de2ad..44d4d76f2 100644
--- a/packages/dappmanager/test/integration/resilienceFeatures.test.int.ts
+++ b/packages/dappmanager/test/integration/resilienceFeatures.test.int.ts
@@ -16,8 +16,8 @@ import {
   uploadManifestRelease,
   cleanInstallationArtifacts
 } from "./integrationSpecs/index.js";
-import { ManifestWithImage } from "../../src/types.js";
 import { getDockerComposePath } from "@dappnode/utils";
+import { ManifestWithImage } from "@dappnode/common";
 
 describe("Resilience features, when things go wrong", function () {
   const testMockPrefix = "testmock-";