change chaindefinition type name

packages/currency/src/chains/btc/index.ts

@@ -1,5 +1,5 @@
 import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types';
-import { BtcChainDefinition } from '../../types';
+import { Chain } from '../../types';
 import {
   addNativeCurrenciesToChains,
   genericAssertChainSupported,
@@ -10,7 +10,11 @@ import {
 import * as MainnetDefinition from './mainnet';
 import * as TestnetDefinition from './testnet';
 
-export const chains: Record<CurrencyTypes.BtcChainName, BtcChainDefinition> = {
+type BtcChain = Chain & {
+  chainId: string;
+};
+
+export const chains: Record<CurrencyTypes.BtcChainName, BtcChain> = {
   mainnet: MainnetDefinition,
   testnet: TestnetDefinition,
 };
@@ -29,15 +33,12 @@ export const assertChainSupported =
 /**
  * Get the BTC chain ID from the chain name
  */
-export const getChainId = genericGetChainId<CurrencyTypes.BtcChainName, BtcChainDefinition, string>(
-  chains,
-);
+export const getChainId = genericGetChainId<CurrencyTypes.BtcChainName, BtcChain, string>(chains);
 
 /**
  * Get the BTC chain name from its ID
  */
-export const getChainName = genericGetChainName<
-  CurrencyTypes.BtcChainName,
-  BtcChainDefinition,
-  string
->(chains, chainNames);
+export const getChainName = genericGetChainName<CurrencyTypes.BtcChainName, BtcChain, string>(
+  chains,
+  chainNames,
+);

packages/currency/src/chains/evm/index.ts

@@ -1,5 +1,5 @@
 import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types';
-import { EvmChainDefinition } from '../../types';
+import { Chain } from '../../types';
 import {
   addNativeCurrenciesToChains,
   genericAssertChainSupported,
@@ -29,7 +29,11 @@ import * as SokolDefinition from './sokol';
 import * as TombchainDefinition from './tombchain';
 import * as XDaiDefinition from './xdai';
 
-export const chains: Record<CurrencyTypes.EvmChainName, EvmChainDefinition> = {
+type EvmChain = Chain & {
+  chainId: number;
+};
+
+export const chains: Record<CurrencyTypes.EvmChainName, EvmChain> = {
   alfajores: AlfajoresDefinition,
   'arbitrum-one': ArbitrumOneDefinition,
   'arbitrum-rinkeby': ArbitrumRinkebyDefinition,
@@ -67,15 +71,12 @@ export const assertChainSupported =
 /**
  * Get the EVM chain ID from the chain name
  */
-export const getChainId = genericGetChainId<CurrencyTypes.EvmChainName, EvmChainDefinition, number>(
-  chains,
-);
+export const getChainId = genericGetChainId<CurrencyTypes.EvmChainName, EvmChain, number>(chains);
 
 /**
  * Get the EVM chain name from its ID
  */
-export const getChainName = genericGetChainName<
-  CurrencyTypes.EvmChainName,
-  EvmChainDefinition,
-  number
->(chains, chainNames);
+export const getChainName = genericGetChainName<CurrencyTypes.EvmChainName, EvmChain, number>(
+  chains,
+  chainNames,
+);

packages/currency/src/chains/near/index.ts

@@ -1,5 +1,5 @@
 import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types';
-import { NearChainDefinition } from '../../types';
+import { Chain } from '../../types';
 import {
   addNativeCurrenciesToChains,
   genericAssertChainSupported,
@@ -10,7 +10,9 @@ import {
 import * as NearDefinition from './near';
 import * as NearTestnetDefinition from './near-testnet';
 
-export const chains: Record<CurrencyTypes.NearChainName, NearChainDefinition> = {
+type NearChain = Chain;
+
+export const chains: Record<CurrencyTypes.NearChainName, NearChain> = {
   aurora: NearDefinition, // FIXME: aurora should be removed from near chains (it is a mistake)
   'aurora-testnet': NearTestnetDefinition, // FIXME: aurora should be removed from near chains (it is a mistake)
   near: NearDefinition,
@@ -31,17 +33,12 @@ export const assertChainSupported =
 /**
  * Get the NEAR chain ID from the chain name
  */
-export const getChainId = genericGetChainId<
-  CurrencyTypes.NearChainName,
-  NearChainDefinition,
-  string
->(chains);
+export const getChainId = genericGetChainId<CurrencyTypes.NearChainName, NearChain, string>(chains);
 
 /**
  * Get the NEAR chain name from its ID
  */
-export const getChainName = genericGetChainName<
-  CurrencyTypes.NearChainName,
-  NearChainDefinition,
-  string
->(chains, chainNames);
+export const getChainName = genericGetChainName<CurrencyTypes.NearChainName, NearChain, string>(
+  chains,
+  chainNames,
+);

packages/currency/src/chains/utils.ts

@@ -1,5 +1,5 @@
 import { nativeCurrencies } from '../native';
-import { ChainDefinition, NamedNativeCurrency, TokenMap } from '../types';
+import { Chain, NamedNativeCurrency, TokenMap } from '../types';
 import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types';
 
 export const genericAssertChainSupported = <T extends string>(chainNames: T[]) => {
@@ -10,7 +10,7 @@ export const genericAssertChainSupported = <T extends string>(chainNames: T[]) =
 };
 
 export const addNativeCurrenciesToChains = (
-  chains: Record<string, ChainDefinition>,
+  chains: Record<string, Chain>,
   currencyType: RequestLogicTypes.CURRENCY.ETH | RequestLogicTypes.CURRENCY.BTC,
 ): void => {
   const chainNames = Object.keys(chains);
@@ -27,14 +27,14 @@ export const addNativeCurrenciesToChains = (
 };
 
 export const genericGetChainId =
-  <T extends CurrencyTypes.ChainName, D extends ChainDefinition, S extends string | number>(
+  <T extends CurrencyTypes.ChainName, D extends Chain, S extends string | number>(
     chains: Record<T, D>,
   ) =>
   (chainName: T): S =>
     chains[chainName].chainId as S;
 
 export const genericGetChainName =
-  <T extends CurrencyTypes.ChainName, D extends ChainDefinition, S extends string | number>(
+  <T extends CurrencyTypes.ChainName, D extends Chain, S extends string | number>(
     chains: Record<T, D>,
     chainNames: T[],
   ) =>

packages/currency/src/types.ts

@@ -6,19 +6,14 @@ import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types';
 type TokenAddress = string;
 type TokenDefinition = { name: string; symbol: string; decimals: number };
 export type TokenMap = Record<TokenAddress, TokenDefinition>;
-export type ChainDefinition = {
+
+/**
+ * Common types used in chain configuration files
+ */
+export type Chain = {
   chainId: number | string;
   currencies?: TokenMap;
 };
-export type EvmChainDefinition = ChainDefinition & {
-  chainId: number;
-};
-export type BtcChainDefinition = ChainDefinition & {
-  chainId: string;
-};
-export type NearChainDefinition = ChainDefinition;
-
-type NamedCurrency = { name: string };
 
 /**
  * A native blockchain token (ETH, MATIC, ETH-rinkeby...)
@@ -28,6 +23,7 @@ export type NativeCurrency = {
   decimals: number;
   network: CurrencyTypes.ChainName;
 };
+type NamedCurrency = { name: string };
 export type NamedNativeCurrency = NativeCurrency & NamedCurrency;
 
 /** Native Currency types */