Skip to content

chore: refactor payment network IDs for enforced typing #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yomarion merged 12 commits into from
Nov 3, 2022
Merged

chore: refactor payment network IDs for enforced typing #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
396ab91
wip
yomarion Nov 1, 2022
c59d483
big replace
yomarion Nov 2, 2022
c8c0574
fix: isPaymentNetworkId
yomarion Nov 3, 2022
7ab0cae
comment
yomarion Nov 3, 2022
f3f4370
Merge remote-tracking branch 'origin/master' into chore/refactor-pn-i…
yomarion Nov 3, 2022
9fd276e
deprecate the IPaymentNetworkCreateParameters interface
yomarion Nov 3, 2022
f61f35e
fix: mistyping in test
yomarion Nov 3, 2022
25f0b7d
fix: http-request-network.test.ts
yomarion Nov 3, 2022
ea7798d
PR comments
yomarion Nov 3, 2022
4ed9c74
fix: declarative-payments.test
yomarion Nov 3, 2022
02f0b28
fix: some request-client tests
yomarion Nov 3, 2022
d0107e5
Merge branch 'master' into chore/refactor-pn-ids-ble
yomarion Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions packages/advanced-logic/src/advanced-logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,30 +106,30 @@ export default class AdvancedLogic implements AdvancedLogicTypes.IAdvancedLogic
const id: ExtensionTypes.ID = extensionAction.id;
const extension: ExtensionTypes.IExtension | undefined = {
[ExtensionTypes.ID.CONTENT_DATA]: this.extensions.contentData,
[ExtensionTypes.ID.PAYMENT_NETWORK_BITCOIN_ADDRESS_BASED]: this.extensions.addressBasedBtc,
[ExtensionTypes.ID.PAYMENT_NETWORK_TESTNET_BITCOIN_ADDRESS_BASED]:
[ExtensionTypes.PAYMENT_NETWORK_ID.BITCOIN_ADDRESS_BASED]: this.extensions.addressBasedBtc,
[ExtensionTypes.PAYMENT_NETWORK_ID.TESTNET_BITCOIN_ADDRESS_BASED]:
this.extensions.addressBasedTestnetBtc,
[ExtensionTypes.ID.PAYMENT_NETWORK_ANY_DECLARATIVE]: this.extensions.declarative,
[ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_ADDRESS_BASED]: this.extensions.addressBasedErc20,
[ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_PROXY_CONTRACT]: this.extensions.proxyContractErc20,
[ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_FEE_PROXY_CONTRACT]:
[ExtensionTypes.PAYMENT_NETWORK_ID.ANY_DECLARATIVE]: this.extensions.declarative,
[ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_ADDRESS_BASED]: this.extensions.addressBasedErc20,
[ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_PROXY_CONTRACT]: this.extensions.proxyContractErc20,
[ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT]:
this.extensions.feeProxyContractErc20,
[ExtensionTypes.ID.PAYMENT_NETWORK_ERC777_STREAM]: this.extensions.erc777Stream,
[ExtensionTypes.ID.PAYMENT_NETWORK_ETH_INPUT_DATA]: this.extensions.ethereumInputData,
[ExtensionTypes.ID.PAYMENT_NETWORK_NATIVE_TOKEN]:
[ExtensionTypes.PAYMENT_NETWORK_ID.ERC777_STREAM]: this.extensions.erc777Stream,
[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_INPUT_DATA]: this.extensions.ethereumInputData,
[ExtensionTypes.PAYMENT_NETWORK_ID.NATIVE_TOKEN]:
this.getNativeTokenExtensionForActionAndState(extensionAction, requestState),
[ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY]: this.extensions.anyToErc20Proxy,
[ExtensionTypes.ID.PAYMENT_NETWORK_ETH_FEE_PROXY_CONTRACT]:
[ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY]: this.extensions.anyToErc20Proxy,
[ExtensionTypes.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT]:
this.extensions.feeProxyContractEth,
[ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY]: this.extensions.anyToEthProxy,
[ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN]:
[ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY]: this.extensions.anyToEthProxy,
[ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN]:
this.getAnyToNativeTokenExtensionForActionAndState(extensionAction, requestState),
}[id];

if (!extension) {
if (
id === ExtensionTypes.ID.PAYMENT_NETWORK_NATIVE_TOKEN ||
id === ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN
id === ExtensionTypes.PAYMENT_NETWORK_ID.NATIVE_TOKEN ||
id === ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN
) {
const network =
this.getNetwork(extensionAction, requestState) || requestState.currency.network;
Expand Down Expand Up @@ -189,7 +189,7 @@ export default class AdvancedLogic implements AdvancedLogicTypes.IAdvancedLogic
const network =
extensionAction.action === 'create'
? extensionAction.parameters.network
: requestState.extensions[ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN]?.values
: requestState.extensions[ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN]?.values
?.network;
return network;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/address-based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default abstract class AddressBasedPaymentNetwork<
TCreationParameters extends ExtensionTypes.PnAddressBased.ICreationParameters = ExtensionTypes.PnAddressBased.ICreationParameters,
> extends DeclarativePaymentNetwork<TCreationParameters> {
protected constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
public readonly supportedCurrencyType: RequestLogicTypes.CURRENCY,
) {
Expand Down
3 changes: 2 additions & 1 deletion packages/advanced-logic/src/extensions/payment-network/any-to-erc20-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const CURRENT_VERSION = '0.1.0';
export default class AnyToErc20ProxyPaymentNetwork extends Erc20FeeProxyPaymentNetwork {
public constructor(
private currencyManager: ICurrencyManager,
extensionId: ExtensionTypes.ID = ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
.ANY_TO_ERC20_PROXY,
currentVersion: string = CURRENT_VERSION,
) {
super(extensionId, currentVersion);
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/any-to-eth-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const CURRENT_VERSION = '0.2.0';

export default class AnyToEthProxyPaymentNetwork extends EthereumFeeProxyPaymentNetwork {
public constructor(private currencyManager: ICurrencyManager) {
super(ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY, CURRENT_VERSION);
super(ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY, CURRENT_VERSION);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/any-to-native.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-b

export default abstract class AnyToNativeTokenPaymentNetwork extends FeeReferenceBasedPaymentNetwork {
protected constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
public readonly supportedNetworks: string[],
) {
Expand Down
3 changes: 2 additions & 1 deletion packages/advanced-logic/src/extensions/payment-network/bitcoin/mainnet-address-based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const BITCOIN_NETWORK = 'mainnet';
*/
export default class BitcoinAddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
public constructor(
extensionId: ExtensionTypes.ID = ExtensionTypes.ID.PAYMENT_NETWORK_BITCOIN_ADDRESS_BASED,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
.BITCOIN_ADDRESS_BASED,
) {
super(extensionId, CURRENT_VERSION, RequestLogicTypes.CURRENCY.BTC);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/bitcoin/testnet-address-based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const BITCOIN_NETWORK = 'testnet';
*/
export default class BitcoinTestnetAddressBasedPaymentNetwork extends BitcoinAddressBasedPaymentNetwork {
public constructor() {
super(ExtensionTypes.ID.PAYMENT_NETWORK_TESTNET_BITCOIN_ADDRESS_BASED);
super(ExtensionTypes.PAYMENT_NETWORK_ID.TESTNET_BITCOIN_ADDRESS_BASED);
}

protected isValidAddress(address: string): boolean {
Expand Down
4 changes: 2 additions & 2 deletions packages/advanced-logic/src/extensions/payment-network/declarative.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default class DeclarativePaymentNetwork<
TCreationParameters extends ExtensionTypes.PnAnyDeclarative.ICreationParameters = ExtensionTypes.PnAnyDeclarative.ICreationParameters,
> extends AbstractExtension<TCreationParameters> {
public constructor(
public readonly extensionId: ExtensionTypes.ID = ExtensionTypes.ID
.PAYMENT_NETWORK_ANY_DECLARATIVE,
public readonly extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes
.PAYMENT_NETWORK_ID.ANY_DECLARATIVE,
public readonly currentVersion: string = CURRENT_VERSION,
) {
super(ExtensionTypes.TYPE.PAYMENT_NETWORK, extensionId, currentVersion);
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/erc20/address-based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const CURRENT_VERSION = '0.1.0';
export default class Erc20AddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
public constructor() {
super(
ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_ADDRESS_BASED,
ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_ADDRESS_BASED,
CURRENT_VERSION,
RequestLogicTypes.CURRENCY.ERC20,
);
Expand Down
3 changes: 2 additions & 1 deletion packages/advanced-logic/src/extensions/payment-network/erc20/fee-proxy-contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export default class Erc20FeeProxyPaymentNetwork<
TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
> extends FeeReferenceBasedPaymentNetwork<TCreationParameters> {
public constructor(
extensionId: ExtensionTypes.ID = ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_FEE_PROXY_CONTRACT,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
.ERC20_FEE_PROXY_CONTRACT,
currentVersion: string = CURRENT_VERSION,
) {
super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ERC20);
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/erc20/proxy-contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class Erc20ProxyPaymentNetwork<
> extends ReferenceBasedPaymentNetwork<TCreationParameters> {
public constructor() {
super(
ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_PROXY_CONTRACT,
ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_PROXY_CONTRACT,
CURRENT_VERSION,
RequestLogicTypes.CURRENCY.ERC20,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class Erc777StreamPaymentNetwork<
> extends ReferenceBasedPaymentNetwork<TCreationParameters> {
public constructor() {
super(
ExtensionTypes.ID.PAYMENT_NETWORK_ERC777_STREAM,
ExtensionTypes.PAYMENT_NETWORK_ID.ERC777_STREAM,
CURRENT_VERSION,
RequestLogicTypes.CURRENCY.ERC777,
);
Expand Down
3 changes: 2 additions & 1 deletion packages/advanced-logic/src/extensions/payment-network/ethereum/fee-proxy-contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export default class EthereumFeeProxyPaymentNetwork<
TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
> extends FeeReferenceBasedPaymentNetwork<TCreationParameters> {
public constructor(
extensionId: ExtensionTypes.ID = ExtensionTypes.ID.PAYMENT_NETWORK_ETH_FEE_PROXY_CONTRACT,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
.ETH_FEE_PROXY_CONTRACT,
currentVersion: string = CURRENT_VERSION,
) {
super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
Expand Down
3 changes: 2 additions & 1 deletion packages/advanced-logic/src/extensions/payment-network/ethereum/input-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const CURRENT_VERSION = '0.3.0';
*/
export default class EthInputPaymentNetwork extends ReferenceBasedPaymentNetwork {
public constructor(
extensionId: ExtensionTypes.ID = ExtensionTypes.ID.PAYMENT_NETWORK_ETH_INPUT_DATA,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID = ExtensionTypes.PAYMENT_NETWORK_ID
.ETH_INPUT_DATA,
currentVersion: string = CURRENT_VERSION,
) {
super(extensionId, currentVersion, RequestLogicTypes.CURRENCY.ETH);
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/fee-reference-based.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export abstract class FeeReferenceBasedPaymentNetwork<
TCreationParameters extends ExtensionTypes.PnFeeReferenceBased.ICreationParameters = ExtensionTypes.PnFeeReferenceBased.ICreationParameters,
> extends ReferenceBasedPaymentNetwork<TCreationParameters> {
protected constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
supportedCurrencyType: RequestLogicTypes.CURRENCY,
) {
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/native-token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ReferenceBasedPaymentNetwork from './reference-based';
*/
export default abstract class NativeTokenPaymentNetwork extends ReferenceBasedPaymentNetwork {
public constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
public readonly supportedNetworks: string[],
) {
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/near/any-to-near.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class AnyToNearPaymentNetwork extends AnyToNativeTokenPaymentNetw
],
currentVersion: string = CURRENT_VERSION,
) {
super(ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN, currentVersion, supportedNetworks);
super(ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN, currentVersion, supportedNetworks);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/advanced-logic/src/extensions/payment-network/near/near-native.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class NearNativePaymentNetwork extends NativeTokenPaymentNetwork
],
currentVersion: string = CURRENT_VERSION,
) {
super(ExtensionTypes.ID.PAYMENT_NETWORK_NATIVE_TOKEN, currentVersion, supportedNetworks);
super(ExtensionTypes.PAYMENT_NETWORK_ID.NATIVE_TOKEN, currentVersion, supportedNetworks);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions packages/advanced-logic/test/extensions/payment-network/address-based.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('extensions/payment-network/address-based', () => {
it('address validation should throw when using unsupported currency type', () => {
class TestAddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
public constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
supportedCurrencyType: RequestLogicTypes.CURRENCY,
) {
Expand All @@ -18,7 +18,7 @@ describe('extensions/payment-network/address-based', () => {
}
expect(() => {
const testAddressBasedPaymentNetwork = new TestAddressBasedPaymentNetwork(
ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_ADDRESS_BASED,
ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_ADDRESS_BASED,
'test',
RequestLogicTypes.CURRENCY.ISO4217,
);
Expand All @@ -30,7 +30,7 @@ describe('extensions/payment-network/address-based', () => {
it('address validation should throw when using unsupported currency', () => {
class TestAddressBasedPaymentNetwork extends AddressBasedPaymentNetwork {
public constructor(
extensionId: ExtensionTypes.ID,
extensionId: ExtensionTypes.PAYMENT_NETWORK_ID,
currentVersion: string,
supportedCurrencyType: RequestLogicTypes.CURRENCY,
) {
Expand All @@ -42,7 +42,7 @@ describe('extensions/payment-network/address-based', () => {
}
expect(() => {
const testAddressBasedPaymentNetwork = new TestAddressBasedPaymentNetwork(
ExtensionTypes.ID.PAYMENT_NETWORK_ERC20_ADDRESS_BASED,
ExtensionTypes.PAYMENT_NETWORK_ID.ERC20_ADDRESS_BASED,
'test',
RequestLogicTypes.CURRENCY.ERC20,
);
Expand Down
10 changes: 5 additions & 5 deletions packages/advanced-logic/test/extensions/payment-network/any-to-erc20-proxy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe('extensions/payment-network/erc20/any-to-erc20-fee-proxy-contract', ()
}),
).toEqual({
action: 'create',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
parameters: {
feeAddress: '0x0000000000000000000000000000000000000001',
feeAmount: '0',
Expand All @@ -52,7 +52,7 @@ describe('extensions/payment-network/erc20/any-to-erc20-fee-proxy-contract', ()
}),
).toEqual({
action: 'create',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
parameters: {
paymentAddress: '0x0000000000000000000000000000000000000001',
refundAddress: '0x0000000000000000000000000000000000000002',
Expand Down Expand Up @@ -229,7 +229,7 @@ describe('extensions/payment-network/erc20/any-to-erc20-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnReferenceBased.ACTION.ADD_PAYMENT_ADDRESS,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
parameters: {
paymentAddress: '0x0000000000000000000000000000000000000001',
},
Expand All @@ -254,7 +254,7 @@ describe('extensions/payment-network/erc20/any-to-erc20-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnReferenceBased.ACTION.ADD_REFUND_ADDRESS,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
parameters: {
refundAddress: '0x0000000000000000000000000000000000000002',
},
Expand All @@ -280,7 +280,7 @@ describe('extensions/payment-network/erc20/any-to-erc20-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnFeeReferenceBased.ACTION.ADD_FEE,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ERC20_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
parameters: {
feeAddress: '0x0000000000000000000000000000000000000002',
feeAmount: '2000',
Expand Down
10 changes: 5 additions & 5 deletions packages/advanced-logic/test/extensions/payment-network/any-to-eth-proxy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('extensions/payment-network/ethereum/any-to-eth-fee-proxy-contract', ()
}),
).toEqual({
action: 'create',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
parameters: {
feeAddress: '0x0000000000000000000000000000000000000001',
feeAmount: '0',
Expand All @@ -48,7 +48,7 @@ describe('extensions/payment-network/ethereum/any-to-eth-fee-proxy-contract', ()
}),
).toEqual({
action: 'create',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
parameters: {
paymentAddress: '0x0000000000000000000000000000000000000001',
refundAddress: '0x0000000000000000000000000000000000000002',
Expand Down Expand Up @@ -173,7 +173,7 @@ describe('extensions/payment-network/ethereum/any-to-eth-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnReferenceBased.ACTION.ADD_PAYMENT_ADDRESS,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
parameters: {
paymentAddress: '0x0000000000000000000000000000000000000001',
},
Expand All @@ -198,7 +198,7 @@ describe('extensions/payment-network/ethereum/any-to-eth-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnReferenceBased.ACTION.ADD_REFUND_ADDRESS,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
parameters: {
refundAddress: '0x0000000000000000000000000000000000000002',
},
Expand All @@ -224,7 +224,7 @@ describe('extensions/payment-network/ethereum/any-to-eth-fee-proxy-contract', ()
}),
).toEqual({
action: ExtensionTypes.PnFeeReferenceBased.ACTION.ADD_FEE,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_ETH_PROXY,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
parameters: {
feeAddress: '0x0000000000000000000000000000000000000002',
feeAmount: '2000',
Expand Down
10 changes: 5 additions & 5 deletions packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ describe('extensions/payment-network/any-to-native-token', () => {
}),
).toEqual({
action: ExtensionTypes.PnFeeReferenceBased.ACTION.ADD_FEE,
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
parameters: {
feeAddress: `fee.${testCase.suffix}`,
feeAmount: '2000',
Expand Down Expand Up @@ -512,7 +512,7 @@ describe('extensions/payment-network/any-to-native-token', () => {

const addFeeAction = {
action: 'addFee',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
parameters: {
feeAddress: 'fee.near',
feeAmount: '-200',
Expand Down Expand Up @@ -547,7 +547,7 @@ describe('extensions/payment-network/any-to-native-token', () => {

const addFeeAction = {
action: 'addFee',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
parameters: {
feeAddress: 'fee.testnet',
feeAmount: '100',
Expand Down Expand Up @@ -584,7 +584,7 @@ describe('extensions/payment-network/any-to-native-token', () => {

const addFeeAction = {
action: 'addFee',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
parameters: {
feeAddress: 'newfee.near',
feeAmount: '100',
Expand Down Expand Up @@ -619,7 +619,7 @@ describe('extensions/payment-network/any-to-native-token', () => {

const addFeeAction = {
action: 'addFee',
id: ExtensionTypes.ID.PAYMENT_NETWORK_ANY_TO_NATIVE_TOKEN,
id: ExtensionTypes.PAYMENT_NETWORK_ID.ANY_TO_NATIVE_TOKEN,
parameters: {
feeAddress: 'fee.near',
feeAmount: '100',
Expand Down
Loading