forge fmt

Author: davidlaprade

src/FlexVotingClient.sol

@@ -185,15 +185,12 @@ abstract contract FlexVotingClient {
     //     totalVotesInternal         totalTokenWeight
     //
     // userVoteWeight = userVotesInternal * totalTokenWeight / totalVotesInternal
-    uint128 _forVotesToCast = SafeCast.toUint128(
-      (_totalTokenWeight * _proposalVote.forVotes) / _totalVotesInternal
-    );
-    uint128 _againstVotesToCast = SafeCast.toUint128(
-      (_totalTokenWeight * _proposalVote.againstVotes) / _totalVotesInternal
-    );
-    uint128 _abstainVotesToCast = SafeCast.toUint128(
-      (_totalTokenWeight * _proposalVote.abstainVotes) / _totalVotesInternal
-    );
+    uint128 _forVotesToCast =
+      SafeCast.toUint128((_totalTokenWeight * _proposalVote.forVotes) / _totalVotesInternal);
+    uint128 _againstVotesToCast =
+      SafeCast.toUint128((_totalTokenWeight * _proposalVote.againstVotes) / _totalVotesInternal);
+    uint128 _abstainVotesToCast =
+      SafeCast.toUint128((_totalTokenWeight * _proposalVote.abstainVotes) / _totalVotesInternal);
 
     // Clear the stored votes so that we don't double-cast them.
     delete proposalVotes[proposalId];
@@ -205,10 +202,10 @@ abstract contract FlexVotingClient {
     );
   }
 
-  function _applyDeltaToCheckpoint(
-    Checkpoints.Trace208 storage _checkpoint,
-    int256 _delta
-  ) internal returns (uint208 _prevTotal, uint208 _newTotal) {
+  function _applyDeltaToCheckpoint(Checkpoints.Trace208 storage _checkpoint, int256 _delta)
+    internal
+    returns (uint208 _prevTotal, uint208 _newTotal)
+  {
     // The casting in this function is safe since:
     // - if oldTotal + delta > int256.max it will panic and revert.
     // - if |delta| <= oldTotal there is no risk of wrapping
@@ -234,10 +231,7 @@ abstract contract FlexVotingClient {
   }
 
   /// @dev Checkpoints internal voting weight of `user` after applying `_delta`.
-  function _checkpointVoteWeightOf(
-    address _user,
-    int256 _delta
-  ) internal virtual {
+  function _checkpointVoteWeightOf(address _user, int256 _delta) internal virtual {
     _applyDeltaToCheckpoint(voteWeightCheckpoints[_user], _delta);
   }
 

src/FlexVotingDelegatable.sol

@@ -48,10 +48,7 @@ abstract contract FlexVotingDelegatable is Context, FlexVotingClient {
     _updateDelegateBalance(oldDelegate, delegatee, _delta);
   }
 
-  function _checkpointVoteWeightOf(
-    address _user,
-    int256 _delta
-  ) internal virtual override {
+  function _checkpointVoteWeightOf(address _user, int256 _delta) internal virtual override {
     address _proxy = delegates(_user);
     _applyDeltaToCheckpoint(voteWeightCheckpoints[_proxy], _delta);
   }
@@ -66,8 +63,7 @@ abstract contract FlexVotingDelegatable is Context, FlexVotingClient {
     emit DelegateWeightChanged(from, _oldFrom, _newFrom);
 
     // Increment new delegate's weight.
-    (uint208 _oldTo, uint208 _newTo) =
-      _applyDeltaToCheckpoint(voteWeightCheckpoints[to], _delta);
+    (uint208 _oldTo, uint208 _newTo) = _applyDeltaToCheckpoint(voteWeightCheckpoints[to], _delta);
     emit DelegateWeightChanged(to, _oldTo, _newTo);
   }
 }

test/FlexVotingDelegatable.t.sol

@@ -338,14 +338,12 @@ abstract contract Delegation is FlexVotingClientTest {
     vm.prank(_delegateB);
     client().expressVote(_proposalB, uint8(_voteType));
 
-    (uint256 _againstA, uint256 _forA, uint256 _abstainA) =
-      client().proposalVotes(_proposalA);
-    assertEq(_forA,     _voteType == GCS.VoteType.For ? _weight : 0);
+    (uint256 _againstA, uint256 _forA, uint256 _abstainA) = client().proposalVotes(_proposalA);
+    assertEq(_forA, _voteType == GCS.VoteType.For ? _weight : 0);
     assertEq(_againstA, _voteType == GCS.VoteType.Against ? _weight : 0);
     assertEq(_abstainA, _voteType == GCS.VoteType.Abstain ? _weight : 0);
 
-    (uint256 _againstB, uint256 _forB, uint256 _abstainB) =
-      client().proposalVotes(_proposalB);
+    (uint256 _againstB, uint256 _forB, uint256 _abstainB) = client().proposalVotes(_proposalB);
     assertEq(_forB, _voteType == GCS.VoteType.For ? _weight : 0);
     assertEq(_againstB, _voteType == GCS.VoteType.Against ? _weight : 0);
     assertEq(_abstainB, _voteType == GCS.VoteType.Abstain ? _weight : 0);

test/MockFlexVotingDelegatableClient.sol

@@ -8,10 +8,10 @@ import {MockFlexVotingClient} from "test/MockFlexVotingClient.sol";
 contract MockFlexVotingDelegatableClient is MockFlexVotingClient, FlexVotingDelegatable {
   constructor(address _governor) MockFlexVotingClient(_governor) {}
 
-  function _checkpointVoteWeightOf(
-    address _user,
-    int256 _delta
-  ) internal override(FlexVotingClient, FlexVotingDelegatable) {
+  function _checkpointVoteWeightOf(address _user, int256 _delta)
+    internal
+    override(FlexVotingClient, FlexVotingDelegatable)
+  {
     return FlexVotingDelegatable._checkpointVoteWeightOf(_user, _delta);
   }
 }