Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Recording Oracle] Download exchange solutions and compare with the already uploaded #977

Merged
merged 5 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/apps/fortune/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"recording-oracle:dev": "cd recording-oracle && yarn start:dev",
"recording-oracle:lint": "cd recording-oracle && yarn lint",
"recording-oracle:test": "cd recording-oracle && yarn test",
"minio": "docker compose up -d minio-mc",
"postgres": "docker compose up -d postgres",
"docker": "docker compose up -d",
"local": "docker compose down && (concurrently --hide 0 \"yarn docker\" \"yarn recording-oracle:dev\" )",
"lint": "concurrently npm:recording-oracle:lint",
"lint:fix": "concurrently npm:recording-oracle:lint:fix",
"pretest": "yarn workspace @human-protocol/sdk build",
Expand Down
3 changes: 2 additions & 1 deletion packages/apps/fortune/recording-oracle/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"rules": {
"@typescript-eslint/explicit-module-boundary-types": "off"
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-explicit-any": "off"
}
}
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
version: '3.7'

services:
postgres:
image: postgres:latest
restart: always
environment:
- POSTGRES_USER=fortune
- POSTGRES_PASSWORD=fortune
- POSTGRES_DB=hmt-job-launcher
logging:
options:
max-size: 10m
max-file: "3"
ports:
- '5432:5432'
volumes:
- ./db:/var/lib/postgresql/data
minio:
container_name: minio
image: minio/minio:RELEASE.2022-05-26T05-48-41Z
Expand Down
5 changes: 4 additions & 1 deletion packages/apps/fortune/recording-oracle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"test": "jest",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:e2e": "jest --config ./test/jest-e2e.json"
"test:e2e": "jest --config ./test/jest-e2e.json",
"postgres": "docker compose up -d postgres",
"docker": "docker compose up -d",
"local": "docker compose down && (concurrently --hide 0 \"yarn docker\" \"yarn recording-oracle:dev\" )"
},
"dependencies": {
"@human-protocol/sdk": "*",
Expand Down
5 changes: 2 additions & 3 deletions packages/apps/fortune/recording-oracle/src/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { Controller, Get } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { Controller, Get, Redirect } from '@nestjs/common';

import { Public } from '@/common/decorators';

@Controller('/')
export class AppController {
@Public()
@Get('/')
@ApiTags('Health Check')
@Redirect('/swagger', 301)
public health(): string {
return 'OK';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const s3Config = registerAs('s3', () => ({
port: +process.env.S3_PORT!,
accessKey: process.env.S3_ACCESS_KEY!,
secretKey: process.env.S3_SECRET_KEY!,
bucket: process.env.S3_BACKET!,
bucket: process.env.S3_BUCKET!,
useSSL: process.env.S3_USE_SSL === 'true',
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const ConfigNames = {
S3_PORT: 'S3_PORT',
S3_ACCESS_KEY: 'S3_ACCESS_KEY',
S3_SECRET_KEY: 'S3_SECRET_KEY',
S3_BACKET: 'S3_BACKET',
S3_BUCKET: 'S3_BUCKET',
S3_USE_SSL: 'S3_USE_SSL',
};

Expand All @@ -31,6 +31,6 @@ export const envValidator = Joi.object({
S3_PORT: Joi.string().default(9000),
S3_ACCESS_KEY: Joi.string().required(),
S3_SECRET_KEY: Joi.string().required(),
S3_BACKET: Joi.string().default('solution'),
S3_BUCKET: Joi.string().default('solution'),
S3_USE_SSL: Joi.string().default(false),
});
Loading