Skip to content

Commit bc70ff7

Browse files
authored
fix: remove POOL_CACHE_BUCKET_2 from env var (Uniswap#749)
* fix: remove POOL_CACHE_BUCKET_2 from env var * fix prettier
1 parent 6445fd7 commit bc70ff7

File tree

4 files changed

+3
-36
lines changed

4 files changed

+3
-36
lines changed

bin/stacks/routing-caching-stack.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ export class RoutingCachingStack extends cdk.NestedStack {
130130
tracing: aws_lambda.Tracing.ACTIVE,
131131
environment: {
132132
POOL_CACHE_BUCKET: this.poolCacheBucket.bucketName,
133-
POOL_CACHE_BUCKET_2: this.poolCacheBucket2.bucketName,
134133
POOL_CACHE_BUCKET_3: this.poolCacheBucket3.bucketName,
135-
POOL_CACHE_KEY: this.poolCacheKey,
136134
POOL_CACHE_GZIP_KEY: this.poolCacheGzipKey,
137135
ALCHEMY_QUERY_KEY: this.alchemyQueryKey ?? '',
138136
DCN_API_KEY: this.decentralizedNetworkApiKey ?? '',

bin/stacks/routing-lambda-stack.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export class RoutingLambdaStack extends cdk.NestedStack {
4949
poolCacheBucket,
5050
poolCacheBucket2,
5151
poolCacheBucket3,
52-
poolCacheKey,
5352
poolCacheGzipKey,
5453
jsonRpcProviders,
5554
tokenListCacheBucket,
@@ -122,9 +121,7 @@ export class RoutingLambdaStack extends cdk.NestedStack {
122121
VERSION: '26',
123122
NODE_OPTIONS: '--enable-source-maps',
124123
POOL_CACHE_BUCKET: poolCacheBucket.bucketName,
125-
POOL_CACHE_BUCKET_2: poolCacheBucket2.bucketName,
126124
POOL_CACHE_BUCKET_3: poolCacheBucket3.bucketName,
127-
POOL_CACHE_KEY: poolCacheKey,
128125
POOL_CACHE_GZIP_KEY: poolCacheGzipKey,
129126
TOKEN_LIST_CACHE_BUCKET: tokenListCacheBucket.bucketName,
130127
ETH_GAS_STATION_INFO_URL: ethGasStationInfoUrl,

lib/cron/cache-pools.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ const handler: ScheduledHandler = metricScope((metrics) => async (event: EventBr
129129

130130
log.info({ result }, `Done ${protocol} for ${chainId.toString()}`)
131131

132-
log.info(
133-
`Successfully cached ${chainId} ${protocol} pools to S3 bucket ${process.env.POOL_CACHE_BUCKET_2} ${process.env.POOL_CACHE_BUCKET_3}`
134-
)
132+
log.info(`Successfully cached ${chainId} ${protocol} pools to S3 bucket ${process.env.POOL_CACHE_BUCKET_3}`)
135133
metric.putMetric(`${metricPrefix}.latency`, Date.now() - beforeAll)
136134

137135
log.info(

lib/handlers/injector-sor.ts

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ export abstract class InjectorSOR<Router, QueryParams> extends Injector<
147147

148148
try {
149149
const {
150-
POOL_CACHE_BUCKET_2,
151150
POOL_CACHE_BUCKET_3,
152-
POOL_CACHE_KEY,
153151
POOL_CACHE_GZIP_KEY,
154152
TOKEN_LIST_CACHE_BUCKET,
155153
ROUTES_TABLE_NAME,
@@ -265,19 +263,7 @@ export abstract class InjectorSOR<Router, QueryParams> extends Injector<
265263
throw new Error(`Chain protocol not found for chain ${chainId} and protocol ${Protocol.V3}`)
266264
}
267265

268-
const subgraphProvider = await V3AWSSubgraphProvider.EagerBuild(
269-
POOL_CACHE_BUCKET_3!,
270-
POOL_CACHE_GZIP_KEY!,
271-
chainId
272-
).catch(async (err) => {
273-
log.error(
274-
{ err },
275-
'compressed s3 subgraph pool caching unavailable, fall back to the existing s3 subgraph pool caching'
276-
)
277-
278-
return await V3AWSSubgraphProvider.EagerBuild(POOL_CACHE_BUCKET_2!, POOL_CACHE_KEY!, chainId)
279-
})
280-
return subgraphProvider
266+
return await V3AWSSubgraphProvider.EagerBuild(POOL_CACHE_BUCKET_3!, POOL_CACHE_GZIP_KEY!, chainId)
281267
} catch (err) {
282268
log.error({ err }, 'AWS Subgraph Provider unavailable, defaulting to Static Subgraph Provider')
283269
return new StaticV3SubgraphProvider(chainId, v3PoolProvider)
@@ -293,19 +279,7 @@ export abstract class InjectorSOR<Router, QueryParams> extends Injector<
293279
throw new Error(`Chain protocol not found for chain ${chainId} and protocol ${Protocol.V2}`)
294280
}
295281

296-
const subgraphProvider = await V2AWSSubgraphProvider.EagerBuild(
297-
POOL_CACHE_BUCKET_3!,
298-
POOL_CACHE_GZIP_KEY!,
299-
chainId
300-
).catch(async (err) => {
301-
log.error(
302-
{ err },
303-
'compressed s3 subgraph pool caching unavailable, fall back to the existing s3 subgraph pool caching'
304-
)
305-
306-
return await V2AWSSubgraphProvider.EagerBuild(POOL_CACHE_BUCKET_2!, POOL_CACHE_KEY!, chainId)
307-
})
308-
return subgraphProvider
282+
return await V2AWSSubgraphProvider.EagerBuild(POOL_CACHE_BUCKET_3!, POOL_CACHE_GZIP_KEY!, chainId)
309283
} catch (err) {
310284
return new StaticV2SubgraphProvider(chainId)
311285
}

0 commit comments

Comments
 (0)