Refactor Union Bridge locking cap voting logic to simplify assertions and improve clarity in test cases

Author: nathanieliov

lib/tests/union-bridge-methods.js

@@ -122,16 +122,8 @@ const execute = (description) => {
       // Arrange
       const lockingCapBeforeUpdate = await getUnionBridgeLockingCap();
       const smallerLockingCap = new BN(lockingCapBeforeUpdate).sub(new BN((1)));
-      // Act & Assert - first vote should succeed
-      const txReceiptFirstVote = await voteToIncreaseUnionBridgeLockingCap(smallerLockingCap.toString(), unionBridgeAuthorizerMember1Address);
-      assertIncreaseUnionLockingCapVotedEventWasEmitted(smallerLockingCap.toString(), unionBridgeAuthorizerMember1Address, txReceiptFirstVote);
-
-      // Second vote should revert when the bridge call fails
-      await assertContractCallFails(
-        unionBridgeAuthorizerContract.methods.voteToIncreaseUnionLockingCap(smallerLockingCap.toString()),
-        { from: unionBridgeAuthorizerMember2Address }
-      );
-
+      // Act & Assert
+      await voteToIncreaseUnionBridgeLockingCapExpectingRevert(smallerLockingCap.toString());
       // Assert locking cap remains unchanged
       await assertLockingCap(lockingCapBeforeUpdate);
     });
@@ -460,7 +452,6 @@ const deployAndInitUnionAuthorizerContract = async () => {
     unionBridgeAuthorizerAddress
   );
   unionBridgeAuthorizerContractAddress = unionBridgeAuthorizerContract._address;
-  console.log("UnionBridgeAuthorizer deployed at:", unionBridgeAuthorizerContractAddress);
 
   const multisigInitMethod = unionBridgeAuthorizerContract.methods.init(multisigMembers, votingPeriodInBlocks);
   const txReceipt = await rskUtils.sendTransaction(rskTxHelper, multisigInitMethod, unionBridgeAuthorizerAddress, 0, 300000);
@@ -530,6 +521,18 @@ const voteToIncreaseUnionBridgeLockingCap = async (newLockingCap, authorizedMemb
   return await rskUtils.sendTransaction(rskTxHelper, increaseLockingCapVote, authorizedMember, 0, 300000);
 };
 
+const voteToIncreaseUnionBridgeLockingCapExpectingRevert = async (newLockingCap) => {
+  // First vote from member 1 should succeed
+  const txReceiptFirstVote = await voteToIncreaseUnionBridgeLockingCap(newLockingCap, unionBridgeAuthorizerMember1Address);
+  assertIncreaseUnionLockingCapVotedEventWasEmitted(newLockingCap, unionBridgeAuthorizerMember1Address, txReceiptFirstVote);
+
+  // Second vote from member 2 should revert when the bridge call fails
+  await assertContractCallFails(
+    unionBridgeAuthorizerContract.methods.voteToIncreaseUnionLockingCap(newLockingCap),
+    { from: unionBridgeAuthorizerMember2Address }
+  );
+};
+
 const assertIncreaseUnionLockingCapVotedEventWasEmitted = (newLockingCap, authorizedMember, txReceipt) => {
   const IncreaseUnionLockingCapVotedEvent = 'IncreaseUnionLockingCapVoted';
   const foundIncreaseLockingCapEvent = txReceipt.events[IncreaseUnionLockingCapVotedEvent];
@@ -727,9 +730,9 @@ const assertNoUnionTransferredPermissionsIsStored = async () => {
   expect(actualReleasePermissionEncoded).to.equal(NO_VALUE);
 }
 
-const setUnionTransferPermissions = async (requestEnabled, releaseEnabled, fromAddress, checkCallback) => {
+const setUnionTransferPermissions = async (requestEnabled, releaseEnabled) => {
   // First vote from member 1
-  const txReceiptFirstVote = await voteToIncreaseUnionBridgeLockingCap(requestEnabled, releaseEnabled, unionBridgeAuthorizerMember1Address);
+  const txReceiptFirstVote = await voteToSetUnionTransferPermissions(requestEnabled, releaseEnabled, unionBridgeAuthorizerMember1Address);
   assertUnionTransferPermissionsVotedEventWasEmitted(requestEnabled, releaseEnabled, unionBridgeAuthorizerMember1Address, txReceiptFirstVote);
 
   // Second vote from member 2 (reaches the threshold and executes)