feat: fix specs

0xdevhub · Dec 5, 2023 · 3288635 · 3288635
1 parent f7d792c
commit 3288635
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/contracts/adapters/CCIPAdapter.sol b/contracts/adapters/CCIPAdapter.sol
@@ -75,12 +75,10 @@ contract CCIPAdapter is BaseAdapter, CCIPReceiver {
 
     function _receiveMessage(IBridge.ERC721Receive memory payload_) internal virtual override {
         try IBridge(bridge()).receiveERC721(payload_) {
-            /// @dev if success, just bypass
+            emit IBaseAdapter.ERC721Received(payload_.fromChain, payload_.sender, payload_.data);
         } catch {
             _setPendingMessage(payload_);
         }
-
-        emit IBaseAdapter.ERC721Received(payload_.fromChain, payload_.sender, payload_.data);
     }
 
     function _setPendingMessage(IBridge.ERC721Receive memory payload_) private {

diff --git a/contracts/mocks/MockBridge.sol b/contracts/mocks/MockBridge.sol
@@ -10,8 +10,8 @@ contract MockBridge {
 
     bool public s_isLocked;
 
-    function lock() external {
-        s_isLocked = true;
+    function lock(bool status_) external {
+        s_isLocked = status_;
     }
 
     event ERC721Received(ERC721Receive indexed message_);

diff --git a/test/adapters/ccip/CCIPAdapter.spec.ts b/test/adapters/ccip/CCIPAdapter.spec.ts
@@ -213,10 +213,12 @@ describe('CCIPAdapter', function () {
         destTokenAmounts: []
       }
 
-      await mockBridge.lock()
+      await mockBridge.lock(true)
 
       await ccipAdapter.ccipReceive(payload)
 
+      await mockBridge.lock(false)
+
       await expect(ccipAdapter.manuallyExecuteMessages(1))
         .to.emit(ccipAdapter, 'ERC721Received')
         .withArgs(
@@ -262,9 +264,10 @@ describe('CCIPAdapter', function () {
         destTokenAmounts: []
       }
 
-      await mockBridge.lock()
-
+      await mockBridge.lock(true)
       await ccipAdapter.ccipReceive(payload)
+      await mockBridge.lock(false)
+
       await ccipAdapter.manuallyExecuteMessages(1)
 
       const executedMessage = await ccipAdapter.getExecutedMessage(0)
@@ -316,10 +319,12 @@ describe('CCIPAdapter', function () {
         destTokenAmounts: []
       }
 
-      await mockBridge.lock()
+      await mockBridge.lock(true)
 
       await ccipAdapter.ccipReceive(payload)
 
+      await mockBridge.lock(false)
+
       const pendingMessage = await ccipAdapter.getPendingMessage(0)
 
       expect({
@@ -369,9 +374,9 @@ describe('CCIPAdapter', function () {
         destTokenAmounts: []
       }
 
-      await mockBridge.lock()
-
+      await mockBridge.lock(true)
       await ccipAdapter.ccipReceive(payload)
+      await mockBridge.lock(false)
 
       await expect(ccipAdapter.manuallyExecuteMessages(10))
         .to.emit(ccipAdapter, 'ERC721Received')