fix: remove more merge stuff

Author: njlie

packages/backend/src/open_payments/wallet_address/service.test.ts

@@ -652,102 +652,6 @@ describe('Open Payments Wallet Address Service', (): void => {
         )
       )
 
-      test(
-        'creates wallet address not found event for tenant with matching prefix',
-        withConfigOverride(
-          () => config,
-          { walletAddressLookupTimeoutMs: 0 },
-          async (): Promise<void> => {
-            const walletAddressUrl = `https://${faker.internet.domainName()}/.well-known/pay`
-            const tenant = await createTenant(deps)
-            await createTenantSettings(deps, {
-              tenantId: tenant.id,
-              setting: [
-                {
-                  key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
-                  value: `${walletAddressUrl}/${uuid()}`
-                }
-              ]
-            })
-
-            await expect(
-              walletAddressService.getOrPollByUrl(walletAddressUrl)
-            ).resolves.toBeUndefined()
-
-            const walletAddressNotFoundEvents = await WalletAddressEvent.query(
-              knex
-            )
-              .where({
-                type: WalletAddressEventType.WalletAddressNotFound
-              })
-              .withGraphFetched('webhooks')
-
-            expect(walletAddressNotFoundEvents).toHaveLength(1)
-            expect(walletAddressNotFoundEvents[0].webhooks).toHaveLength(1)
-            expect(walletAddressNotFoundEvents[0]).toMatchObject({
-              data: { walletAddressUrl },
-              webhooks: expect.arrayContaining([
-                expect.objectContaining({
-                  recipientTenantId: tenant.id,
-                  eventId: walletAddressNotFoundEvents[0].id,
-                  processAt: expect.any(Date)
-                })
-              ])
-            })
-          }
-        )
-      )
-
-      test(
-        'creates wallet address not found event for tenant with matching prefix',
-        withConfigOverride(
-          () => config,
-          { walletAddressLookupTimeoutMs: 0 },
-          async (): Promise<void> => {
-            const walletAddressUrl = `https://${faker.internet.domainName()}/.well-known/pay`
-            const tenant = await createTenant(deps)
-            await createTenantSettings(deps, {
-              tenantId: tenant.id,
-              setting: [
-                {
-                  key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
-                  value: `${walletAddressUrl}/${uuid()}`
-                }
-              ]
-            })
-
-            await expect(
-              walletAddressService.getOrPollByUrl(walletAddressUrl)
-            ).resolves.toBeUndefined()
-
-            const walletAddressNotFoundEvents = await WalletAddressEvent.query(
-              knex
-            )
-              .where({
-                type: WalletAddressEventType.WalletAddressNotFound
-              })
-              .withGraphFetched('webhooks')
-
-            expect(walletAddressNotFoundEvents).toHaveLength(1)
-            expect(walletAddressNotFoundEvents[0].webhooks).toHaveLength(2)
-            expect(walletAddressNotFoundEvents[0]).toMatchObject({
-              data: { walletAddressUrl },
-              webhooks: expect.arrayContaining([
-                expect.objectContaining({
-                  recipientTenantId: tenant.id,
-                  eventId: walletAddressNotFoundEvents[0].id,
-                  processAt: expect.any(Date)
-                }),
-                expect.objectContaining({
-                  recipientTenantId: config.operatorTenantId,
-                  eventId: walletAddressNotFoundEvents[0].id,
-                  processAt: expect.any(Date)
-                })
-              ])
-            })
-          }
-        )
-      )
       test(
         'polls for wallet address',
         withConfigOverride(
@@ -931,50 +835,6 @@ describe('Open Payments Wallet Address Service', (): void => {
       })
     })
 
-    test('creates corresponding operator webhook if withdrawal event is for tenant', async (): Promise<void> => {
-      const tenant = await createTenant(deps)
-      const walletAddress = await createWalletAddress(deps, {
-        tenantId: tenant.id,
-        createLiquidityAccount: true
-      })
-
-      accountingService.createDeposit({
-        id: uuid(),
-        account: walletAddress,
-        amount: BigInt(10)
-      })
-
-      await walletAddress.$query(knex).patch({
-        processAt: new Date(),
-        totalEventsAmount: BigInt(0)
-      })
-      await expect(walletAddressService.processNext()).resolves.toBe(
-        walletAddress.id
-      )
-
-      const events = await WalletAddressEvent.query(knex)
-        .where({
-          type: WalletAddressEventType.WalletAddressWebMonetization,
-          withdrawalAccountId: walletAddress.id,
-          withdrawalAssetId: walletAddress.assetId,
-          withdrawalAmount: BigInt(10)
-        })
-        .withGraphFetched('webhooks')
-      expect(events).toHaveLength(1)
-      expect(events[0].webhooks).toEqual([
-        expect.objectContaining({
-          recipientTenantId: walletAddress.tenantId,
-          eventId: events[0].id,
-          processAt: expect.any(Date)
-        }),
-        expect.objectContaining({
-          recipientTenantId: config.operatorTenantId,
-          eventId: events[0].id,
-          processAt: expect.any(Date)
-        })
-      ])
-    })
-
     test.each`
       processAt                        | description
       ${null}                          | ${'not scheduled'}