Merge pull request #846 from forta-network/hotfix/revert-e2e-test-cha…

…nges Revert e2e test changes
forta-network · Jan 29, 2024 · 3f94683 · 3f94683
2 parents d27ce5c + b958db5
commit 3f94683
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 84 deletions.
diff --git a/tests/e2e/.ipfs/config b/tests/e2e/.ipfs/config
@@ -1,30 +1,12 @@
 {
-  "API": {
-    "HTTPHeaders": {}
-  },
-  "Addresses": {
-    "API": "/ip4/0.0.0.0/tcp/5002",
-    "Announce": null,
-    "Gateway": "/ip4/0.0.0.0/tcp/8181",
-    "NoAnnounce": null,
-    "Swarm": [
-      "/ip4/0.0.0.0/tcp/4002",
-      "/ip6/::/tcp/4002",
-      "/ip4/0.0.0.0/udp/4002/quic-v1",
-      "/ip4/0.0.0.0/udp/4002/quic-v1/webtransport",
-      "/ip6/::/udp/4002/quic-v1",
-      "/ip6/::/udp/4002/quic-v1/webtransport"
-    ]
-  },
-  "AutoNAT": {},
-  "Bootstrap": [],
-  "DNS": {
-    "Resolvers": {}
+  "Identity": {
+    "PeerID": "12D3KooWQnSGodX2FKUriXDoBMsnUPeT8VY4JKGcnBHoyZbFr2Et",
+    "PrivKey": "CAESQPMUlTm0g5Lr56yX8RkPTJFFSpMZxrCsN4jvju8FO2e13mDIgjdS+DpO6sWjMqqe3vhkmx/u8zXKF4DdvFn5KhE="
   },
   "Datastore": {
-    "BloomFilterSize": 0,
+    "StorageMax": "10GB",
+    "StorageGCWatermark": 90,
     "GCPeriod": "1h",
-    "HashOnRead": false,
     "Spec": {
       "mounts": [
         {
@@ -51,85 +33,121 @@
       ],
       "type": "mount"
     },
-    "StorageGCWatermark": 90,
-    "StorageMax": "10GB"
+    "HashOnRead": false,
+    "BloomFilterSize": 0
+  },
+  "Addresses": {
+    "Swarm": [
+      "/ip4/0.0.0.0/tcp/4002",
+      "/ip6/::/tcp/4002",
+      "/ip4/0.0.0.0/udp/4002/quic",
+      "/ip6/::/udp/4002/quic"
+    ],
+    "Announce": [],
+    "NoAnnounce": [],
+    "API": "/ip4/0.0.0.0/tcp/5002",
+    "Gateway": "/ip4/0.0.0.0/tcp/8181"
+  },
+  "Mounts": {
+    "IPFS": "/ipfs",
+    "IPNS": "/ipns",
+    "FuseAllowOther": false
   },
   "Discovery": {
     "MDNS": {
       "Enabled": false,
       "Interval": 10
     }
   },
-  "Experimental": {
-    "FilestoreEnabled": false,
-    "GraphsyncEnabled": false,
-    "Libp2pStreamMounting": false,
-    "P2pHttpProxy": false,
-    "ShardingEnabled": false,
-    "StrategicProviding": false,
-    "UrlstoreEnabled": false
+  "Routing": {
+    "Type": "none"
+  },
+  "Ipns": {
+    "RepublishPeriod": "",
+    "RecordLifetime": "",
+    "ResolveCacheSize": 128
   },
+  "Bootstrap": [],
   "Gateway": {
+    "HTTPHeaders": {
+      "Access-Control-Allow-Headers": [
+        "X-Requested-With",
+        "Range",
+        "User-Agent"
+      ],
+      "Access-Control-Allow-Methods": [
+        "GET"
+      ],
+      "Access-Control-Allow-Origin": [
+        "*"
+      ]
+    },
+    "RootRedirect": "",
+    "Writable": false,
+    "PathPrefixes": [],
     "APICommands": [],
-    "HTTPHeaders": {},
-    "NoDNSLink": true,
     "NoFetch": true,
-    "PathPrefixes": [],
-    "PublicGateways": null,
-    "RootRedirect": "",
-    "Writable": false
-  },
-  "Identity": {
-    "PeerID": "12D3KooWQnSGodX2FKUriXDoBMsnUPeT8VY4JKGcnBHoyZbFr2Et",
-    "PrivKey": "CAESQPMUlTm0g5Lr56yX8RkPTJFFSpMZxrCsN4jvju8FO2e13mDIgjdS+DpO6sWjMqqe3vhkmx/u8zXKF4DdvFn5KhE="
+    "NoDNSLink": true,
+    "PublicGateways": null
   },
-  "Internal": {},
-  "Ipns": {
-    "RecordLifetime": "",
-    "RepublishPeriod": "",
-    "ResolveCacheSize": 128
+  "API": {
+    "HTTPHeaders": {}
   },
-  "Migration": {
-    "DownloadSources": [],
-    "Keep": ""
+  "Swarm": {
+    "AddrFilters": null,
+    "DisableBandwidthMetrics": false,
+    "DisableNatPortMap": false,
+    "EnableRelayHop": false,
+    "EnableAutoRelay": false,
+    "Transports": {
+      "Network": {},
+      "Security": {},
+      "Multiplexers": {}
+    },
+    "ConnMgr": {
+      "Type": "basic",
+      "LowWater": 600,
+      "HighWater": 900,
+      "GracePeriod": "20s"
+    }
   },
-  "Mounts": {
-    "FuseAllowOther": false,
-    "IPFS": "/ipfs",
-    "IPNS": "/ipns"
+  "AutoNAT": {},
+  "Pubsub": {
+    "Router": "",
+    "DisableSigning": false
   },
   "Peering": {
     "Peers": null
   },
-  "Pinning": {
-    "RemoteServices": {}
+  "DNS": {
+    "Resolvers": {}
   },
-  "Plugins": {
-    "Plugins": null
+  "Migration": {
+    "DownloadSources": [],
+    "Keep": ""
   },
   "Provider": {
     "Strategy": ""
   },
-  "Pubsub": {
-    "DisableSigning": false,
-    "Router": ""
+  "Reprovider": {
+    "Interval": "12h",
+    "Strategy": "all"
   },
-  "Reprovider": {},
-  "Routing": {
-    "AcceleratedDHTClient": false,
-    "Type": "none"
+  "Experimental": {
+    "FilestoreEnabled": false,
+    "UrlstoreEnabled": false,
+    "ShardingEnabled": false,
+    "GraphsyncEnabled": false,
+    "Libp2pStreamMounting": false,
+    "P2pHttpProxy": false,
+    "StrategicProviding": false,
+    "AcceleratedDHTClient": false
   },
-  "Swarm": {
-    "AddrFilters": null,
-    "ConnMgr": {},
-    "DisableBandwidthMetrics": false,
-    "DisableNatPortMap": false,
-    "EnableAutoRelay": false,
-    "EnableRelayHop": false,
-    "Transports": {
-      "Multiplexers": {},
-      "Network": {},
-      "Security": {}
-    }
-  }
-}
+  "Plugins": {
+    "Plugins": null
+  },
+  "Pinning": {
+    "RemoteServices": {}
+  },
+  "Internal": {}
+}
diff --git a/tests/e2e/.ipfs/version b/tests/e2e/.ipfs/version
@@ -1 +1 @@
-15
+12
diff --git a/tests/e2e/disco.config.yml b/tests/e2e/disco.config.yml
@@ -7,9 +7,6 @@ log:
 storage:
   ipfs:
     url: http://localhost:5002
-    router:
-      nodes:
-        - url: http://localhost:5002
   delete:
     enabled: true
   maintenance: