changes

oldschoolgg · Jul 8, 2024 · ecc57d6 · ecc57d6
1 parent 9b0c7bf
commit ecc57d6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/dockerfile b/dockerfile
@@ -27,4 +27,10 @@ RUN cp src/config.example.ts src/config.ts
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.9.0/wait /wait
 RUN chmod +x /wait
 
-CMD /wait && yarn prisma db push --schema='./prisma/robochimp.prisma' && yarn prisma db push --schema='./prisma/schema.prisma' && yarn run build:tsc && yarn vitest run --config vitest.integration.config.mts
+CMD /wait && \
+    psql postgres://postgres:postgres@localhost:5435/postgres -c 'CREATE EXTENSION IF NOT EXISTS intarray;' && \
+    yarn prisma db push --schema='./prisma/robochimp.prisma' && \
+    yarn prisma db push --schema='./prisma/schema.prisma' && \
+    yarn run build:tsc && \
+    yarn vitest run --config vitest.integration.config.mts && \
+    exit 0
diff --git a/package.json b/package.json
@@ -16,8 +16,8 @@
 		"test:integration": "tsx ./src/scripts/integration-tests.ts",
 		"watch": "tsc -w -p src",
 		"build:esbuild": "yarn build:main && yarn build:workers",
-		"build:main": "esbuild src/index.ts --minify --legal-comments=none --bundle --outdir=./dist --platform=node --loader:.node=file --external:@napi-rs/canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina",
-		"build:workers": "esbuild src/lib/workers/kill.worker.ts src/lib/workers/finish.worker.ts src/lib/workers/casket.worker.ts --minify --legal-comments=none --outdir=./dist/workers --platform=node --loader:.node=file --external:piscina"
+		"build:main": "esbuild src/index.ts src/lib/workers/index.ts --minify --legal-comments=none --outdir=./dist --bundle --platform=node --loader:.node=file --external:@napi-rs/canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina",
+		"build:workers": "esbuild src/lib/workers/kill.worker.ts src/lib/workers/finish.worker.ts src/lib/workers/casket.worker.ts --bundle --minify --legal-comments=none --outdir=./dist/lib/workers --platform=node --loader:.node=file --external:@napi-rs/canvas --external:@prisma/robochimp --external:@prisma/client --external:zlib-sync --external:bufferutil --external:oldschooljs --external:discord.js --external:node-fetch --external:piscina"
 	},
 	"dependencies": {
 		"@napi-rs/canvas": "^0.1.53",

diff --git a/tests/integration/grandExchange.test.ts b/tests/integration/grandExchange.test.ts
@@ -13,10 +13,10 @@ import { cancelUsersListings } from '../../src/mahoji/lib/abstracted_commands/ca
 import type { TestUser } from './util';
 import { createTestUser, mockClient } from './util';
 
-const TICKS_TO_RUN = 100;
-const AMOUNT_USERS = 25;
+const TICKS_TO_RUN = 50;
+const AMOUNT_USERS = 20;
 const COMMANDS_PER_USER = 3;
-const TICKS_PER_EXTENSIVE_VERIFICATION = 100;
+const TICKS_PER_EXTENSIVE_VERIFICATION = 20;
 const itemPool = resolveItems(['Egg', 'Trout', 'Coal']);
 
 console.log(`G.E test will make ${itemPool.length * COMMANDS_PER_USER * AMOUNT_USERS} listings.`);

diff --git a/tests/integration/paymentConflict.test.ts b/tests/integration/paymentConflict.test.ts
@@ -7,8 +7,8 @@ import type { TestUser } from './util';
 import { createTestUser, mockClient } from './util';
 
 describe('Payment conflicts', async () => {
-	const payerCount = 50;
-	const iterations = 100;
+	const payerCount = 20;
+	const iterations = 20;
 	const addChance = 3;
 	const repeats = 1;