From be99cb1f4d7c6306ea8502b9e4ddedcb2efd2c14 Mon Sep 17 00:00:00 2001 From: JaredBorders Date: Thu, 27 Apr 2023 21:23:13 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=93=A3=20Add=20indexed=20attribute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interfaces/IEvents.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interfaces/IEvents.sol b/src/interfaces/IEvents.sol index c04a17f9..ac9cd4a2 100644 --- a/src/interfaces/IEvents.sol +++ b/src/interfaces/IEvents.sol @@ -73,7 +73,7 @@ interface IEvents { event ConditionalOrderPlaced( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, bytes32 marketKey, int256 marginDelta, int256 sizeDelta, @@ -93,7 +93,7 @@ interface IEvents { event ConditionalOrderCancelled( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, IAccount.ConditionalOrderCancelledReason reason ); @@ -109,7 +109,7 @@ interface IEvents { event ConditionalOrderFilled( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, uint256 fillPrice, uint256 keeperFee ); From c66ee6f718ab20893f3fd87eb6a173a7fca1bf85 Mon Sep 17 00:00:00 2001 From: JaredBorders Date: Sun, 30 Apr 2023 14:47:47 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9A=20Update=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8fbfb61d..e1fcecd5 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,12 @@ npm run compile npm run test ``` +4. Run specific test + +``` +forge test --fork-url $(grep ARCHIVE_NODE_URL_GOERLI_L2 .env | cut -d '=' -f2) --match-test TEST_NAME -vvv +``` + > tests will fail if you have not set up your .env (see .env.example) ### Upgradability From 4ce5f2bc3f029e875b5a7e0a18046a44cbdd0dca Mon Sep 17 00:00:00 2001 From: JaredBorders Date: Sun, 30 Apr 2023 14:47:56 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=85=20Update=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/utils/ConsolidatedEvents.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/utils/ConsolidatedEvents.sol b/test/utils/ConsolidatedEvents.sol index 791150bc..32b2c543 100644 --- a/test/utils/ConsolidatedEvents.sol +++ b/test/utils/ConsolidatedEvents.sol @@ -50,7 +50,7 @@ contract ConsolidatedEvents { event ConditionalOrderPlaced( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, bytes32 marketKey, int256 marginDelta, int256 sizeDelta, @@ -62,13 +62,13 @@ contract ConsolidatedEvents { event ConditionalOrderCancelled( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, IAccount.ConditionalOrderCancelledReason reason ); event ConditionalOrderFilled( address indexed account, - uint256 conditionalOrderId, + uint256 indexed conditionalOrderId, uint256 fillPrice, uint256 keeperFee );