Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REMOVE ODIS/Social Connect #10640

Merged
merged 5 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 6 additions & 61 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ orbs:
parameters:
run-workflow-general:
type: boolean
default: false
default: false
run-workflow-npm-install:
type: boolean
default: false
default: false
run-workflow-protocol-coverage:
type: boolean
default: false
default: false
# When you need to force a rebuild of the node modules cache then bump this version
node-modules-cache-version:
type: integer
Expand Down Expand Up @@ -228,7 +228,6 @@ jobs:
--ignore @celo/celotool \
--ignore @celo/celocli \
--ignore @celo/env-tests \
--ignore @celo/identity \
--ignore @celo/transactions-uri \
--ignore '@celo/wallet-*' \
run test
Expand Down Expand Up @@ -464,28 +463,6 @@ jobs:
name: Run Tests
command: yarn --cwd=packages/sdk/contractkit test

# extrated to reuse the devchain generated by contractkit
identity-tests:
<<: *defaults
steps:
- attach_workspace:
at: ~/app
- run:
name: Check if the test should run
command: |
./scripts/ci_check_if_test_should_run_v2.sh @celo/identity
# - run:
# name: Copy DevChain generated by Contractkit
# command: |
# (cp -r packages/sdk/contractkit/.tmp packages/sdk/identity/.tmp)
- run:
name: Generate DevChain
command: |
(cd packages/sdk/identity && yarn test:reset)
- run:
name: Run Tests
command: yarn --cwd=packages/sdk/identity test

# extrated to reuse the devchain generated by contractkit
transactions-uri-tests:
<<: *defaults
Expand Down Expand Up @@ -805,29 +782,6 @@ jobs:
name: Minor test of celocli
command: ./node_modules/.bin/celocli account:new # Small test

odis-test:
<<: *defaults
# Source: https://circleci.com/docs/2.0/configuration-reference/#resource_class
resource_class: large
steps:
- attach_workspace:
at: ~/app
- run:
name: Check if the test should run
command: |
./scripts/ci_check_if_test_should_run_v2.sh @celo/phone-number-privacy-signer,@celo/phone-number-privacy-combiner,@celo/phone-number-privacy-common
- run:
name: Run Tests for common package
command: yarn --cwd=packages/phone-number-privacy/common test:coverage
- run:
name: Run Tests for combiner
no_output_timeout: 30m
command: yarn --cwd=packages/phone-number-privacy/combiner test:coverage
- run:
name: Run Tests for signer
no_output_timeout: 30m
command: yarn --cwd=packages/phone-number-privacy/signer test:coverage

certora-test:
working_directory: ~/app
docker:
Expand Down Expand Up @@ -910,7 +864,7 @@ workflows:
version: 2
celo-monorepo-build:
# Contitionally triggered
when:
when:
or: [<< pipeline.parameters.run-workflow-general >>]
jobs:
- install_dependencies
Expand All @@ -932,12 +886,6 @@ workflows:
- wallets-test:
requires:
- install_dependencies
- identity-tests:
requires:
- contractkit-test
- transactions-uri-tests:
requires:
- contractkit-test
- pre-protocol-test-release:
requires:
- lint-checks
Expand Down Expand Up @@ -1010,20 +958,17 @@ workflows:
requires:
- lint-checks
- contractkit-test
- odis-test:
requires:
- lint-checks
npm-install-testing-cron-workflow:
# Contitionally triggered
when:
when:
or: [<< pipeline.parameters.run-workflow-npm-install >>]
jobs:
- test-typescript-npm-package-install
- test-utils-npm-package-install
- test-contractkit-npm-package-install
- test-celocli-npm-package-install
protocol-testing-with-code-coverage-cron-workflow:
when:
when:
or: [<< pipeline.parameters.run-workflow-protocol-coverage >>]
jobs:
- install_dependencies
Expand Down
107 changes: 0 additions & 107 deletions .github/workflows/circleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ jobs:
--ignore @celo/celotool \
--ignore @celo/celocli \
--ignore @celo/env-tests \
aaronmgdr marked this conversation as resolved.
Show resolved Hide resolved
--ignore @celo/identity \
--ignore @celo/transactions-uri \
--ignore '@celo/wallet-*' \
run test
Expand Down Expand Up @@ -404,76 +403,6 @@ jobs:
- name: Run tests
run: |
yarn --cwd=packages/sdk/contractkit test
identity-tests:
name: Identity Tests
runs-on: ['self-hosted', 'monorepo-node18']
timeout-minutes: 30
needs: [install-dependencies, contractkit-tests]
if: |
github.base_ref == 'master' || contains(github.base_ref, 'staging') || contains(github.base_ref, 'production') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/phone-number-privacy/common') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/dev-utils') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/sdk') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/typescript') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',package.json') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',yarn.lock') ||
false
steps:
- uses: actions/cache/restore@v3
id: cache_git
with:
path: .git
key: git-${{ github.ref }}
- uses: actions/checkout@v3
- name: Sync workspace
uses: ./.github/actions/sync-workspace
with:
package-json-checksum: ${{ needs.install-dependencies.outputs.package-json-checksum }}
- name: Generate DevChain
run: |
cd packages/sdk/identity
yarn test:reset
- name: Run tests
run: |
yarn --cwd=packages/sdk/identity test
transactions-uri-tests:
name: Transaction URI Tests
runs-on: ['self-hosted', 'monorepo-node18']
timeout-minutes: 30
needs: [install-dependencies, contractkit-tests]
if: |
github.base_ref == 'master' || contains(github.base_ref, 'staging') || contains(github.base_ref, 'production') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/dev-utils') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/sdk') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/typescript') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',package.json') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',yarn.lock') ||
false
steps:
- uses: actions/cache/restore@v3
id: cache_git
with:
path: .git
key: git-${{ github.ref }}
- uses: actions/checkout@v3
- name: Sync workspace
uses: ./.github/actions/sync-workspace
with:
package-json-checksum: ${{ needs.install-dependencies.outputs.package-json-checksum }}
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v37
with:
fetch_depth: '150'
- name: Generate DevChain
run: |
cd packages/sdk/identity
yarn test:reset
- name: Run tests
run: |
yarn --cwd=packages/sdk/identity test
cli-tests:
name: CeloCli Tests
runs-on: ['self-hosted', 'monorepo-node18']
Expand All @@ -482,7 +411,6 @@ jobs:
if: |
github.base_ref == 'master' || contains(github.base_ref, 'staging') || contains(github.base_ref, 'production') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/cli') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/phone-number-privacy/common') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/dev-utils') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/sdk') ||
Expand Down Expand Up @@ -627,7 +555,6 @@ jobs:
if: |
github.base_ref == 'master' || contains(github.base_ref, 'staging') || contains(github.base_ref, 'production') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/celotool') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/phone-number-privacy/common') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/dev-utils') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/sdk') ||
Expand Down Expand Up @@ -716,40 +643,6 @@ jobs:
command: |
${{ matrix.command }}

odis-test:
name: ODIS test
runs-on: ['self-hosted', 'monorepo-node18']
timeout-minutes: 30
needs: [install-dependencies, lint-checks]
if: |
github.base_ref == 'master' || contains(github.base_ref, 'staging') || contains(github.base_ref, 'production') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/phone-number-privacy') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
contains(needs.install-dependencies.outputs.all_modified_files, 'packages/sdk') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',package.json') ||
contains(needs.install-dependencies.outputs.all_modified_files, ',yarn.lock') ||
false
steps:
- uses: actions/cache/restore@v3
id: cache_git
with:
path: .git
key: git-${{ github.ref }}
- uses: actions/checkout@v3
- name: Sync workspace
uses: ./.github/actions/sync-workspace
with:
package-json-checksum: ${{ needs.install-dependencies.outputs.package-json-checksum }}
- name: Run Tests for common package
run: |
yarn --cwd=packages/phone-number-privacy/common test:coverage
- name: Run Tests for combiner
run: |
yarn --cwd=packages/phone-number-privacy/combiner test:coverage
- name: Run Tests for signer
run: |
yarn --cwd=packages/phone-number-privacy/signer test:coverage

# NOTE: This has not been fully tested as we don't have a license for certora
certora-test:
name: Certora test ${{ matrix.name }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ packages/faucet/*
packages/moonpay-auth/*
packages/notification-service/*
packages/react-components/*
packages/phone-number-privacy/*
packages/sdk/identity/*
packages/sdk/encrypted-backup/*

# temp json file for deploy-sdks script
scripts/failedSDKs.json
Expand Down
70 changes: 0 additions & 70 deletions dependency-graph.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"@celo/env-tests",
"@celo/explorer",
"@celo/governance",
"@celo/identity",
"@celo/network-utils",
"@celo/protocol",
"@celo/utils"
Expand All @@ -26,7 +25,6 @@
"@celo/dev-utils",
"@celo/explorer",
"@celo/governance",
"@celo/identity",
"@celo/phone-utils",
"@celo/utils",
"@celo/wallet-hsm-azure",
Expand All @@ -45,7 +43,6 @@
"@celo/connect",
"@celo/contractkit",
"@celo/cryptographic-utils",
"@celo/identity",
"@celo/phone-utils",
"@celo/utils"
]
Expand Down Expand Up @@ -74,50 +71,6 @@
"location": "packages/typescript",
"dependencies": []
},
"@celo/phone-number-privacy-combiner": {
"location": "packages/phone-number-privacy/combiner",
"dependencies": [
"@celo/contractkit",
"@celo/encrypted-backup",
"@celo/identity",
"@celo/phone-number-privacy-common",
"@celo/phone-utils",
"@celo/utils"
]
},
"@celo/phone-number-privacy-common": {
"location": "packages/phone-number-privacy/common",
"dependencies": [
"@celo/base",
"@celo/contractkit",
"@celo/phone-utils",
"@celo/utils",
"@celo/wallet-local"
]
},
"@celo/phone-number-privacy-monitor": {
"location": "packages/phone-number-privacy/monitor",
"dependencies": [
"@celo/base",
"@celo/contractkit",
"@celo/cryptographic-utils",
"@celo/encrypted-backup",
"@celo/identity",
"@celo/phone-number-privacy-common",
"@celo/utils",
"@celo/wallet-local"
]
},
"@celo/phone-number-privacy-signer": {
"location": "packages/phone-number-privacy/signer",
"dependencies": [
"@celo/base",
"@celo/contractkit",
"@celo/phone-number-privacy-common",
"@celo/utils",
"@celo/wallet-hsm-azure"
]
},
"@celo/base": {
"location": "packages/sdk/base",
"dependencies": [
Expand Down Expand Up @@ -151,18 +104,6 @@
"@celo/utils"
]
},
"@celo/encrypted-backup": {
"location": "packages/sdk/encrypted-backup",
"dependencies": [
"@celo/base",
"@celo/connect",
"@celo/dev-utils",
"@celo/identity",
"@celo/phone-number-privacy-common",
"@celo/utils",
"@celo/wallet-local"
]
},
"@celo/explorer": {
"location": "packages/sdk/explorer",
"dependencies": [
Expand All @@ -182,17 +123,6 @@
"@celo/utils"
]
},
"@celo/identity": {
"location": "packages/sdk/identity",
"dependencies": [
"@celo/base",
"@celo/contractkit",
"@celo/dev-utils",
"@celo/phone-number-privacy-common",
"@celo/utils",
"@celo/wallet-local"
]
},
"@celo/keystores": {
"location": "packages/sdk/keystores",
"dependencies": [
Expand Down
Loading