From edd9bea71c00a2bbee1ceaae69e0ee45e0c27b87 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 28 Nov 2024 17:10:10 -0500 Subject: [PATCH 1/3] chore: skip A->B B->A e2e_2_pxes test Until #10296 --- .../end-to-end/src/e2e_2_pxes.test.ts | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts index c95e16b9d7a..0ab58585e19 100644 --- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts +++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts @@ -1,23 +1,18 @@ import { getUnsafeSchnorrAccount } from '@aztec/accounts/single_key'; import { createAccounts } from '@aztec/accounts/testing'; -import { - type AztecAddress, - type AztecNode, - type DebugLogger, - type ExtendedNote, - Fr, - type PXE, - type Wallet, - retryUntil, - sleep, -} from '@aztec/aztec.js'; +import { type AztecAddress, type AztecNode, type DebugLogger, type ExtendedNote, Fr, type PXE, type Wallet, retryUntil, sleep } from '@aztec/aztec.js'; import { ChildContract, TestContract, TokenContract } from '@aztec/noir-contracts.js'; + + import { expect, jest } from '@jest/globals'; + + import { deployToken, expectTokenBalance, mintTokensToPrivate } from './fixtures/token_utils.js'; import { setup, setupPXEService } from './fixtures/utils.js'; + const TIMEOUT = 120_000; describe('e2e_2_pxes', () => { @@ -57,7 +52,8 @@ describe('e2e_2_pxes', () => { await teardownA(); }); - it('transfers funds from user A to B via PXE A followed by transfer from B to A via PXE B', async () => { + // TODO #10296 + it.skip('transfers funds from user A to B via PXE A followed by transfer from B to A via PXE B', async () => { const initialBalance = 987n; const transferAmount1 = 654n; const transferAmount2 = 323n; From 4d016543aa26b0c86f9ffcb14c66d74dfbca8fc2 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 29 Nov 2024 04:01:03 +0000 Subject: [PATCH 2/3] format --- LICENSE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index f49a4e16e68..8dada3edaf5 100644 --- a/LICENSE +++ b/LICENSE @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -198,4 +198,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. From 5da1e73a60aa1bd7044b93d6a0084b65af86aa01 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Fri, 29 Nov 2024 12:24:19 -0300 Subject: [PATCH 3/3] Format --- yarn-project/end-to-end/src/e2e_2_pxes.test.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts index 0ab58585e19..d3dded0788d 100644 --- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts +++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts @@ -1,18 +1,23 @@ import { getUnsafeSchnorrAccount } from '@aztec/accounts/single_key'; import { createAccounts } from '@aztec/accounts/testing'; -import { type AztecAddress, type AztecNode, type DebugLogger, type ExtendedNote, Fr, type PXE, type Wallet, retryUntil, sleep } from '@aztec/aztec.js'; +import { + type AztecAddress, + type AztecNode, + type DebugLogger, + type ExtendedNote, + Fr, + type PXE, + type Wallet, + retryUntil, + sleep, +} from '@aztec/aztec.js'; import { ChildContract, TestContract, TokenContract } from '@aztec/noir-contracts.js'; - - import { expect, jest } from '@jest/globals'; - - import { deployToken, expectTokenBalance, mintTokensToPrivate } from './fixtures/token_utils.js'; import { setup, setupPXEService } from './fixtures/utils.js'; - const TIMEOUT = 120_000; describe('e2e_2_pxes', () => {