Skip to content

Commit

Permalink
fix(backend): tests due to wallet address url change
Browse files Browse the repository at this point in the history
  • Loading branch information
@golobitch
golobitch committed Mar 2, 2025
1 parent 2739421 commit e9d9173
Show file tree
Hide file tree
Showing 19 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion packages/backend/src/asset/service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ describe('Asset Service', (): void => {

// make sure there is at least 1 wallet address using asset
const walletAddress = walletAddressService.create({
url: 'https://alice.me/.well-known/pay',
address: 'https://alice.me/.well-known/pay',
tenantId: Config.operatorTenantId,
assetId: newAssetId
})
Expand Down
8 changes: 4 additions & 4 deletions packages/backend/src/graphql/resolvers/wallet_address.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('Wallet Address Resolvers', (): void => {
input = {
assetId: asset.id,
tenantId: Config.operatorTenantId,
url: 'https://alice.me/.well-known/pay'
address: 'https://alice.me/.well-known/pay'
}
})

Expand Down Expand Up @@ -121,7 +121,7 @@ describe('Wallet Address Resolvers', (): void => {
expect(response.walletAddress).toEqual({
__typename: 'WalletAddress',
id: response.walletAddress.id,
url: input.url,
address: input.address,
asset: {
__typename: 'Asset',
code: asset.code,
Expand Down Expand Up @@ -192,7 +192,7 @@ describe('Wallet Address Resolvers', (): void => {
expect(response.walletAddress).toEqual({
__typename: 'WalletAddress',
id: response.walletAddress.id,
url: input.url,
address: input.address,
asset: {
__typename: 'Asset',
code: asset.code,
Expand Down Expand Up @@ -318,7 +318,7 @@ describe('Wallet Address Resolvers', (): void => {
const badInputData = {
tenantId: 'ae4950b6-3e1b-4e50-ad24-25c065bdd3a9',
assetId: input.assetId,
url: input.url
address: input.address
}
try {
expect.assertions(2)
Expand Down
10 changes: 5 additions & 5 deletions packages/backend/src/open_payments/payment/incoming/model.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('Models', (): void => {
walletAddress = await createWalletAddress(deps, {
tenantId: Config.operatorTenantId
})
baseUrl = new URL(walletAddress.url).origin
baseUrl = new URL(walletAddress.address).origin
incomingPayment = await createIncomingPayment(deps, {
walletAddressId: walletAddress.id,
metadata: { description: 'my payment' },
Expand All @@ -57,7 +57,7 @@ describe('Models', (): void => {
test('returns incoming payment', async () => {
expect(incomingPayment.toOpenPaymentsType(walletAddress)).toEqual({
id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
completed: incomingPayment.completed,
receivedAmount: serializeAmount(incomingPayment.receivedAmount),
incomingAmount: incomingPayment.incomingAmount
Expand Down Expand Up @@ -85,7 +85,7 @@ describe('Models', (): void => {
)
).toEqual({
id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
completed: incomingPayment.completed,
receivedAmount: serializeAmount(incomingPayment.receivedAmount),
incomingAmount: incomingPayment.incomingAmount
Expand All @@ -110,7 +110,7 @@ describe('Models', (): void => {
incomingPayment.toOpenPaymentsTypeWithMethods(walletAddress)
).toEqual({
id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
completed: incomingPayment.completed,
receivedAmount: serializeAmount(incomingPayment.receivedAmount),
incomingAmount: incomingPayment.incomingAmount
Expand Down Expand Up @@ -141,7 +141,7 @@ describe('Models', (): void => {
)
).toEqual({
id: `${baseUrl}/${Config.operatorTenantId}${IncomingPayment.urlPath}/${incomingPayment.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
completed: incomingPayment.completed,
receivedAmount: serializeAmount(incomingPayment.receivedAmount),
incomingAmount: incomingPayment.incomingAmount
Expand Down
8 changes: 4 additions & 4 deletions packages/backend/src/open_payments/payment/incoming/routes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('Incoming Payment Routes', (): void => {
tenantId,
assetId: asset.id
})
baseUrl = new URL(walletAddress.url).origin
baseUrl = new URL(walletAddress.address).origin
incomingAmount = {
value: BigInt('123'),
assetScale: asset.scale,
Expand Down Expand Up @@ -97,7 +97,7 @@ describe('Incoming Payment Routes', (): void => {
const response: Partial<OpenPaymentsIncomingPaymentWithPaymentMethods> =
{
id: incomingPayment.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
completed: false,
incomingAmount:
incomingPayment.incomingAmount &&
Expand Down Expand Up @@ -280,7 +280,7 @@ describe('Incoming Payment Routes', (): void => {

expect(ctx.response.body).toEqual({
id: `${baseUrl}/${tenantId}/incoming-payments/${incomingPaymentId}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
incomingAmount: incomingAmount ? amount : undefined,
expiresAt: expiresAt || expect.any(String),
createdAt: expect.any(String),
Expand Down Expand Up @@ -335,7 +335,7 @@ describe('Incoming Payment Routes', (): void => {
expect(ctx.response).toSatisfyApiSpec()
expect(ctx.body).toEqual({
id: incomingPayment.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
incomingAmount: {
value: '123',
assetCode: asset.code,
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/open_payments/payment/incoming/service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('Incoming Payment Service', (): void => {
assetId: asset.id
})
walletAddressId = address.id
client = address.url
client = address.address
})

afterEach(async (): Promise<void> => {
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/open_payments/payment/outgoing/model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class OutgoingPayment
}

public getUrl(walletAddress: WalletAddress): string {
const url = new URL(walletAddress.url)
const url = new URL(walletAddress.address)
return `${url.origin}/${this.tenantId}${OutgoingPayment.urlPath}/${this.id}`
}

Expand Down Expand Up @@ -206,7 +206,7 @@ export class OutgoingPayment
): OpenPaymentsOutgoingPayment {
return {
id: this.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
quoteId: this.quote?.getUrl(walletAddress) ?? undefined,
receiveAmount: serializeAmount(this.receiveAmount),
debitAmount: serializeAmount(this.debitAmount),
Expand Down
6 changes: 3 additions & 3 deletions packages/backend/src/open_payments/payment/outgoing/routes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('Outgoing Payment Routes', (): void => {
tenantId,
assetId: asset.id
})
baseUrl = new URL(walletAddress.url).origin
baseUrl = new URL(walletAddress.address).origin
})

afterEach(async (): Promise<void> => {
Expand Down Expand Up @@ -121,7 +121,7 @@ describe('Outgoing Payment Routes', (): void => {
getBody: (outgoingPayment) => {
return {
id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPayment.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver: outgoingPayment.receiver,
quoteId: outgoingPayment.quote.getUrl(walletAddress),
debitAmount: serializeAmount(outgoingPayment.debitAmount),
Expand Down Expand Up @@ -252,7 +252,7 @@ describe('Outgoing Payment Routes', (): void => {
.pop()
expect(ctx.response.body).toEqual({
id: `${baseUrl}/${tenantId}/outgoing-payments/${outgoingPaymentId}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver: payment.receiver,
quoteId:
'quoteId' in options ? options.quoteId : expect.any(String),
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/open_payments/payment/outgoing/service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ describe('OutgoingPaymentService', (): void => {
assetId: sendAssetId
})
walletAddressId = walletAddress.id
client = walletAddress.url
client = walletAddress.address
const { id: destinationAssetId } = await createAsset(deps, destinationAsset)
receiverWalletAddress = await createWalletAddress(deps, {
tenantId,
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/open_payments/quote/model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class Quote extends WalletAddressSubresource {
private debitAmountValue!: bigint

public getUrl(walletAddress: WalletAddress): string {
const url = new URL(walletAddress.url)
const url = new URL(walletAddress.address)
return `${url.origin}/${this.tenantId}${Quote.urlPath}/${this.id}`
}

Expand Down Expand Up @@ -134,7 +134,7 @@ export class Quote extends WalletAddressSubresource {
public toOpenPaymentsType(walletAddress: WalletAddress): OpenPaymentsQuote {
return {
id: this.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiveAmount: serializeAmount(this.receiveAmount),
debitAmount: serializeAmount(this.debitAmount),
receiver: this.receiver,
Expand Down
12 changes: 6 additions & 6 deletions packages/backend/src/open_payments/quote/routes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('Quote Routes', (): void => {
getBody: (quote) => {
return {
id: `${baseUrl}/${quote.tenantId}/quotes/${quote.id}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver: quote.receiver,
debitAmount: serializeAmount(quote.debitAmount),
receiveAmount: serializeAmount(quote.receiveAmount),
Expand Down Expand Up @@ -145,7 +145,7 @@ describe('Quote Routes', (): void => {

test('returns error on invalid debitAmount asset', async (): Promise<void> => {
options = {
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver,
debitAmount: {
...debitAmount,
Expand Down Expand Up @@ -174,7 +174,7 @@ describe('Quote Routes', (): void => {
'$description',
async ({ debitAmount, receiveAmount }): Promise<void> => {
options = {
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver,
method: 'ilp'
}
Expand Down Expand Up @@ -227,7 +227,7 @@ describe('Quote Routes', (): void => {
assert.ok(quote)
expect(ctx.response.body).toEqual({
id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver: quote.receiver,
debitAmount: {
...quote.debitAmount,
Expand All @@ -246,7 +246,7 @@ describe('Quote Routes', (): void => {

test('receiver.incomingAmount', async (): Promise<void> => {
options = {
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver,
method: 'ilp'
}
Expand Down Expand Up @@ -279,7 +279,7 @@ describe('Quote Routes', (): void => {
assert.ok(quote)
expect(ctx.response.body).toEqual({
id: `${baseUrl}/${tenantId}/quotes/${quoteId}`,
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
receiver: options.receiver,
debitAmount: {
...quote.debitAmount,
Expand Down
10 changes: 5 additions & 5 deletions packages/backend/src/open_payments/quote/service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ describe('QuoteService', (): void => {
createQuote(deps, {
tenantId,
walletAddressId: sendingWalletAddress.id,
receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
debitAmount: {
value: BigInt(56),
assetCode: asset.code,
Expand Down Expand Up @@ -446,7 +446,7 @@ describe('QuoteService', (): void => {
quoteService.create({
tenantId: unknownTenantId,
walletAddressId: walletAddress.id,
receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
debitAmount,
method: 'ilp'
})
Expand All @@ -466,7 +466,7 @@ describe('QuoteService', (): void => {
quoteService.create({
tenantId,
walletAddressId: unknownWalletAddressId,
receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
debitAmount,
method: 'ilp'
})
Expand All @@ -490,7 +490,7 @@ describe('QuoteService', (): void => {
quoteService.create({
tenantId,
walletAddressId: walletAddress.id,
receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
debitAmount,
method: 'ilp'
})
Expand All @@ -502,7 +502,7 @@ describe('QuoteService', (): void => {
quoteService.create({
tenantId,
walletAddressId: sendingWalletAddress.id,
receiver: `${receivingWalletAddress.url}/incoming-payments/${uuid()}`,
receiver: `${receivingWalletAddress.address}/incoming-payments/${uuid()}`,
debitAmount,
method: 'ilp'
})
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/open_payments/receiver/model.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Receiver Model', (): void => {
sharedSecret: expect.any(Buffer),
incomingPayment: {
id: incomingPayment.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
updatedAt: incomingPayment.updatedAt,
createdAt: incomingPayment.createdAt,
completed: incomingPayment.completed,
Expand Down
8 changes: 4 additions & 4 deletions packages/backend/src/open_payments/receiver/service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('Receiver Service', (): void => {
sharedSecret: expect.any(Buffer),
incomingPayment: {
id: incomingPayment.getUrl(walletAddress),
walletAddress: walletAddress.url,
walletAddress: walletAddress.address,
incomingAmount: incomingPayment.incomingAmount,
receivedAmount: incomingPayment.receivedAmount,
completed: false,
Expand Down Expand Up @@ -315,7 +315,7 @@ describe('Receiver Service', (): void => {
'create'
)
const receiver = await receiverService.create({
walletAddressUrl: walletAddress.url,
walletAddressUrl: walletAddress.address,
incomingAmount,
expiresAt,
metadata,
Expand Down Expand Up @@ -367,7 +367,7 @@ describe('Receiver Service', (): void => {

await expect(
receiverService.create({
walletAddressUrl: walletAddress.url,
walletAddressUrl: walletAddress.address,
tenantId
})
).resolves.toEqual(ReceiverError.InvalidAmount)
Expand All @@ -380,7 +380,7 @@ describe('Receiver Service', (): void => {

await expect(
receiverService.create({
walletAddressUrl: walletAddress.url,
walletAddressUrl: walletAddress.address,
tenantId
})
).rejects.toThrow(
Expand Down
6 changes: 3 additions & 3 deletions packages/backend/src/open_payments/wallet_address/key/routes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Wallet Address Keys Routes', (): void => {
headers: { Accept: 'application/json' },
url: `/jwks.json`
})
ctx.walletAddressUrl = walletAddress.url
ctx.walletAddressUrl = walletAddress.address

await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
expect(ctx.response).toSatisfyApiSpec()
Expand All @@ -79,7 +79,7 @@ describe('Wallet Address Keys Routes', (): void => {
headers: { Accept: 'application/json' },
url: `/jwks.json`
})
ctx.walletAddressUrl = walletAddress.url
ctx.walletAddressUrl = walletAddress.address

await expect(walletAddressKeyRoutes.get(ctx)).resolves.toBeUndefined()
expect(ctx.body).toEqual({
Expand Down Expand Up @@ -134,7 +134,7 @@ describe('Wallet Address Keys Routes', (): void => {
const ctx = createContext<WalletAddressUrlContext>({
headers: { Accept: 'application/json' }
})
ctx.walletAddressUrl = walletAddress.url
ctx.walletAddressUrl = walletAddress.address

const getOrPollByUrlSpy = jest.spyOn(
walletAddressService,
Expand Down
Loading

0 comments on commit e9d9173

Please sign in to comment.