diff --git a/contracts/solc-0.6/AlreadyUpgradeable.sol b/contracts/solc-0.6/AlreadyUpgradeable.sol deleted file mode 100644 index 38f690aa..00000000 --- a/contracts/solc-0.6/AlreadyUpgradeable.sol +++ /dev/null @@ -1,4 +0,0 @@ -pragma solidity ^0.6.0; - -contract AlreadyUpgradeable { -} diff --git a/src/index.ts b/src/index.ts index b2c80c47..cbe3a11c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,7 @@ import { mapValues } from 'lodash'; import { minimatch } from 'minimatch'; import { matcher } from './utils/matcher'; -import { renamePath, isRenamed } from './rename'; +import { renamePath } from './rename'; import { SolcOutput, SolcInput } from './solc/input-output'; import { Transform } from './transform'; import { generateWithInit } from './generate-with-init'; @@ -90,7 +90,7 @@ export async function transpile( }; const transform = new Transform(solcInput, solcOutput, { - exclude: source => excludeSet.has(source) || (excludeMatch(source) ?? isRenamed(source)), + exclude: source => excludeSet.has(source) || !!excludeMatch(source), }); if (options.peerProject !== undefined) { diff --git a/src/transform.test.ts b/src/transform.test.ts index a8fb0f9e..03bfa58f 100644 --- a/src/transform.test.ts +++ b/src/transform.test.ts @@ -113,12 +113,6 @@ test('transform contract name', t => { t.snapshot(t.context.transform.results()[file]); }); -test('skip contract rename when Upgradeable suffix', t => { - const file = 'contracts/solc-0.6/AlreadyUpgradeable.sol'; - t.context.transform.apply(renameContractDefinition); - t.snapshot(t.context.transform.results()[file]); -}); - test('fix import directives', t => { const file = 'contracts/solc-0.6/Local.sol'; t.context.transform.apply(fixImportDirectives(false)); diff --git a/src/transform.test.ts.md b/src/transform.test.ts.md index bb171fe6..7977675a 100644 --- a/src/transform.test.ts.md +++ b/src/transform.test.ts.md @@ -151,16 +151,6 @@ Generated by [AVA](https://avajs.dev). }␊ ` -## skip contract rename when Upgradeable suffix - -> Snapshot 1 - - `pragma solidity ^0.6.0;␊ - ␊ - contract AlreadyUpgradeable {␊ - }␊ - ` - ## fix import directives > Snapshot 1 diff --git a/src/transform.test.ts.snap b/src/transform.test.ts.snap index 34104a1e..6206a7ee 100644 Binary files a/src/transform.test.ts.snap and b/src/transform.test.ts.snap differ