Skip to content

Commit

Permalink
Prep Distribitor for V2 by renaming to V1
Browse files Browse the repository at this point in the history
  • Loading branch information
youngkidwarrior committed Oct 10, 2024
1 parent f630392 commit 85c2137
Show file tree
Hide file tree
Showing 5 changed files with 502 additions and 10 deletions.
12 changes: 6 additions & 6 deletions apps/distributor/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import express, { type Request, type Response, Router } from 'express'
import pino from 'pino'
import { DistributorWorker } from './distributor'
import { DistributorV1Worker } from './distributor'
import { StandardMerkleTree } from '@openzeppelin/merkle-tree'
import { selectAll } from 'app/utils/supabase/selectAll'
import { supabaseAdmin } from './supabase'
Expand All @@ -11,7 +11,7 @@ const logger = pino({
})

// Initialize DistributorWorker
const distributorWorker = new DistributorWorker(logger)
const distributorV1Worker = new DistributorV1Worker(logger)

// Initialize Express app
const app = express()
Expand All @@ -25,10 +25,10 @@ app.get('/', (req, res) => {

const distributorRouter = Router()

distributorRouter.get('/', async (req: Request, res: Response) => {
distributorRouter.get('/v1', async (req: Request, res: Response) => {
res.json({
distributor: true,
...distributorWorker.toJSON(),
...distributorV1Worker.toJSON(),
})
})

Expand Down Expand Up @@ -97,11 +97,11 @@ distributorRouter.post('/merkle', checkAuthorization, async (req: Request, res:
res.json(result)
})

distributorRouter.post('/', checkAuthorization, async (req, res) => {
distributorRouter.post('/v1', checkAuthorization, async (req, res) => {
const { id } = req.body as { id: string }
logger.info({ id }, 'Received request to calculate distribution')
try {
await distributorWorker.calculateDistribution(id)
await distributorV1Worker.calculateDistribution(id)
} catch (err) {
logger.error(err, 'Error while calculating distribution')
res.status(500).json({
Expand Down
4 changes: 2 additions & 2 deletions apps/distributor/src/distributor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import request from 'supertest'
import app from './app'
import { supabaseAdmin } from './supabase'
import pino from 'pino'
import { DistributorWorker } from './distributor'
import { DistributorV1Worker } from './distributor'
import type { Tables } from '@my/supabase/database.types'

describe('Root Route', () => {
Expand Down Expand Up @@ -210,7 +210,7 @@ describe('Distributor Worker', () => {
const logger = pino({
level: 'silent',
})
const distributor = new DistributorWorker(logger, false)
const distributor = new DistributorV1Worker(logger, false)
await distributor.calculateDistribution('4')

const expectedShares = [
Expand Down
2 changes: 1 addition & 1 deletion apps/distributor/src/distributor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const jsonBigint = (key, value) => {
return value
}

export class DistributorWorker {
export class DistributorV1Worker {
private log: Logger
private running: boolean
private id: string
Expand Down
Loading

0 comments on commit 85c2137

Please sign in to comment.