rename extension

Author: arr00

contracts/governance/Governor.sol

@@ -631,17 +631,15 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
         address voter,
         uint256 /* proposalId */,
         bytes memory signature,
-        bytes memory rawSignatureDigestData,
+        bytes memory digestPreimage,
         uint256 noncePositionOffset
     ) internal virtual returns (bool) {
         uint256 nonce = nonces(voter);
         assembly ("memory-safe") {
-            mstore(add(rawSignatureDigestData, noncePositionOffset), nonce)
+            mstore(add(digestPreimage, noncePositionOffset), nonce)
         }
 
-        if (
-            SignatureChecker.isValidSignatureNow(voter, _hashTypedDataV4(keccak256(rawSignatureDigestData)), signature)
-        ) {
+        if (SignatureChecker.isValidSignatureNow(voter, _hashTypedDataV4(keccak256(digestPreimage)), signature)) {
             _useNonce(voter);
             return true;
         }

contracts/governance/extensions/GovernorKeyedNonces.sol contracts/governance/extensions/GovernorNoncesKeyed.sol

@@ -7,7 +7,7 @@ import {Nonces} from "../../utils/Nonces.sol";
 import {NoncesKeyed} from "../../utils/NoncesKeyed.sol";
 import {SignatureChecker} from "../../utils/cryptography/SignatureChecker.sol";
 
-abstract contract GovernorKeyedNonces is Governor, NoncesKeyed {
+abstract contract GovernorNoncesKeyed is Governor, NoncesKeyed {
     function _useCheckedNonce(address owner, uint256 nonce) internal virtual override(Nonces, NoncesKeyed) {
         super._useCheckedNonce(owner, nonce);
     }
@@ -16,22 +16,20 @@ abstract contract GovernorKeyedNonces is Governor, NoncesKeyed {
         address voter,
         uint256 proposalId,
         bytes memory signature,
-        bytes memory rawSignatureDigestData,
+        bytes memory digestPreimage,
         uint256 noncePositionOffset
     ) internal virtual override returns (bool) {
-        if (super._validateVoteSignature(voter, proposalId, signature, rawSignatureDigestData, noncePositionOffset)) {
+        if (super._validateVoteSignature(voter, proposalId, signature, digestPreimage, noncePositionOffset)) {
             return true;
         }
 
         // uint192 is sufficient entropy for proposalId within nonce keys.
         uint256 keyedNonce = nonces(voter, uint192(proposalId));
         assembly ("memory-safe") {
-            mstore(add(rawSignatureDigestData, noncePositionOffset), keyedNonce)
+            mstore(add(digestPreimage, noncePositionOffset), keyedNonce)
         }
 
-        if (
-            SignatureChecker.isValidSignatureNow(voter, _hashTypedDataV4(keccak256(rawSignatureDigestData)), signature)
-        ) {
+        if (SignatureChecker.isValidSignatureNow(voter, _hashTypedDataV4(keccak256(digestPreimage)), signature)) {
             _useNonce(voter, uint192(proposalId));
             return true;
         }

contracts/mocks/governance/GovernorKeyedNoncesMock.sol contracts/mocks/governance/GovernorNoncesKeyedMock.sol

@@ -7,13 +7,13 @@ import {GovernorSettings} from "../../governance/extensions/GovernorSettings.sol
 import {GovernorCountingSimple} from "../../governance/extensions/GovernorCountingSimple.sol";
 import {GovernorVotesQuorumFraction} from "../../governance/extensions/GovernorVotesQuorumFraction.sol";
 import {GovernorProposalGuardian} from "../../governance/extensions/GovernorProposalGuardian.sol";
-import {GovernorKeyedNonces} from "../../governance/extensions/GovernorKeyedNonces.sol";
+import {GovernorNoncesKeyed} from "../../governance/extensions/GovernorNoncesKeyed.sol";
 
-abstract contract GovernorKeyedNoncesMock is
+abstract contract GovernorNoncesKeyedMock is
     GovernorSettings,
     GovernorVotesQuorumFraction,
     GovernorCountingSimple,
-    GovernorKeyedNonces
+    GovernorNoncesKeyed
 {
     function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
         return super.proposalThreshold();
@@ -25,11 +25,11 @@ abstract contract GovernorKeyedNoncesMock is
         bytes memory signature,
         bytes memory rawSignatureDigestData,
         uint256 noncePositionOffset
-    ) internal virtual override(Governor, GovernorKeyedNonces) returns (bool) {
+    ) internal virtual override(Governor, GovernorNoncesKeyed) returns (bool) {
         return super._validateVoteSignature(voter, proposalId, signature, rawSignatureDigestData, noncePositionOffset);
     }
 
-    function _useCheckedNonce(address owner, uint256 nonce) internal virtual override(Nonces, GovernorKeyedNonces) {
+    function _useCheckedNonce(address owner, uint256 nonce) internal virtual override(Nonces, GovernorNoncesKeyed) {
         super._useCheckedNonce(owner, nonce);
     }
 }

test/governance/extensions/GovernorKeyedNonces.test.js test/governance/extensions/GovernorNoncesKeyed.test.js

@@ -25,14 +25,14 @@ const signBallot = account => (contract, message) =>
 const signExtendedBallot = account => (contract, message) =>
   getDomain(contract).then(domain => account.signTypedData(domain, { ExtendedBallot }, message));
 
-describe('GovernorKeyedNonces', function () {
+describe('GovernorNoncesKeyed', function () {
   for (const { Token, mode } of TOKENS) {
     const fixture = async () => {
       const [owner, proposer, voter1, voter2, voter3, voter4, userEOA] = await ethers.getSigners();
       const receiver = await ethers.deployContract('CallReceiverMock');
 
       const token = await ethers.deployContract(Token, [tokenName, tokenSymbol, tokenName, version]);
-      const mock = await ethers.deployContract('$GovernorKeyedNoncesMock', [
+      const mock = await ethers.deployContract('$GovernorNoncesKeyedMock', [
         name, // name
         votingDelay, // initialVotingDelay
         votingPeriod, // initialVotingPeriod