vm.skip(true) and return REQUEST_ID

plumenetwork · Dec 3, 2024 · df15ff5 · df15ff5
1 parent d896bec
commit df15ff5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/nest/script/UpgradepUSD.s.sol b/nest/script/UpgradepUSD.s.sol
@@ -56,20 +56,20 @@ contract UpgradePUSD is Script, Test {
                 console2.log("Vault:", currentVault);
                 console2.log("Total Supply:", currentTotalSupply);
             } else {
-                vm.assume(true);
+                vm.skip(true);
                 isConnected = false;
             }
         } catch {
             console2.log("No implementation found - skipping");
-            vm.assume(true);
+            vm.skip(true);
             isConnected = false;
         }
     }
 
     function testSimulateUpgrade() public {
         // Deploy new implementation in test environment
         if (!isConnected) {
-            vm.assume(true);
+            vm.skip(true);
         } else {
             vm.startPrank(ADMIN_ADDRESS);
 
@@ -85,7 +85,7 @@ contract UpgradePUSD is Script, Test {
 
     function run() external {
         if (!isConnected) {
-            vm.assume(true);
+            vm.skip(true);
         } else {
             vm.startBroadcast(ADMIN_ADDRESS);
 

diff --git a/nest/src/ComponentToken.sol b/nest/src/ComponentToken.sol
@@ -69,7 +69,7 @@ abstract contract ComponentToken is
     // Constants
 
     /// @notice All ComponentToken requests are fungible and all have ID = 0
-    uint256 private constant REQUEST_ID = 0;
+    uint256 internal constant REQUEST_ID = 0;
     /// @notice Role for the admin of the ComponentToken
     bytes32 public constant ADMIN_ROLE = keccak256("ADMIN_ROLE");
     /// @notice Role for the upgrader of the ComponentToken

diff --git a/nest/src/token/BoringVaultAdapter.sol b/nest/src/token/BoringVaultAdapter.sol
@@ -305,7 +305,7 @@ abstract contract BoringVaultAdapter is
         IAtomicQueue queue = _getBoringVaultAdapterStorage().boringVault.atomicQueue;
         queue.updateAtomicRequest(IERC20(address(this)), IERC20(asset()), request);
 
-        return 0; // ComponentToken's standard REQUEST_ID
+        return REQUEST_ID;
     }
 
     /**