From 35fee49641ef37468199212784182220836ba460 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Tue, 5 Nov 2024 09:01:02 -0500 Subject: [PATCH] Remove IDecentVersion interface and all implementations --- contracts/autonomous-admin/DecentAutonomousAdminV1.sol | 4 ---- contracts/interfaces/IDecentVersion.sol | 6 ------ .../autonomous-admin/IDecentAutonomousAdminV1.sol | 3 +-- test/autonomous-admin/DecentAutonomousAdminV1.test.ts | 6 ------ 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 contracts/interfaces/IDecentVersion.sol diff --git a/contracts/autonomous-admin/DecentAutonomousAdminV1.sol b/contracts/autonomous-admin/DecentAutonomousAdminV1.sol index 1216ba6..3588fc2 100644 --- a/contracts/autonomous-admin/DecentAutonomousAdminV1.sol +++ b/contracts/autonomous-admin/DecentAutonomousAdminV1.sol @@ -20,10 +20,6 @@ contract DecentAutonomousAdminV1 is // ////////////////////////////////////////////////////////////// // Public Functions // ////////////////////////////////////////////////////////////// - function version() external pure override returns (uint32) { - return 1; - } - function triggerStartNextTerm(TriggerStartArgs calldata args) public { IHatsElectionsEligibility hatsElectionModule = IHatsElectionsEligibility( args.hatsProtocol.getHatEligibilityModule(args.hatId) diff --git a/contracts/interfaces/IDecentVersion.sol b/contracts/interfaces/IDecentVersion.sol deleted file mode 100644 index 29ec7f9..0000000 --- a/contracts/interfaces/IDecentVersion.sol +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.28; - -interface IDecentVersion { - function version() external view returns (uint32); -} diff --git a/contracts/interfaces/autonomous-admin/IDecentAutonomousAdminV1.sol b/contracts/interfaces/autonomous-admin/IDecentAutonomousAdminV1.sol index 5943615..efaf624 100644 --- a/contracts/interfaces/autonomous-admin/IDecentAutonomousAdminV1.sol +++ b/contracts/interfaces/autonomous-admin/IDecentAutonomousAdminV1.sol @@ -1,10 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.28; -import {IDecentVersion} from "../IDecentVersion.sol"; import {IHats} from "../hats/IHats.sol"; -interface IDecentAutonomousAdminV1 is IDecentVersion { +interface IDecentAutonomousAdminV1 { error NotCurrentWearer(); struct TriggerStartArgs { diff --git a/test/autonomous-admin/DecentAutonomousAdminV1.test.ts b/test/autonomous-admin/DecentAutonomousAdminV1.test.ts index 3004067..7f67ec4 100644 --- a/test/autonomous-admin/DecentAutonomousAdminV1.test.ts +++ b/test/autonomous-admin/DecentAutonomousAdminV1.test.ts @@ -93,12 +93,6 @@ describe('DecentAutonomousAdminHatV1', function () { await hatsElectionModule.elect(nextTermEnd, [await secondWearer.getAddress()]); }); - describe('version', function () { - it('should return the correct version', async () => { - expect(await decentAutonomousAdminInstance.version()).to.equal(1); - }); - }); - describe('triggerStartNextTerm', function () { describe('before the first term is over', function () { it('should have correct wearers', async () => {