Remove permit from erc20votes

contracts/mocks/ERC20VotesCompMock.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 import "../token/ERC20/extensions/ERC20VotesComp.sol";
 
 contract ERC20VotesCompMock is ERC20VotesComp {
-    constructor(string memory name, string memory symbol) ERC20(name, symbol) ERC20Permit(name) {}
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) EIP712(name, "1") {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/mocks/ERC20VotesMock.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 import "../token/ERC20/extensions/ERC20Votes.sol";
 
 contract ERC20VotesMock is ERC20Votes {
-    constructor(string memory name, string memory symbol) ERC20(name, symbol) ERC20Permit(name) {}
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) EIP712(name, "1") {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/token/ERC20/extensions/ERC20Votes.sol

@@ -3,10 +3,12 @@
 
 pragma solidity ^0.8.0;
 
-import "./ERC20Permit.sol";
+import "../ERC20.sol";
 import "../../../utils/math/Math.sol";
+import "../../../utils/Nonces.sol";
 import "../../../governance/utils/IVotes.sol";
 import "../../../utils/math/SafeCast.sol";
+import "../../../utils/cryptography/EIP712.sol";
 import "../../../utils/cryptography/ECDSA.sol";
 
 /**
@@ -24,7 +26,7 @@ import "../../../utils/cryptography/ECDSA.sol";
  *
  * _Available since v4.2._
  */
-abstract contract ERC20Votes is IVotes, ERC20Permit {
+abstract contract ERC20Votes is ERC20, IVotes, Nonces, EIP712 {
     struct Checkpoint {
         uint32 fromBlock;
         uint224 votes;

test/token/ERC20/extensions/ERC20Votes.test.js

@@ -11,7 +11,7 @@ const Wallet = require('ethereumjs-wallet').default;
 const ERC20VotesMock = artifacts.require('ERC20VotesMock');
 
 const { batchInBlock } = require('../../../helpers/txpool');
-const { EIP712Domain, domainSeparator } = require('../../../helpers/eip712');
+const { EIP712Domain } = require('../../../helpers/eip712');
 
 const Delegation = [
   { name: 'delegatee', type: 'address' },
@@ -20,7 +20,7 @@ const Delegation = [
 ];
 
 contract('ERC20Votes', function (accounts) {
-  const [ holder, recipient, holderDelegatee, recipientDelegatee, other1, other2 ] = accounts;
+  const [ holder, recipient, holderDelegatee, other1, other2 ] = accounts;
 
   const name = 'My Token';
   const symbol = 'MTKN';
@@ -40,14 +40,6 @@ contract('ERC20Votes', function (accounts) {
     expect(await this.token.nonces(holder)).to.be.bignumber.equal('0');
   });
 
-  it('domain separator', async function () {
-    expect(
-      await this.token.DOMAIN_SEPARATOR(),
-    ).to.equal(
-      await domainSeparator(name, version, this.chainId, this.token.address),
-    );
-  });
-
   it('minting restriction', async function () {
     const amount = new BN('2').pow(new BN('224'));
     await expectRevert(

test/token/ERC20/extensions/ERC20VotesComp.test.js

@@ -2,7 +2,7 @@
 
 const { BN, constants, expectEvent, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
-const { MAX_UINT256, ZERO_ADDRESS, ZERO_BYTES32 } = constants;
+const { MAX_UINT256, ZERO_ADDRESS } = constants;
 
 const { fromRpcSig } = require('ethereumjs-util');
 const ethSigUtil = require('eth-sig-util');
@@ -11,7 +11,7 @@ const Wallet = require('ethereumjs-wallet').default;
 const ERC20VotesCompMock = artifacts.require('ERC20VotesCompMock');
 
 const { batchInBlock } = require('../../../helpers/txpool');
-const { EIP712Domain, domainSeparator } = require('../../../helpers/eip712');
+const { EIP712Domain } = require('../../../helpers/eip712');
 
 const Delegation = [
   { name: 'delegatee', type: 'address' },
@@ -20,7 +20,7 @@ const Delegation = [
 ];
 
 contract('ERC20VotesComp', function (accounts) {
-  const [ holder, recipient, holderDelegatee, recipientDelegatee, other1, other2 ] = accounts;
+  const [ holder, recipient, holderDelegatee, other1, other2 ] = accounts;
 
   const name = 'My Token';
   const symbol = 'MTKN';
@@ -40,14 +40,6 @@ contract('ERC20VotesComp', function (accounts) {
     expect(await this.token.nonces(holder)).to.be.bignumber.equal('0');
   });
 
-  it('domain separator', async function () {
-    expect(
-      await this.token.DOMAIN_SEPARATOR(),
-    ).to.equal(
-      await domainSeparator(name, version, this.chainId, this.token.address),
-    );
-  });
-
   it('minting restriction', async function () {
     const amount = new BN('2').pow(new BN('96'));
     await expectRevert(