From 42bd63deb5e6d295dabf3db4dfcd2e274dd2e3e5 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Tue, 17 Sep 2024 11:06:20 -0700 Subject: [PATCH] Remove Cadence 1.0 Migration Features (#685) --- .metadata/notifications.json | 16 +--------------- extension/index.d.ts | 1 - .../installers/flow-cli-installer.ts | 2 +- extension/src/flow-cli/cli-versions-provider.ts | 1 - extension/test/fixtures/workspace/Error.cdc | 4 ++-- .../test/fixtures/workspace/FooContract.cdc | 2 +- extension/test/fixtures/workspace/Script.cdc | 2 +- extension/test/fixtures/workspace/Tx.cdc | 2 +- .../test/fixtures/workspace/test/bar/test2.cdc | 4 ++-- .../test/fixtures/workspace/test/bar/test3.cdc | 4 ++-- extension/test/fixtures/workspace/test/test1.cdc | 2 +- .../test/integration/6 - test-provider.test.ts | 2 +- package-lock.json | 14 ++++---------- package.json | 3 +-- 14 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.metadata/notifications.json b/.metadata/notifications.json index 6cb767a0..fe51488c 100644 --- a/.metadata/notifications.json +++ b/.metadata/notifications.json @@ -1,15 +1 @@ -[ - { - "_type": "Notification", - "id": "1", - "type": "info", - "text": "Cadence 1.0 pre-release builds are now available! Developers should begin upgrading their projects - see the Cadence 1.0 Migration Guide for more details.", - "buttons": [ - { - "label": "Learn More", - "link": "https://cadence-lang.org/docs/cadence_migration_guide" - } - ], - "suppressable": false - } -] +[] diff --git a/extension/index.d.ts b/extension/index.d.ts index 234a7281..0653b5c2 100644 --- a/extension/index.d.ts +++ b/extension/index.d.ts @@ -1,4 +1,3 @@ -declare module '@onflow/decode' declare module 'portscanner-sync' declare module 'elliptic' declare module 'node-fetch' diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index 1a8d73c9..ec650af0 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -16,7 +16,7 @@ interface HomebrewVersionInfo { } // Command to check flow-cli -const COMPATIBLE_FLOW_CLI_VERSIONS = '>=1.6.0' +const COMPATIBLE_FLOW_CLI_VERSIONS = '>=2.0.0' // Shell install commands const BREW_INSTALL_FLOW_CLI = 'brew update && brew install flow-cli' diff --git a/extension/src/flow-cli/cli-versions-provider.ts b/extension/src/flow-cli/cli-versions-provider.ts index 035677ac..53b2fd2a 100644 --- a/extension/src/flow-cli/cli-versions-provider.ts +++ b/extension/src/flow-cli/cli-versions-provider.ts @@ -9,7 +9,6 @@ const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowComma export enum KNOWN_FLOW_COMMANDS { DEFAULT = 'flow', - CADENCE_V1 = 'flow-c1', } // Matches the version number from the output of the Flow CLI diff --git a/extension/test/fixtures/workspace/Error.cdc b/extension/test/fixtures/workspace/Error.cdc index 403094fd..c76c4372 100644 --- a/extension/test/fixtures/workspace/Error.cdc +++ b/extension/test/fixtures/workspace/Error.cdc @@ -1,9 +1,9 @@ /** Careful: this cadence code is purposely written with errors so we can test error marking */ -pub contract interface Foo { +access(all) contract interface Foo { - pub var bar: UInt6 + access(all) var bar: UInt6 fun zoo() { return 2 diff --git a/extension/test/fixtures/workspace/FooContract.cdc b/extension/test/fixtures/workspace/FooContract.cdc index 7b29879c..3acddebd 100644 --- a/extension/test/fixtures/workspace/FooContract.cdc +++ b/extension/test/fixtures/workspace/FooContract.cdc @@ -1,2 +1,2 @@ -pub contract FooContract {} +access(all) contract FooContract {} \ No newline at end of file diff --git a/extension/test/fixtures/workspace/Script.cdc b/extension/test/fixtures/workspace/Script.cdc index f26d9775..6d5d8f76 100644 --- a/extension/test/fixtures/workspace/Script.cdc +++ b/extension/test/fixtures/workspace/Script.cdc @@ -1,4 +1,4 @@ -pub fun main(): UFix64 { +access(all) fun main(): UFix64 { return 42.0 } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/Tx.cdc b/extension/test/fixtures/workspace/Tx.cdc index 1bc16e44..3e65ee96 100644 --- a/extension/test/fixtures/workspace/Tx.cdc +++ b/extension/test/fixtures/workspace/Tx.cdc @@ -1,7 +1,7 @@ transaction() { let guest: Address - prepare(authorizer: AuthAccount) { + prepare(authorizer: &Account) { self.guest = authorizer.address } diff --git a/extension/test/fixtures/workspace/test/bar/test2.cdc b/extension/test/fixtures/workspace/test/bar/test2.cdc index 045a2f2e..2c4d146b 100644 --- a/extension/test/fixtures/workspace/test/bar/test2.cdc +++ b/extension/test/fixtures/workspace/test/bar/test2.cdc @@ -1,9 +1,9 @@ import Test -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } -pub fun testFailing() { +access(all) fun testFailing() { Test.assert(false) } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/test/bar/test3.cdc b/extension/test/fixtures/workspace/test/bar/test3.cdc index 36fb0e8e..9f4fad4f 100644 --- a/extension/test/fixtures/workspace/test/bar/test3.cdc +++ b/extension/test/fixtures/workspace/test/bar/test3.cdc @@ -1,9 +1,9 @@ import Test -pub fun testFailing() { +access(all) fun testFailing() { Test.assert(false) } -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/test/test1.cdc b/extension/test/fixtures/workspace/test/test1.cdc index 1d6e42f1..b76a42c7 100644 --- a/extension/test/fixtures/workspace/test/test1.cdc +++ b/extension/test/fixtures/workspace/test/test1.cdc @@ -1,5 +1,5 @@ import Test -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } \ No newline at end of file diff --git a/extension/test/integration/6 - test-provider.test.ts b/extension/test/integration/6 - test-provider.test.ts index 88fae7f8..f20f790c 100644 --- a/extension/test/integration/6 - test-provider.test.ts +++ b/extension/test/integration/6 - test-provider.test.ts @@ -123,7 +123,7 @@ suite('test provider tests', () => { const testFilePath = path.join(workspacePath, 'test/bar/test4.cdc') const testFileContents = ` import Test - pub fun testPassing() { + access(all) fun testPassing() { Test.assert(true) } ` diff --git a/package-lock.json b/package-lock.json index d4acab89..6130e7a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,7 @@ "name": "cadence", "version": "2.3.5", "dependencies": { - "@onflow/cadence-parser": "^0.42.1", - "@onflow/decode": "0.0.11", + "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", @@ -1511,18 +1510,13 @@ } }, "node_modules/@onflow/cadence-parser": { - "version": "0.42.1", - "resolved": "https://registry.npmjs.org/@onflow/cadence-parser/-/cadence-parser-0.42.1.tgz", - "integrity": "sha512-bFktvPp8OLVA6Xzd/MyjtlQW7OkhzTzp/+N5E6s/8Bs5ebZ2nQRKB79FnL/hChKlZ8e+X+mmoBVflJojiYQO5Q==", + "version": "1.0.0-preview.50", + "resolved": "https://registry.npmjs.org/@onflow/cadence-parser/-/cadence-parser-1.0.0-preview.50.tgz", + "integrity": "sha512-8V7OnyccxrYJioMbSQbHRBC/eRLqH6bf2yEaduD0bYtiR4AsOg5lP52bsC903Qpb28NHcDZtXILwkai4BOzYBQ==", "dependencies": { "get-random-values": "^2.0.0" } }, - "node_modules/@onflow/decode": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/@onflow/decode/-/decode-0.0.11.tgz", - "integrity": "sha512-i4JTznywSpXTyBIwnrzEXqEBJRZu8xYDRS4Q0mTzP1+0GdESm+Wq44qvtN68vEcNNfSLJixKeGs/T0nvkJDh4A==" - }, "node_modules/@opentelemetry/api": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", diff --git a/package.json b/package.json index 3cf1873d..b1e1b0b4 100644 --- a/package.json +++ b/package.json @@ -212,8 +212,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@onflow/cadence-parser": "^0.42.1", - "@onflow/decode": "0.0.11", + "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1",