diff --git a/apps/swap/src/swap.module.ts b/apps/swap/src/swap.module.ts index 60ea03c..40e36ac 100644 --- a/apps/swap/src/swap.module.ts +++ b/apps/swap/src/swap.module.ts @@ -5,13 +5,12 @@ import { HttpModule } from '@nestjs/axios'; import { ConfigModule, ConfigService } from '@nestjs/config'; import { EventEmitterModule } from '@nestjs/event-emitter'; import { CacheModule } from '@nestjs/cache-manager'; -import { CustomStore, DatabaseModule, LoggerModule } from '@bitsacco/common'; +import { CustomStore, DatabaseModule, FedimintService, LoggerModule } from '@bitsacco/common'; import { SwapController } from './swap.controller'; import { SwapService } from './swap.service'; import { FxService } from './fx/fx.service'; import { IntasendService } from './intasend/intasend.service'; import { EventsController } from './events.controller'; -import { FedimintService } from './fedimint/fedimint.service'; import { MpesaOfframpSwapRepository, MpesaOfframpSwapDocument, diff --git a/apps/swap/src/swap.service.spec.ts b/apps/swap/src/swap.service.spec.ts index 182d5f3..30b86ff 100644 --- a/apps/swap/src/swap.service.spec.ts +++ b/apps/swap/src/swap.service.spec.ts @@ -4,16 +4,16 @@ import { Currency, DatabaseModule, fiatToBtc, + FedimintService, TransactionStatus, } from '@bitsacco/common'; -import { createTestingModuleWithValidation } from '@bitsacco/testing'; import { TestingModule } from '@nestjs/testing'; +import { createTestingModuleWithValidation } from '@bitsacco/testing'; import { EventEmitter2, EventEmitterModule } from '@nestjs/event-emitter'; import { FxService } from './fx/fx.service'; import { SwapService } from './swap.service'; import { IntasendService } from './intasend/intasend.service'; import { MpesaTransactionState } from './intasend/intasend.types'; -import { FedimintService } from './fedimint/fedimint.service'; import { MpesaCollectionUpdateDto } from './dto'; import { MpesaOfframpSwapRepository, diff --git a/apps/swap/src/swap.service.ts b/apps/swap/src/swap.service.ts index 99f2b40..f672c26 100644 --- a/apps/swap/src/swap.service.ts +++ b/apps/swap/src/swap.service.ts @@ -13,8 +13,11 @@ import { ReceiveContext, type ReceivePaymentFailureEvent, type ReceivePaymentSuccessEvent, - fiatToBtc, btcToFiat, + fiatToBtc, + fedimint_receive_success, + fedimint_receive_failure, + FedimintService, SupportedCurrencyType, PaginatedRequestDto, } from '@bitsacco/common'; @@ -25,7 +28,6 @@ import { Inject, Injectable, Logger } from '@nestjs/common'; import { IntasendService } from './intasend/intasend.service'; import { MpesaCollectionUpdateDto, MpesaPaymentUpdateDto } from './dto'; import { MpesaTransactionState } from './intasend/intasend.types'; -import { FedimintService } from './fedimint/fedimint.service'; import { FxService } from './fx/fx.service'; import { MpesaOnrampSwapDocument, @@ -33,10 +35,6 @@ import { MpesaOfframpSwapRepository, SwapTransactionState, } from '../db'; -import { - fedimint_receive_success, - fedimint_receive_failure, -} from './fedimint/fedimint.const'; import { isMpesaCollectionUpdate } from './dto/utils'; @Injectable() diff --git a/apps/swap/src/fedimint/fedimint.const.ts b/libs/common/src/fedimint/fedimint.const.ts similarity index 100% rename from apps/swap/src/fedimint/fedimint.const.ts rename to libs/common/src/fedimint/fedimint.const.ts diff --git a/apps/swap/src/fedimint/fedimint.service.spec.ts b/libs/common/src/fedimint/fedimint.service.spec.ts similarity index 97% rename from apps/swap/src/fedimint/fedimint.service.spec.ts rename to libs/common/src/fedimint/fedimint.service.spec.ts index f83e12b..7c0408c 100644 --- a/apps/swap/src/fedimint/fedimint.service.spec.ts +++ b/libs/common/src/fedimint/fedimint.service.spec.ts @@ -1,7 +1,7 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { TestingModule } from '@nestjs/testing'; import { createTestingModuleWithValidation } from '@bitsacco/testing'; -import { FedimintService } from './fedimint.service'; import { ConfigModule, ConfigService } from '@nestjs/config'; +import { FedimintService } from './fedimint.service'; describe('FedimintService', () => { let mockCfg: jest.Mocked = { diff --git a/apps/swap/src/fedimint/fedimint.service.ts b/libs/common/src/fedimint/fedimint.service.ts similarity index 100% rename from apps/swap/src/fedimint/fedimint.service.ts rename to libs/common/src/fedimint/fedimint.service.ts diff --git a/libs/common/src/fedimint/index.ts b/libs/common/src/fedimint/index.ts new file mode 100644 index 0000000..35b7845 --- /dev/null +++ b/libs/common/src/fedimint/index.ts @@ -0,0 +1,2 @@ +export * from './fedimint.const'; +export * from './fedimint.service'; diff --git a/libs/common/src/index.ts b/libs/common/src/index.ts index e8b565b..bfea254 100644 --- a/libs/common/src/index.ts +++ b/libs/common/src/index.ts @@ -4,3 +4,4 @@ export * from './utils'; export * from './constants'; export * from './dto'; export * from './database'; +export * from './fedimint';