From b03bd48e7013ba3f9411dabd6069972a7cc65f65 Mon Sep 17 00:00:00 2001
From: Ardit Marku <markoupetr@gmail.com>
Date: Tue, 30 Apr 2024 12:37:46 +0300
Subject: [PATCH 1/2] Remove redundant normalization step from CI

This normalization is now embedded in the 'flow test' command.
---
 .github/workflows/cadence_test.yml |  2 --
 local/normalize_coverage_report.sh | 20 --------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 local/normalize_coverage_report.sh

diff --git a/.github/workflows/cadence_test.yml b/.github/workflows/cadence_test.yml
index f83a8c87..0a80a736 100644
--- a/.github/workflows/cadence_test.yml
+++ b/.github/workflows/cadence_test.yml
@@ -26,8 +26,6 @@ jobs:
         run: echo "/root/.local/bin" >> $GITHUB_PATH
       - name: Run tests
         run: sh local/run_cadence_tests.sh
-      - name: Normalize coverage report filepaths
-        run: sh ./local/normalize_coverage_report.sh
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
         env:
diff --git a/local/normalize_coverage_report.sh b/local/normalize_coverage_report.sh
deleted file mode 100644
index cd47455e..00000000
--- a/local/normalize_coverage_report.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-sed -i 's/A.0000000000000007.Serialize/cadence\/contracts\/utils\/Serialize.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.SerializeMetadata/cadence\contracts\/SerializeMetadata.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.IBridgePermissions/cadence\/contracts\/bridge\/interfaces\/IBridgePermissions.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.ICrossVM/cadence\/contracts\/bridge\/interfaces\/ICrossVM.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.CrossVMNFT/cadence\/contracts\/bridge\/CrossVMNFT.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.CrossVMToken/cadence\/contracts\/bridge\/CrossVMToken.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeConfig/cadence\/contracts\/bridge\/FlowEVMBridgeConfig.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeUtils/cadence\/contracts\/bridge\/FlowEVMBridgeUtils.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.EVMUtils/cadence\/contracts\/bridge\/EVMUtils.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeNFTEscrow/cadence\/contracts\/bridge\/FlowEVMBridgeNFTEscrow.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeTokenEscrow/cadence\/contracts\/bridge\/FlowEVMBridgeTokenEscrow.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeTemplates/cadence\/contracts\/bridge\/FlowEVMBridgeTemplates.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.IEVMBridgeNFTMinter/cadence\/contracts\/bridge\/interfaces\/IEVMBridgeNFTMinter.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.IEVMBridgeTokenMinter/cadence\/contracts\/bridge\/interfaces\/IEVMBridgeTokenMinter.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.IFlowEVMNFTBridge/cadence\/contracts\/bridge\/interfaces\/IFlowEVMNFTBridge.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.IFlowEVMTokenBridge/cadence\/contracts\/bridge\/interfaces\/IFlowEVMTokenBridge.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridge/cadence\/contracts\/bridge\/FlowEVMBridge.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeAccessor/cadence\/contracts\/bridge\/FlowEVMBridgeAccessor.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeHandlerInterfaces/cadence\/contracts\/bridge\/interfaces\/FlowEVMBridgeHandlerInterfaces.cdc/' coverage.lcov
-sed -i 's/A.0000000000000007.FlowEVMBridgeHandlers/cadence\/contracts\/bridge\/FlowEVMBridgeHandlers.cdc/' coverage.lcov
\ No newline at end of file

From 51f04401d9a783a14f95fe08af5441dd49db1cfb Mon Sep 17 00:00:00 2001
From: Ardit Marku <markoupetr@gmail.com>
Date: Tue, 30 Apr 2024 12:45:00 +0300
Subject: [PATCH 2/2] Fix test case error

---
 cadence/tests/flow_evm_bridge_tests.cdc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cadence/tests/flow_evm_bridge_tests.cdc b/cadence/tests/flow_evm_bridge_tests.cdc
index 0fcef606..7df9277b 100644
--- a/cadence/tests/flow_evm_bridge_tests.cdc
+++ b/cadence/tests/flow_evm_bridge_tests.cdc
@@ -502,7 +502,8 @@ fun testOnboardAndBridgeNFTToEVMSucceeds() {
         contractAddr: exampleNFTAccount.address,
         contractName: "ExampleNFT",
         nftID: aliceID,
-        bridgeAccountAddr: bridgeAccount.address
+        bridgeAccountAddr: bridgeAccount.address,
+        beFailed: false
     )
 
     requiresOnboarding = typeRequiresOnboardingByIdentifier(exampleNFTIdentifier)