From 064ad6510b469ce1a2554eb871f2fd65bd07f934 Mon Sep 17 00:00:00 2001 From: codingsh Date: Tue, 21 Mar 2023 01:38:48 +0000 Subject: [PATCH] Refactor Sector3Governor.sol The Sector3Governor contract now directly inherits from GovernorVotes, GovernorVotesQuorumFraction, and GovernorCountingSimple. Removed the separate inheritance of Governor and GovernorSettings from Sector3Governor, as GovernorVotes already inherits from these contracts. ref: https://github.com/sector-3/protocol/pull/70#pullrequestreview-1349484298 --- contracts/governance/Sector3Governor.sol | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contracts/governance/Sector3Governor.sol b/contracts/governance/Sector3Governor.sol index 69c92b6..593feca 100644 --- a/contracts/governance/Sector3Governor.sol +++ b/contracts/governance/Sector3Governor.sol @@ -1,16 +1,15 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.19; -import "@openzeppelin/contracts/governance/Governor.sol"; -import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol"; -import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; +import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol"; +import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol"; -contract Sector3Governor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction { +contract Sector3Governor is GovernorVotes, GovernorVotesQuorumFraction, GovernorCountingSimple { constructor(IVotes _token) Governor("Sector#3 Governor") - GovernorSettings(1 /* 1 block */, 50400 /* ~1 week */, 2049e14 /* 0.2049 */) + GovernorSettings(1 /* 1 block */, 50400 /* ~1 week */, 2049e15 /* 2.049 */) GovernorVotes(_token) GovernorVotesQuorumFraction(1) {}