Skip to content

Commit

Permalink
chore: solve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ashuralyk committed Jan 28, 2025
1 parent 2f59169 commit 46b3930
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion libs/asset/src/asset.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ccc } from "@ckb-ccc/shell";
import { cccA } from "@ckb-ccc/shell/advanced";
import { Inject, Injectable } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import axios, { AxiosInstance } from "axios";
import { AxiosInstance } from "axios";
import { ClusterRepo, SporeRepo, UdtInfoRepo } from "./repos";

@Injectable()
Expand Down
6 changes: 1 addition & 5 deletions libs/cell/src/cell.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { ccc } from "@ckb-ccc/shell";
import { Inject, Injectable } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import axios, { AxiosInstance } from "axios";
import { AxiosInstance } from "axios";
import { UdtInfoRepo } from "./repos";

@Injectable()
Expand All @@ -20,7 +20,6 @@ export class CellService {
private readonly rgbppBtcHashType: ccc.HashType;
private readonly rgbppBtcTimelockCodeHash: ccc.Hex;
private readonly rgbppBtcTimelockHashType: ccc.HashType;
private readonly btcRequesters: AxiosInstance[];
private readonly udtTypes: {
codeHash: ccc.HexLike;
hashType: ccc.HashTypeLike;
Expand Down Expand Up @@ -51,9 +50,6 @@ export class CellService {
assertConfig(configService, "sync.rgbppBtcTimelockHashType"),
);

const btcRpcUris = assertConfig<string[]>(configService, "sync.btcRpcUris");
this.btcRequesters = btcRpcUris.map((baseURL) => axios.create({ baseURL }));

const udtTypes =
configService.get<
{ codeHash: ccc.HexLike; hashType: ccc.HashTypeLike }[]
Expand Down
2 changes: 1 addition & 1 deletion libs/spore/src/spore.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Cluster, Spore } from "@app/schemas";
import { ccc } from "@ckb-ccc/shell";
import { Inject, Injectable, Logger } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import axios, { AxiosInstance } from "axios";
import { AxiosInstance } from "axios";
import { ClusterRepo, SporeRepo } from "./repos";

@Injectable()
Expand Down

0 comments on commit 46b3930

Please sign in to comment.