Skip to content

Commit

Permalink
chore: cleanup koralabs instances from the code
Browse files Browse the repository at this point in the history
  • Loading branch information
VanessaPC committed Apr 25, 2024
1 parent fddc92e commit 5f40db8
Show file tree
Hide file tree
Showing 12 changed files with 116 additions and 375 deletions.
1 change: 0 additions & 1 deletion packages/cardano-services-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
},
"devDependencies": {
"@cardano-sdk/util-dev": "workspace:~",
"@koralabs/handles-public-api-interfaces": "2.4.3",
"@types/validator": "^13.7.1",
"axios-mock-adapter": "^1.20.0",
"eslint": "^7.32.0",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from './KoraLabsHandleProvider';
export * from './handleHttpProvider';

This file was deleted.

85 changes: 42 additions & 43 deletions packages/cardano-services-client/test/util.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Asset, Cardano, ProviderError, ProviderFailure } from '@cardano-sdk/core';
import { AxiosError, AxiosResponse } from 'axios';
import { IHandle, Rarity } from '@koralabs/handles-public-api-interfaces';
import { logger } from '@cardano-sdk/util-dev';
import { toSerializableObject } from '@cardano-sdk/util';

Expand Down Expand Up @@ -62,46 +61,46 @@ export const getBobHandleProviderResponse = {
profilePic: Asset.Uri('ipfs://zrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3yd1')
};

export const getAliceHandleAPIResponse: Partial<IHandle> = {
characters: 'rljm7n/23455',
created_slot_number: 33,
default_in_wallet: 'alice_default_hndle',
has_datum: false,
hex: '0f3abbc8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe0e78f19d9d5',
holder: 'stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw',
image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasd',
length: 123,
name: 'alice',
numeric_modifiers: '-12.9',
og_number: 5,
rarity: Rarity.rare,
resolved_addresses: {
ada: 'addr_test1qqk4sr4f7vtqzd2w90d5nfu3n59jhhpawyphnek2y7er02nkrezryq3ydtmkg0e7e2jvzg443h0ffzfwd09wpcxy2fuqmcnecd'
},
standard_image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasdfasd',
updated_slot_number: 22,
utxo: 'rljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0'
};
// export const getAliceHandleAPIResponse: Partial<IHandle> = {
// characters: 'rljm7n/23455',
// created_slot_number: 33,
// default_in_wallet: 'alice_default_hndle',
// has_datum: false,
// hex: '0f3abbc8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe0e78f19d9d5',
// holder: 'stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw',
// image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasd',
// length: 123,
// name: 'alice',
// numeric_modifiers: '-12.9',
// og_number: 5,
// rarity: Rarity.rare,
// resolved_addresses: {
// ada: 'addr_test1qqk4sr4f7vtqzd2w90d5nfu3n59jhhpawyphnek2y7er02nkrezryq3ydtmkg0e7e2jvzg443h0ffzfwd09wpcxy2fuqmcnecd'
// },
// standard_image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasdfasd',
// updated_slot_number: 22,
// utxo: 'rljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0'
// };

export const getBobHandleAPIResponse: Partial<IHandle> = {
bg_image: 'ipfs://zrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3yd',
characters: 'rljm7n/23455',
created_slot_number: 33,
default_in_wallet: 'bob_default_handle',
has_datum: false,
hex: '0f3abbc8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe0e78f19d9d5',
holder: 'stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw',
image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe',
length: 123,
name: 'bob',
numeric_modifiers: '-12.9',
og_number: 5,
pfp_image: 'ipfs://zrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3yd1',
rarity: Rarity.rare,
resolved_addresses: {
ada: 'addr_test1qzrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0e7e2jvzg443h0ffzfwd09wpcxy2fuql9tk0g'
},
standard_image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasdfasd',
updated_slot_number: 22,
utxo: 'rljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0'
};
// export const getBobHandleAPIResponse: Partial<IHandle> = {
// bg_image: 'ipfs://zrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3yd',
// characters: 'rljm7n/23455',
// created_slot_number: 33,
// default_in_wallet: 'bob_default_handle',
// has_datum: false,
// hex: '0f3abbc8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe0e78f19d9d5',
// holder: 'stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw',
// image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56fe',
// length: 123,
// name: 'bob',
// numeric_modifiers: '-12.9',
// og_number: 5,
// pfp_image: 'ipfs://zrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3yd1',
// rarity: Rarity.rare,
// resolved_addresses: {
// ada: 'addr_test1qzrljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0e7e2jvzg443h0ffzfwd09wpcxy2fuql9tk0g'
// },
// standard_image: 'ipfs://c8fc19c2e61bab6059bf8a466e6e754833a08a62a6c56feasdfasd',
// updated_slot_number: 22,
// utxo: 'rljm7nskakjydxlr450ktsj08zuw6aktvgfkmmyw9semrkrezryq3ydtmkg0'
// };
23 changes: 6 additions & 17 deletions packages/cardano-services/src/Program/programs/providerServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { HandleHttpService, TypeOrmHandleProvider } from '../../Handle';
import { HandlePolicyIdsOptionDescriptions, handlePolicyIdsFromFile } from '../options/policyIds';
import { HttpServer, HttpServerConfig, HttpService, getListen } from '../../Http';
import { InMemoryCache, NoCache } from '../../InMemoryCache';
import { KoraLabsHandleProvider, TxSubmitApiProvider } from '@cardano-sdk/cardano-services-client';
import { TxSubmitApiProvider } from '@cardano-sdk/cardano-services-client';
import { Logger } from 'ts-log';
import { MissingProgramOption, MissingServiceDependency, RunnableDependencies, UnknownServiceName } from '../errors';
import { Observable } from 'rxjs';
Expand Down Expand Up @@ -169,22 +169,11 @@ const serviceMapFactory = (options: ServiceMapFactoryOptions) => {
if (!args.handlePolicyIds)
throw new MissingProgramOption(ServiceNames.Handle, HandlePolicyIdsOptionDescriptions.HandlePolicyIds);

if (args.useKoraLabs) {
if (!args.handleProviderServerUrl)
throw new MissingProgramOption(ServiceNames.Handle, ProviderServerOptionDescriptions.HandleProviderServerUrl);

// Cardano.PolicyId('f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a')
sharedHandleProvider = new KoraLabsHandleProvider({
policyId: args.handlePolicyIds[0],
serverUrl: args.handleProviderServerUrl
});
} else {
sharedHandleProvider = await withTypeOrmProvider(
'Handle',
async (connectionConfig$) =>
new TypeOrmHandleProvider({ connectionConfig$, entities: getEntities(['handle', 'handleMetadata']), logger })
)();
}
sharedHandleProvider = await withTypeOrmProvider(
'Handle',
async (connectionConfig$) =>
new TypeOrmHandleProvider({ connectionConfig$, entities: getEntities(['handle', 'handleMetadata']), logger })
)();

return sharedHandleProvider;
};
Expand Down
8 changes: 0 additions & 8 deletions packages/cardano-services/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,6 @@ addOptions(withOgmiosOptions(withHandlePolicyIdsOptions(providerServerWithCommon
stringOptionToBoolean(useBlockfrost, Programs.ProviderServer, ProviderServerOptionDescriptions.UseBlockfrost),
USE_BLOCKFROST_DEFAULT
),
newOption(
'--use-kora-labs <true/false>',
ProviderServerOptionDescriptions.UseKoraLabsProvider,
'USE_KORA_LABS',
(useKoraLabs) =>
stringOptionToBoolean(useKoraLabs, Programs.ProviderServer, ProviderServerOptionDescriptions.UseKoraLabsProvider),
false
),
newOption(
'--use-submit-api <true/false>',
ProviderServerOptionDescriptions.UseSubmitApi,
Expand Down
12 changes: 1 addition & 11 deletions packages/cardano-services/test/Program/services/ogmios.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
getPool
} from '../../../src';
import { InMemoryCache, UNLIMITED_CACHE_TTL } from '../../../src/InMemoryCache';
import { KoraLabsHandleProvider } from '@cardano-sdk/cardano-services-client';
import { Ogmios, OgmiosCardanoNode, OgmiosTxSubmitProvider } from '@cardano-sdk/ogmios';
import { Pool } from 'pg';
import { SrvRecord } from 'dns';
Expand All @@ -36,18 +35,9 @@ import axios from 'axios';
import http from 'http';

jest.mock('@cardano-sdk/cardano-services-client', () => ({
...jest.requireActual('@cardano-sdk/cardano-services-client'),
KoraLabsHandleProvider: jest.fn().mockImplementation(() => ({
healthCheck: jest.fn(),
resolveHandles: jest.fn().mockResolvedValue([handleProviderMocks.getAliceHandleProviderResponse])
}))
...jest.requireActual('@cardano-sdk/cardano-services-client')
}));

const handleProvider = new KoraLabsHandleProvider({
policyId: Cardano.PolicyId('50fdcdbfa3154db86a87e4b5697ae30d272e0bbcfa8122efd3e301cb'),
serverUrl: 'https://localhost:3000'
});

jest.mock('dns', () => ({
promises: {
resolveSrv: async (serviceName: string): Promise<SrvRecord[]> => {
Expand Down

0 comments on commit 5f40db8

Please sign in to comment.