fix: remove redundant scripts and remove protocol version getter

aragon · Mar 4, 2024 · f298b7e · f298b7e
1 parent 06aab6a
commit f298b7e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 130 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -10,8 +10,6 @@
     "lint:sol": "cd ../../ && yarn run lint:contracts:sol",
     "lint:ts": "cd ../../ && yarn run lint:contracts:ts",
     "test": "hardhat test",
-    "typechain:osx": "ts-node scripts/generate-typechain-osx.ts",
-    "typechain:osx-versions": "ts-node scripts/generate-typechain-osx-versions.ts",
     "typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
     "clean": "rimraf ./artifacts ./cache ./coverage ./typechain ./types ./coverage.json && yarn typechain"
   },

diff --git a/packages/contracts/scripts/generate-typechain-osx-versions.ts b/packages/contracts/scripts/generate-typechain-osx-versions.ts
diff --git a/packages/contracts/scripts/generate-typechain-osx.ts b/packages/contracts/scripts/generate-typechain-osx.ts
diff --git a/packages/contracts/scripts/osx-versions-aliases.ts b/packages/contracts/scripts/osx-versions-aliases.ts
diff --git a/packages/contracts/test/10_unit-testing/token-voting/11_token-voting.ts b/packages/contracts/test/10_unit-testing/token-voting/11_token-voting.ts
@@ -19,7 +19,6 @@ import {
   MAJORITY_VOTING_BASE_INTERFACE,
   VOTING_EVENTS,
 } from '../../test-utils/majority-voting-constants';
-import {osxContractsVersion} from '../../test-utils/protocol-version';
 import {deployWithProxy} from '../../test-utils/proxy';
 import {
   TOKEN_VOTING_INTERFACE,
@@ -250,7 +249,7 @@ describe('TokenVoting', function () {
       );
       expect(fromProtocolVersion).to.not.deep.equal(toProtocolVersion);
       expect(fromProtocolVersion).to.deep.equal([1, 0, 0]);
-      expect(toProtocolVersion).to.deep.equal(osxContractsVersion());
+      expect(toProtocolVersion).to.deep.equal([1, 4, 0]);
     });
 
     it('from v1.3.0', async () => {
@@ -278,7 +277,7 @@ describe('TokenVoting', function () {
       );
       expect(fromProtocolVersion).to.not.deep.equal(toProtocolVersion);
       expect(fromProtocolVersion).to.deep.equal([1, 0, 0]);
-      expect(toProtocolVersion).to.deep.equal(osxContractsVersion());
+      expect(toProtocolVersion).to.deep.equal([1, 4, 0]);
     });
   });
 

diff --git a/packages/contracts/test/test-utils/protocol-version.ts b/packages/contracts/test/test-utils/protocol-version.ts
@@ -1,15 +1,4 @@
-import {version} from '../../package.json';
-
 // The protocol version number of contracts not having a `getProtocolVersion()` function because they don't inherit from `ProtocolVersion.sol` yet.
 export const IMPLICIT_INITIAL_PROTOCOL_VERSION: [number, number, number] = [
   1, 0, 0,
 ];
-
-/**
- * Returns the NPM version number from the `osx` package.json file
- */
-export function osxContractsVersion(): [number, number, number] {
-  const trimmedVersion = version.split('-')[0];
-  const semver = trimmedVersion.split('.');
-  return [Number(semver[0]), Number(semver[1]), Number(semver[2])];
-}
diff --git a/packages/contracts/test/test-utils/typechain-versions.ts b/packages/contracts/test/test-utils/typechain-versions.ts
@@ -3,19 +3,19 @@
 /// Import as needed in the test files, and use the correct version of the contract.
 
 /* TokenVoting */
-export {TokenVoting__factory as TokenVoting_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.1/plugins/governance/majority-voting/token/TokenVoting__factory';
+export {TokenVoting__factory as TokenVoting_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.0/plugins/governance/majority-voting/token/TokenVoting__factory';
 export {TokenVoting__factory as TokenVoting_V1_3_0__factory} from '../../typechain/factories/@aragon/osx-v1.3.0/plugins/governance/majority-voting/token/TokenVoting__factory';
 export {TokenVoting__factory} from '../../typechain/factories/src/TokenVoting__factory';
 export {TokenVoting} from '../../typechain/src/TokenVoting';
 
 /* Governance ERC20 */
-export {GovernanceERC20__factory as GovernanceERC20_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.1/token/ERC20/governance/GovernanceERC20__factory';
+export {GovernanceERC20__factory as GovernanceERC20_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.0/token/ERC20/governance/GovernanceERC20__factory';
 export {GovernanceERC20__factory as GovernanceERC20_V1_3_0__factory} from '../../typechain/factories/@aragon/osx-v1.3.0/token/ERC20/governance/GovernanceERC20__factory';
 export {GovernanceERC20__factory} from '../../typechain/factories/src/ERC20/governance/GovernanceERC20__factory';
 export {GovernanceERC20} from '../../typechain/src/ERC20/governance/GovernanceERC20';
 
 /* Governance Wrapped ERC20 */
-export {GovernanceWrappedERC20__factory as GovernanceWrappedERC20_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.1/token/ERC20/governance/GovernanceWrappedERC20__factory';
+export {GovernanceWrappedERC20__factory as GovernanceWrappedERC20_V1_0_0__factory} from '../../typechain/factories/@aragon/osx-v1.0.0/token/ERC20/governance/GovernanceWrappedERC20__factory';
 export {GovernanceWrappedERC20__factory as GovernanceWrappedERC20_V1_3_0__factory} from '../../typechain/factories/@aragon/osx-v1.3.0/token/ERC20/governance/GovernanceWrappedERC20__factory';
 export {GovernanceWrappedERC20__factory} from '../../typechain/factories/src/ERC20/governance/GovernanceWrappedERC20__factory';
 export {GovernanceWrappedERC20} from '../../typechain/src/ERC20/governance/GovernanceWrappedERC20';
diff --git a/packages/contracts/yarn.lock b/packages/contracts/yarn.lock
@@ -63,7 +63,7 @@
   dependencies:
     ethers "^5.6.2"
 
-"@aragon/osx-v1.0.1@npm:@aragon/[email protected]":
+"@aragon/osx-v1.0.0@npm:@aragon/[email protected]":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@aragon/osx/-/osx-1.0.1.tgz#b758ba87db93a46a8ddabfaefc99ac8e44c46c78"
   integrity sha512-TiP5/1AGv/hth+V8PoDVFlwMzmLazYxzp//jiepAZ0WJkx9EnQNYafo+M7+pjAqRPG005liQjmFZNiK6ARLULg==