Skip to content

Commit c16489d

Browse files
Merge pull request #1336 from input-output-hk/chore/tmp-lower-chain-history-version
chore(cardano-services-client): LW-10778 allow openapiVersion override when configuring client providers
2 parents 53b8e86 + 89f5ff4 commit c16489d

File tree

10 files changed

+23
-9
lines changed

10 files changed

+23
-9
lines changed

packages/cardano-services-client/src/AssetInfoProvider/assetInfoHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const paths: HttpProviderConfigPaths<AssetProvider> = {
1717
export const assetInfoHttpProvider = (config: CreateHttpProviderConfig<AssetProvider>): AssetProvider =>
1818
createHttpProvider<AssetProvider>({
1919
...config,
20-
apiVersion: apiVersion.assetInfo,
20+
apiVersion: config.apiVersion || apiVersion.assetInfo,
2121
paths,
2222
serviceSlug: 'asset'
2323
});

packages/cardano-services-client/src/ChainHistoryProvider/chainHistoryHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const chainHistoryHttpProvider = (
2121
): ChainHistoryProvider =>
2222
createHttpProvider<ChainHistoryProvider>({
2323
...config,
24-
apiVersion: apiVersion.chainHistory,
24+
apiVersion: config.apiVersion || apiVersion.chainHistory,
2525
mapError: (error, method) => {
2626
if (method === 'healthCheck' && !error) {
2727
return { ok: false };

packages/cardano-services-client/src/HandleProvider/handleHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { apiVersion } from '../version';
1010
export const handleHttpProvider = (config: CreateHttpProviderConfig<HandleProvider>): HandleProvider =>
1111
createHttpProvider<HandleProvider>({
1212
...config,
13-
apiVersion: apiVersion.handle,
13+
apiVersion: config.apiVersion || apiVersion.handle,
1414
paths: handleProviderPaths,
1515
serviceSlug: 'handle'
1616
});

packages/cardano-services-client/src/HttpProvider.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ export interface HttpProviderConfig<T extends Provider> {
4545
export type CreateHttpProviderConfig<T extends Provider> = Pick<
4646
HttpProviderConfig<T>,
4747
'baseUrl' | 'adapter' | 'logger'
48-
>;
48+
> & {
49+
/** Override the OpenApi version */
50+
apiVersion?: string;
51+
};
4952

5053
/**
5154
* Creates a HTTP client for specified provider type, following some conventions:

packages/cardano-services-client/src/NetworkInfoProvider/networkInfoHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const paths: HttpProviderConfigPaths<NetworkInfoProvider> = {
2121
export const networkInfoHttpProvider = (config: CreateHttpProviderConfig<NetworkInfoProvider>): NetworkInfoProvider =>
2222
createHttpProvider<NetworkInfoProvider>({
2323
...config,
24-
apiVersion: apiVersion.networkInfo,
24+
apiVersion: config.apiVersion || apiVersion.networkInfo,
2525
paths,
2626
serviceSlug: 'network-info'
2727
});

packages/cardano-services-client/src/RewardsProvider/rewardsHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const paths: HttpProviderConfigPaths<RewardsProvider> = {
1818
export const rewardsHttpProvider = (config: CreateHttpProviderConfig<RewardsProvider>): RewardsProvider =>
1919
createHttpProvider<RewardsProvider>({
2020
...config,
21-
apiVersion: apiVersion.rewards,
21+
apiVersion: config.apiVersion || apiVersion.rewards,
2222
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2323
mapError: (error: any, method) => {
2424
if (method === 'healthCheck') {

packages/cardano-services-client/src/StakePoolProvider/stakePoolHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const paths: HttpProviderConfigPaths<StakePoolProvider> = {
1717
export const stakePoolHttpProvider = (config: CreateHttpProviderConfig<StakePoolProvider>): StakePoolProvider =>
1818
createHttpProvider<StakePoolProvider>({
1919
...config,
20-
apiVersion: apiVersion.stakePool,
20+
apiVersion: config.apiVersion || apiVersion.stakePool,
2121
paths,
2222
serviceSlug: 'stake-pool'
2323
});

packages/cardano-services-client/src/TxSubmitProvider/txSubmitHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const codeToProviderFailure = (code: GeneralCardanoNodeErrorCode | TxSubmissionE
7070
export const txSubmitHttpProvider = (config: CreateHttpProviderConfig<TxSubmitProvider>): TxSubmitProvider =>
7171
createHttpProvider<TxSubmitProvider>({
7272
...config,
73-
apiVersion: apiVersion.txSubmit,
73+
apiVersion: config.apiVersion || apiVersion.txSubmit,
7474
mapError: (error: any, method) => {
7575
switch (method) {
7676
case 'healthCheck': {

packages/cardano-services-client/src/UtxoProvider/utxoHttpProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const paths: HttpProviderConfigPaths<UtxoProvider> = {
1717
export const utxoHttpProvider = (config: CreateHttpProviderConfig<UtxoProvider>): UtxoProvider =>
1818
createHttpProvider<UtxoProvider>({
1919
...config,
20-
apiVersion: apiVersion.utxo,
20+
apiVersion: config.apiVersion || apiVersion.utxo,
2121
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2222
mapError: (error: any, method) => {
2323
if (method === 'healthCheck') {

packages/cardano-services-client/test/ChainHistoryProvider/chainHistoryProvider.test.ts

+11
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ describe('chainHistoryProvider', () => {
3737
const provider = chainHistoryHttpProvider(config);
3838
await expect(provider.healthCheck()).resolves.toEqual({ ok: false });
3939
});
40+
41+
it('uses custom apiVersion', async () => {
42+
axiosMock.onPost().replyOnce(200, { ok: true });
43+
const provider = chainHistoryHttpProvider({ ...config, adapter: axiosMock.adapter(), apiVersion: '100' });
44+
await provider.healthCheck();
45+
expect(axiosMock.history).toEqual(
46+
expect.objectContaining({
47+
post: [expect.objectContaining({ baseURL: `${config.baseUrl}/v100/chain-history` })]
48+
})
49+
);
50+
});
4051
});
4152

4253
describe('blocks', () => {

0 commit comments

Comments
 (0)