From fe4768a3900f083f8dfdb447fd28201f6d3e1f28 Mon Sep 17 00:00:00 2001 From: Leila Wang Date: Sat, 18 Mar 2023 08:45:33 +0000 Subject: [PATCH] Remove redundant packages. --- .circleci/config.yml | 5 --- README.md | 2 - bootstrap.sh | 2 - build_manifest.json | 14 ------ build_manifest.sh | 2 - yarn-project/barretenberg.js/.eslintrc.cjs | 6 --- yarn-project/barretenberg.js/Dockerfile | 12 ----- yarn-project/barretenberg.js/README.md | 1 - yarn-project/barretenberg.js/package.json | 45 ------------------- yarn-project/barretenberg.js/src/index.ts | 4 -- .../barretenberg.js/tsconfig.dest.json | 4 -- yarn-project/barretenberg.js/tsconfig.json | 9 ---- yarn-project/circuit.js/.eslintrc.cjs | 6 --- yarn-project/circuit.js/Dockerfile | 12 ----- yarn-project/circuit.js/README.md | 1 - yarn-project/circuit.js/package.json | 45 ------------------- yarn-project/circuit.js/src/index.ts | 4 -- yarn-project/circuit.js/tsconfig.dest.json | 4 -- yarn-project/circuit.js/tsconfig.json | 9 ---- yarn-project/package.json | 2 - yarn-project/typedoc.json | 2 - yarn-project/yarn-project-base/Dockerfile | 2 - yarn-project/yarn.lock | 34 -------------- 23 files changed, 227 deletions(-) delete mode 100644 yarn-project/barretenberg.js/.eslintrc.cjs delete mode 100644 yarn-project/barretenberg.js/Dockerfile delete mode 100644 yarn-project/barretenberg.js/README.md delete mode 100644 yarn-project/barretenberg.js/package.json delete mode 100644 yarn-project/barretenberg.js/src/index.ts delete mode 100644 yarn-project/barretenberg.js/tsconfig.dest.json delete mode 100644 yarn-project/barretenberg.js/tsconfig.json delete mode 100644 yarn-project/circuit.js/.eslintrc.cjs delete mode 100644 yarn-project/circuit.js/Dockerfile delete mode 100644 yarn-project/circuit.js/README.md delete mode 100644 yarn-project/circuit.js/package.json delete mode 100644 yarn-project/circuit.js/src/index.ts delete mode 100644 yarn-project/circuit.js/tsconfig.dest.json delete mode 100644 yarn-project/circuit.js/tsconfig.json diff --git a/.circleci/config.yml b/.circleci/config.yml index 2660d81af42d..2ee75b33f112 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,11 +19,6 @@ parameters: workflow: type: string default: "system" - target: - type: enum - default: "dev" - description: The environment to trigger redeploys to - enum: ["dev", "stage", "testnet"] # This build step checks out the code from the repository. It has a hardcoded readonly key to allow the checkout. # Initially it just fetches the repo metadata for the current commit hash to a depth of 50 commits. diff --git a/README.md b/README.md index 780509fdc567..4b17b0aa5981 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ The Aztec 3 system consists of the following sub projects. - `archiver` - `aztec-cli` - `aztec.js` -- `barretenberg.js` -- `circuit.js` - `ethereum.js` - `kernel-simulator` - `key-store` diff --git a/bootstrap.sh b/bootstrap.sh index e210bada8813..e127219de253 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -46,8 +46,6 @@ PROJECTS=( # "yarn-project/acir-simulator:yarn build" # "yarn-project/aztec-cli:yarn build" "yarn-project/aztec.js:yarn build" - # "yarn-project/barretenberg.js:yarn build" - # "yarn-project/circuit.js:yarn build" "yarn-project/archiver:yarn build" # "yarn-project/ethereum.js:yarn build" # "yarn-project/kernel-simulator:yarn build" diff --git a/build_manifest.json b/build_manifest.json index 4027e470ba92..2ede9a8eceef 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -66,20 +66,6 @@ "rebuildPatterns": ["^yarn-project/aztec.js/"], "dependencies": ["yarn-project-base"] }, - "barretenberg.js": { - "buildDir": "yarn-project", - "projectDir": "yarn-project/barretenberg.js", - "dockerfile": "barretenberg.js/Dockerfile", - "rebuildPatterns": ["^yarn-project/barretenberg.js/"], - "dependencies": ["yarn-project-base"] - }, - "circuit.js": { - "buildDir": "yarn-project", - "projectDir": "yarn-project/circuit.js", - "dockerfile": "circuit.js/Dockerfile", - "rebuildPatterns": ["^yarn-project/circuit.js/"], - "dependencies": ["yarn-project-base"] - }, "end-to-end": { "buildDir": "yarn-project", "projectDir": "yarn-project/end-to-end", diff --git a/build_manifest.sh b/build_manifest.sh index c562657fb00a..a376b9a2a47e 100755 --- a/build_manifest.sh +++ b/build_manifest.sh @@ -15,8 +15,6 @@ PROJECTS=( # archiver:yarn-project # aztec-cli:yarn-project # aztec.js:yarn-project - # barretenberg.js:yarn-project - # circuit.js:yarn-project # end-to-end:yarn-project # ethereum.js:yarn-project # kernel-simulator:yarn-project diff --git a/yarn-project/barretenberg.js/.eslintrc.cjs b/yarn-project/barretenberg.js/.eslintrc.cjs deleted file mode 100644 index 9cf806b1500f..000000000000 --- a/yarn-project/barretenberg.js/.eslintrc.cjs +++ /dev/null @@ -1,6 +0,0 @@ -require('@rushstack/eslint-patch/modern-module-resolution'); - -module.exports = { - extends: ['@aztec/eslint-config'], - parserOptions: { tsconfigRootDir: __dirname }, -}; diff --git a/yarn-project/barretenberg.js/Dockerfile b/yarn-project/barretenberg.js/Dockerfile deleted file mode 100644 index 3cf5bdf942ab..000000000000 --- a/yarn-project/barretenberg.js/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder - -COPY barretenberg.js barretenberg.js -WORKDIR /usr/src/yarn-project/barretenberg.js -RUN yarn build && yarn formatting && yarn test - -# Prune dev dependencies. See comment in base image. -RUN yarn cache clean -RUN yarn workspaces focus --production > /dev/null - -FROM alpine:latest -COPY --from=builder /usr/src/yarn-project/barretenberg.js /usr/src/yarn-project/barretenberg.js \ No newline at end of file diff --git a/yarn-project/barretenberg.js/README.md b/yarn-project/barretenberg.js/README.md deleted file mode 100644 index d8576f560677..000000000000 --- a/yarn-project/barretenberg.js/README.md +++ /dev/null @@ -1 +0,0 @@ -# Barretenberg.js diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json deleted file mode 100644 index 30e1fede8370..000000000000 --- a/yarn-project/barretenberg.js/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@aztec/barretenberg.js", - "version": "0.0.0", - "type": "module", - "exports": "./dest/index.js", - "typedoc": { - "entryPoint": "./src/index.ts", - "displayName": "Barretenberg.js", - "tsconfig": "./tsconfig.dest.json" - }, - "scripts": { - "build": "yarn clean && yarn formatting && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", - "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint --max-warnings 0 ./src", - "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests" - }, - "jest": { - "preset": "ts-jest/presets/default-esm", - "globals": { - "ts-jest": { - "useESM": true - } - }, - "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.js$": "$1" - }, - "testRegex": "./src/.*\\.test\\.ts$", - "rootDir": "./src" - }, - "dependencies": { - "tslib": "^2.4.0" - }, - "devDependencies": { - "@aztec/eslint-config": "workspace:^", - "@jest/globals": "^29.4.3", - "@rushstack/eslint-patch": "^1.1.4", - "@types/jest": "^29.4.0", - "@types/node": "^18.7.23", - "jest": "^28.1.3", - "ts-jest": "^28.0.7", - "ts-node": "^10.9.1", - "typescript": "^4.9.5" - } -} diff --git a/yarn-project/barretenberg.js/src/index.ts b/yarn-project/barretenberg.js/src/index.ts deleted file mode 100644 index 5a3071801bc0..000000000000 --- a/yarn-project/barretenberg.js/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -/** - * A placeholder for the Barretenberg Wasm. - */ -export class BarretenbergWasm {} diff --git a/yarn-project/barretenberg.js/tsconfig.dest.json b/yarn-project/barretenberg.js/tsconfig.dest.json deleted file mode 100644 index 965aaa1c433e..000000000000 --- a/yarn-project/barretenberg.js/tsconfig.dest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": ".", - "exclude": ["**/*.test.*", "**/fixtures/*"] -} diff --git a/yarn-project/barretenberg.js/tsconfig.json b/yarn-project/barretenberg.js/tsconfig.json deleted file mode 100644 index f67ddec9fd6b..000000000000 --- a/yarn-project/barretenberg.js/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "..", - "compilerOptions": { - "outDir": "dest", - "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo" - }, - "include": ["src"] -} diff --git a/yarn-project/circuit.js/.eslintrc.cjs b/yarn-project/circuit.js/.eslintrc.cjs deleted file mode 100644 index 9cf806b1500f..000000000000 --- a/yarn-project/circuit.js/.eslintrc.cjs +++ /dev/null @@ -1,6 +0,0 @@ -require('@rushstack/eslint-patch/modern-module-resolution'); - -module.exports = { - extends: ['@aztec/eslint-config'], - parserOptions: { tsconfigRootDir: __dirname }, -}; diff --git a/yarn-project/circuit.js/Dockerfile b/yarn-project/circuit.js/Dockerfile deleted file mode 100644 index 8d9608bd9af0..000000000000 --- a/yarn-project/circuit.js/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder - -COPY circuit.js circuit.js -WORKDIR /usr/src/yarn-project/circuit.js -RUN yarn build && yarn formatting && yarn test - -# Prune dev dependencies. See comment in base image. -RUN yarn cache clean -RUN yarn workspaces focus --production > /dev/null - -FROM alpine:latest -COPY --from=builder /usr/src/yarn-project/circuit.js /usr/src/yarn-project/circuit.js \ No newline at end of file diff --git a/yarn-project/circuit.js/README.md b/yarn-project/circuit.js/README.md deleted file mode 100644 index 47d37e83d0f3..000000000000 --- a/yarn-project/circuit.js/README.md +++ /dev/null @@ -1 +0,0 @@ -# Circuit.js diff --git a/yarn-project/circuit.js/package.json b/yarn-project/circuit.js/package.json deleted file mode 100644 index 8f5eddcc3cc5..000000000000 --- a/yarn-project/circuit.js/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@aztec/circuit.js", - "version": "0.0.0", - "type": "module", - "exports": "./dest/index.js", - "typedoc": { - "entryPoint": "./src/index.ts", - "displayName": "Circuit.js", - "tsconfig": "./tsconfig.dest.json" - }, - "scripts": { - "build": "yarn clean && yarn formatting && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", - "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint --max-warnings 0 ./src", - "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests" - }, - "jest": { - "preset": "ts-jest/presets/default-esm", - "globals": { - "ts-jest": { - "useESM": true - } - }, - "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.js$": "$1" - }, - "testRegex": "./src/.*\\.test\\.ts$", - "rootDir": "./src" - }, - "dependencies": { - "tslib": "^2.4.0" - }, - "devDependencies": { - "@aztec/eslint-config": "workspace:^", - "@jest/globals": "^29.4.3", - "@rushstack/eslint-patch": "^1.1.4", - "@types/jest": "^29.4.0", - "@types/node": "^18.7.23", - "jest": "^28.1.3", - "ts-jest": "^28.0.7", - "ts-node": "^10.9.1", - "typescript": "^4.9.5" - } -} diff --git a/yarn-project/circuit.js/src/index.ts b/yarn-project/circuit.js/src/index.ts deleted file mode 100644 index c6a087e63bf4..000000000000 --- a/yarn-project/circuit.js/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -/** - * A placeholder for the Circuit Wasm. - */ -export class CircuitWasm {} diff --git a/yarn-project/circuit.js/tsconfig.dest.json b/yarn-project/circuit.js/tsconfig.dest.json deleted file mode 100644 index 965aaa1c433e..000000000000 --- a/yarn-project/circuit.js/tsconfig.dest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": ".", - "exclude": ["**/*.test.*", "**/fixtures/*"] -} diff --git a/yarn-project/circuit.js/tsconfig.json b/yarn-project/circuit.js/tsconfig.json deleted file mode 100644 index f67ddec9fd6b..000000000000 --- a/yarn-project/circuit.js/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "..", - "compilerOptions": { - "outDir": "dest", - "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo" - }, - "include": ["src"] -} diff --git a/yarn-project/package.json b/yarn-project/package.json index 1d740434c1f1..a7227ce1661c 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -11,8 +11,6 @@ "archiver", "aztec-cli", "aztec.js", - "barretenberg.js", - "circuit.js", "docs", "end-to-end", "eslint-config", diff --git a/yarn-project/typedoc.json b/yarn-project/typedoc.json index c659782bda14..f47cf8e806c1 100644 --- a/yarn-project/typedoc.json +++ b/yarn-project/typedoc.json @@ -6,8 +6,6 @@ "archiver", "aztec-cli", "aztec.js", - "barretenberg.js", - "circuit.js", "ethereum.js", "kernel-simulator", "key-store", diff --git a/yarn-project/yarn-project-base/Dockerfile b/yarn-project/yarn-project-base/Dockerfile index 9749868649fd..a923fb77eed6 100644 --- a/yarn-project/yarn-project-base/Dockerfile +++ b/yarn-project/yarn-project-base/Dockerfile @@ -15,8 +15,6 @@ COPY acir-simulator/package.json acir-simulator/package.json COPY archiver/package.json archiver/package.json COPY aztec-cli/package.json aztec-cli/package.json COPY aztec.js/package.json aztec.js/package.json -COPY barretenberg.js/package.json barretenberg.js/package.json -COPY circuit.js/package.json circuit.js/package.json COPY docs/package.json docs/package.json COPY end-to-end/package.json end-to-end/package.json COPY ethereum.js/example/package.json ethereum.js/example/package.json diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index c5ee1791c805..21612e72af48 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -103,40 +103,6 @@ __metadata: languageName: unknown linkType: soft -"@aztec/barretenberg.js@workspace:barretenberg.js": - version: 0.0.0-use.local - resolution: "@aztec/barretenberg.js@workspace:barretenberg.js" - dependencies: - "@aztec/eslint-config": "workspace:^" - "@jest/globals": ^29.4.3 - "@rushstack/eslint-patch": ^1.1.4 - "@types/jest": ^29.4.0 - "@types/node": ^18.7.23 - jest: ^28.1.3 - ts-jest: ^28.0.7 - ts-node: ^10.9.1 - tslib: ^2.4.0 - typescript: ^4.9.5 - languageName: unknown - linkType: soft - -"@aztec/circuit.js@workspace:circuit.js": - version: 0.0.0-use.local - resolution: "@aztec/circuit.js@workspace:circuit.js" - dependencies: - "@aztec/eslint-config": "workspace:^" - "@jest/globals": ^29.4.3 - "@rushstack/eslint-patch": ^1.1.4 - "@types/jest": ^29.4.0 - "@types/node": ^18.7.23 - jest: ^28.1.3 - ts-jest: ^28.0.7 - ts-node: ^10.9.1 - tslib: ^2.4.0 - typescript: ^4.9.5 - languageName: unknown - linkType: soft - "@aztec/docs@workspace:docs": version: 0.0.0-use.local resolution: "@aztec/docs@workspace:docs"