Remove TokenTimelock, PaymentSplitter, ERC20Snapshot, ERC20VotesComp, GovernorVotesComp

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+### Removals
+
+The following contracts were removed:
+
+- `ERC20Snapshot`
+- `ERC20VotesComp`
+- `GovernorVotesComp`
+- `PaymentSplitter`
+- `TokenTimelock` (removed in favor of `VestingWallet`)
+
 ### How to upgrade from 4.x
 
 #### ERC20, ERC721, and ERC1155

contracts/finance/README.adoc

@@ -5,16 +5,10 @@ NOTE: This document is better viewed at https://docs.openzeppelin.com/contracts/
 
 This directory includes primitives for financial systems:
 
-- {PaymentSplitter} allows to split Ether and ERC20 payments among a group of accounts. The sender does not need to be
-  aware that the assets will be split in this way, since it is handled transparently by the contract. The split can be
-  in equal parts or in any other arbitrary proportion.
-
 - {VestingWallet} handles the vesting of Ether and ERC20 tokens for a given beneficiary. Custody of multiple tokens can
   be given to this contract, which will release the token to the beneficiary following a given, customizable, vesting
   schedule.
 
 == Contracts
 
-{{PaymentSplitter}}
-
 {{VestingWallet}}

contracts/finance/VestingWallet.sol

@@ -15,6 +15,9 @@ import "../utils/Context.sol";
  * Any token transferred to this contract will follow the vesting schedule as if they were locked from the beginning.
  * Consequently, if the vesting has already started, any amount of tokens sent to this contract will (at least partly)
  * be immediately releasable.
+ *
+ * By setting the duration to 0, one can configure this contract to behave like an asset timelock that hold tokens for
+ * a beneficiary until a specified time.
  */
 contract VestingWallet is Context {
     event EtherReleased(uint256 amount);
@@ -62,6 +65,13 @@ contract VestingWallet is Context {
         return _duration;
     }
 
+    /**
+     * @dev Getter for the end timestamp.
+     */
+    function end() public view virtual returns (uint256) {
+        return start() + duration();
+    }
+
     /**
      * @dev Amount of eth already released
      */
@@ -136,7 +146,7 @@ contract VestingWallet is Context {
     function _vestingSchedule(uint256 totalAllocation, uint64 timestamp) internal view virtual returns (uint256) {
         if (timestamp < start()) {
             return 0;
-        } else if (timestamp > start() + duration()) {
+        } else if (timestamp > end()) {
             return totalAllocation;
         } else {
             return (totalAllocation * (timestamp - start())) / duration();

contracts/governance/README.adoc

@@ -22,8 +22,6 @@ Votes modules determine the source of voting power, and sometimes quorum number.
 
 * {GovernorVotes}: Extracts voting weight from an {ERC20Votes}, or since v4.5 an {ERC721Votes} token.
 
-* {GovernorVotesComp}: Extracts voting weight from a COMP-like or {ERC20VotesComp} token.
-
 * {GovernorVotesQuorumFraction}: Combines with `GovernorVotes` to set the quorum as a fraction of the total token supply.
 
 Counting modules determine valid voting options.
@@ -66,8 +64,6 @@ NOTE: Functions of the `Governor` contract do not include access control. If you
 
 {{GovernorVotesQuorumFraction}}
 
-{{GovernorVotesComp}}
-
 === Extensions
 
 {{GovernorTimelockControl}}

contracts/mocks/governance/GovernorCompatibilityBravoMock.sol

@@ -5,13 +5,13 @@ pragma solidity ^0.8.0;
 import "../../governance/compatibility/GovernorCompatibilityBravo.sol";
 import "../../governance/extensions/GovernorTimelockCompound.sol";
 import "../../governance/extensions/GovernorSettings.sol";
-import "../../governance/extensions/GovernorVotesComp.sol";
+import "../../governance/extensions/GovernorVotes.sol";
 
 abstract contract GovernorCompatibilityBravoMock is
     GovernorCompatibilityBravo,
     GovernorSettings,
     GovernorTimelockCompound,
-    GovernorVotesComp
+    GovernorVotes
 {
     function quorum(uint256) public pure override returns (uint256) {
         return 0;