remove extra containers

Author: rafa-stacks

tests/api/setup.ts

@@ -21,63 +21,7 @@ function defaultContainers(): ContainerConfig[] {
     volumes: ['tests/api/event-replay/.tmp/local/:/root/'],
   };
 
-  const bitcoind: ContainerConfig = {
-    image: 'blockstack/bitcoind:v0.20.99.0',
-    name: `stacks-api-test-bitcoind`,
-    ports: [
-      { host: 18443, container: 18443 },
-      { host: 18444, container: 18444 },
-    ],
-    waitPort: 18443,
-    command: [
-      '/usr/local/bin/bitcoind',
-      '-printtoconsole',
-      '-regtest=1',
-      '-txindex=1',
-      '-rpcallowip=0.0.0.0/0',
-      '-rpcbind=0.0.0.0',
-      '-rpcuser=btc',
-      '-rpcpassword=btc',
-    ],
-  };
-
-  const bitcoindFillFaucet: ContainerConfig = {
-    image: 'byrnedo/alpine-curl',
-    name: `stacks-api-test-bitcoind-fill-faucet`,
-    ports: [],
-    waitForReady: false,
-    restartPolicy: 'on-failure',
-    command: [
-      '-f',
-      '-u',
-      'btc:btc',
-      '--data-binary',
-      '{"jsonrpc": "1.0", "id":"c", "method": "generatetoaddress", "params": [110, "mrzLDS7LT3otAnpiRWGYkWipdnAZJaXAZQ"] }',
-      '-H',
-      'content-type: text/plain;',
-      'http://host.docker.internal:18443/',
-    ],
-    extraHosts: ['host.docker.internal:host-gateway'],
-  };
-
-  const stacksBlockchain: ContainerConfig = {
-    image: 'hirosystems/stacks-api-e2e:stacks3.0-0a2c0e2',
-    name: `stacks-api-test-stacks-blockchain`,
-    ports: [
-      { host: 20443, container: 20443 },
-      { host: 20444, container: 20444 },
-    ],
-    waitPort: 20443,
-    env: [
-      'STACKS_EVENT_OBSERVER=host.docker.internal:3700',
-      'BLOCKSTACK_USE_TEST_GENESIS_CHAINSTATE=1',
-      'NOP_BLOCKSTACK_DEBUG=1',
-    ],
-    extraHosts: ['host.docker.internal:host-gateway'],
-    restartPolicy: 'on-failure',
-  };
-
-  return [postgres, bitcoind, bitcoindFillFaucet, stacksBlockchain];
+  return [postgres];
 }
 
 export async function globalSetup() {

tests/krypton/setup.ts

@@ -48,12 +48,6 @@ export async function globalSetup() {
 export async function globalTeardown() {
   const containers = kryptonContainers();
   for (const config of [...containers].reverse()) {
-    try {
-      process.stdout.write(`\n[testenv:krypton] logs for ${config.name}\n`);
-      await runLogs(config, ['--once']); // tail last logs
-    } catch (error) {
-      process.stdout.write(`[testenv:krypton] could not read logs for ${config.name}: ${error}\n`);
-    }
     await runDown(config);
   }
   process.stdout.write(`[testenv:krypton] all containers removed\n`);

tests/snp/setup.ts

@@ -19,6 +19,7 @@ function snpContainers(): ContainerConfig[] {
     image: 'redis:7',
     name: `stacks-api-test-snp-redis`,
     ports: [{ host: 6379, container: 6379 }],
+    waitPort: 6379,
   };
 
   const snp: ContainerConfig = {
@@ -35,6 +36,7 @@ function snpContainers(): ContainerConfig[] {
       'PGPASSWORD=postgres',
       'PGDATABASE=postgres',
     ],
+    waitPort: 3022,
     extraHosts: ['host.docker.internal:host-gateway'],
   };