Skip to content

Commit 2008ed5

Browse files
author
Daniel Thurau
committed
Merge branch 'NNS1-1906-p1' into 'master'
NNS1-1906: Split the NNS Root canister crate into an interface and canister crate The new structure resembles ``` rs/nns/handlers/root/impl/ rs/nns/handlers/root/impl/BUILD.bazel rs/nns/handlers/root/impl/canister/ rs/nns/handlers/root/impl/canister/canister.rs rs/nns/handlers/root/impl/canister/root.did rs/nns/handlers/root/impl/canister/src/ rs/nns/handlers/root/impl/canister/tests/ rs/nns/handlers/root/impl/canister/proto/ rs/nns/handlers/root/impl/canister/protobuf_generator/ rs/nns/handlers/root/interface/ rs/nns/handlers/root/interface/BUILD.bazel rs/nns/handlers/root/interface/src/lib.rs rs/nns/handlers/root/interface/src/client.rs ``` The interface package should contain the Request and Response types of the NNS root canister and should be depended on by other canisters (such as governance, SNS-W, etc) instead of directly on the implementation of a canister. This solves the circular dependency problem of canisters calling each other within the monorepo. See merge request dfinity-lab/public/ic!12554
2 parents a2ea995 + ff2d670 commit 2008ed5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+274
-193
lines changed

Cargo.lock

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ members = [
156156
"rs/nns/governance",
157157
"rs/nns/governance/protobuf_generator",
158158
"rs/nns/handlers/lifeline",
159-
"rs/nns/handlers/root",
160-
"rs/nns/handlers/root/protobuf_generator",
159+
"rs/nns/handlers/root/impl",
160+
"rs/nns/handlers/root/impl/protobuf_generator",
161+
"rs/nns/handlers/root/interface",
161162
"rs/nns/identity",
162163
"rs/nns/init",
163164
"rs/nns/inspector",

buf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:
77
- rs/nervous_system/proto/proto
88
- rs/nns/common/proto
99
- rs/nns/gtc/proto Temporarily removed because a PR was reverted and then un-reverted
10-
- rs/nns/handlers/root/proto
10+
- rs/nns/handlers/root/impl/proto
1111
- rs/nns/governance/proto
1212
- rs/protobuf/def
1313
- rs/rosetta-api/icp_ledger/proto

gitlab-ci/src/dependencies/scanner/manager/bazel_rust_dependency_manager_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def test_get_findings_for_bazel_repo():
351351
fix_version_for_vulnerability={}),
352352
Dependency(id='https://crates.io/crates/x509-parser', name='x509-parser', version='0.12.0',
353353
fix_version_for_vulnerability={})]
354-
assert findings[0].projects == ['rs/backup', 'rs/canister_client/sender', 'rs/crypto', 'rs/crypto/ecdsa_secp256k1', 'rs/crypto/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/cose', 'rs/crypto/internal/crypto_lib/basic_sig/der_utils', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256k1', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/ed25519', 'rs/crypto/internal/crypto_lib/basic_sig/iccsa', 'rs/crypto/internal/crypto_lib/basic_sig/rsa_pkcs1', 'rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/der_utils', 'rs/crypto/internal/crypto_service_provider', 'rs/crypto/node_key_validation', 'rs/crypto/node_key_validation/tls_cert_validation', 'rs/crypto/utils/basic_sig', 'rs/elastic_common_schema', 'rs/ic_p8s_service_discovery/log', 'rs/monitoring/logger', 'rs/monitoring/onchain_observability/adapter', 'rs/nervous_system/common', 'rs/nns/cmc', 'rs/nns/governance', 'rs/nns/gtc', 'rs/nns/handlers/root', 'rs/nns/sns-wasm', 'rs/prep', 'rs/registry/canister', 'rs/registry/nns_data_provider', 'rs/rosetta-api', 'rs/rosetta-api/icrc1/ledger/sm-tests', 'rs/rosetta-api/ledger_canister_blocks_synchronizer', 'rs/rosetta-api/ledger_canister_blocks_synchronizer/test_utils', 'rs/scenario_tests', 'rs/sns/governance', 'rs/sns/root', 'rs/sns/swap', 'rs/tests', 'rs/types/types', 'rs/validator', 'rs/validator/http_request_test_utils']
354+
assert findings[0].projects == ['rs/backup', 'rs/canister_client/sender', 'rs/crypto', 'rs/crypto/ecdsa_secp256k1', 'rs/crypto/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/cose', 'rs/crypto/internal/crypto_lib/basic_sig/der_utils', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256k1', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/ed25519', 'rs/crypto/internal/crypto_lib/basic_sig/iccsa', 'rs/crypto/internal/crypto_lib/basic_sig/rsa_pkcs1', 'rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/der_utils', 'rs/crypto/internal/crypto_service_provider', 'rs/crypto/node_key_validation', 'rs/crypto/node_key_validation/tls_cert_validation', 'rs/crypto/utils/basic_sig', 'rs/elastic_common_schema', 'rs/ic_p8s_service_discovery/log', 'rs/monitoring/logger', 'rs/monitoring/onchain_observability/adapter', 'rs/nervous_system/common', 'rs/nns/cmc', 'rs/nns/governance', 'rs/nns/gtc', 'rs/nns/handlers/root/impl', 'rs/nns/handlers/root/interface', 'rs/nns/sns-wasm', 'rs/prep', 'rs/registry/canister', 'rs/registry/nns_data_provider', 'rs/rosetta-api', 'rs/rosetta-api/icrc1/ledger/sm-tests', 'rs/rosetta-api/ledger_canister_blocks_synchronizer', 'rs/rosetta-api/ledger_canister_blocks_synchronizer/test_utils', 'rs/scenario_tests', 'rs/sns/governance', 'rs/sns/root', 'rs/sns/swap', 'rs/tests', 'rs/types/types', 'rs/validator', 'rs/validator/http_request_test_utils']
355355
assert findings[0].score == -1
356356

357357
# unique fields for second finding
@@ -405,7 +405,7 @@ def test_get_findings_for_bazel_repo():
405405
fix_version_for_vulnerability={}),
406406
Dependency(id='https://crates.io/crates/x509-parser', name='x509-parser', version='0.12.0',
407407
fix_version_for_vulnerability={})]
408-
assert findings[2].projects == ['rs/backup', 'rs/canister_client/sender', 'rs/crypto', 'rs/crypto/ecdsa_secp256k1', 'rs/crypto/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/cose', 'rs/crypto/internal/crypto_lib/basic_sig/der_utils', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256k1', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/ed25519', 'rs/crypto/internal/crypto_lib/basic_sig/iccsa', 'rs/crypto/internal/crypto_lib/basic_sig/rsa_pkcs1', 'rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/der_utils', 'rs/crypto/internal/crypto_service_provider', 'rs/crypto/node_key_validation', 'rs/crypto/node_key_validation/tls_cert_validation', 'rs/crypto/utils/basic_sig', 'rs/elastic_common_schema', 'rs/ic_p8s_service_discovery/log', 'rs/monitoring/logger', 'rs/monitoring/onchain_observability/adapter', 'rs/nervous_system/common', 'rs/nns/cmc', 'rs/nns/governance', 'rs/nns/gtc', 'rs/nns/handlers/root', 'rs/nns/sns-wasm', 'rs/prep', 'rs/registry/canister', 'rs/registry/nns_data_provider', 'rs/replica', 'rs/rosetta-api', 'rs/rosetta-api/icrc1/ledger/sm-tests', 'rs/rosetta-api/ledger_canister_blocks_synchronizer', 'rs/rosetta-api/ledger_canister_blocks_synchronizer/test_utils', 'rs/scenario_tests', 'rs/sns/governance', 'rs/sns/root', 'rs/sns/swap', 'rs/tests', 'rs/types/types', 'rs/validator', 'rs/validator/http_request_test_utils']
408+
assert findings[2].projects == ['rs/backup', 'rs/canister_client/sender', 'rs/crypto', 'rs/crypto/ecdsa_secp256k1', 'rs/crypto/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/cose', 'rs/crypto/internal/crypto_lib/basic_sig/der_utils', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256k1', 'rs/crypto/internal/crypto_lib/basic_sig/ecdsa_secp256r1', 'rs/crypto/internal/crypto_lib/basic_sig/ed25519', 'rs/crypto/internal/crypto_lib/basic_sig/iccsa', 'rs/crypto/internal/crypto_lib/basic_sig/rsa_pkcs1', 'rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/der_utils', 'rs/crypto/internal/crypto_service_provider', 'rs/crypto/node_key_validation', 'rs/crypto/node_key_validation/tls_cert_validation', 'rs/crypto/utils/basic_sig', 'rs/elastic_common_schema', 'rs/ic_p8s_service_discovery/log', 'rs/monitoring/logger', 'rs/monitoring/onchain_observability/adapter', 'rs/nervous_system/common', 'rs/nns/cmc', 'rs/nns/governance', 'rs/nns/gtc', 'rs/nns/handlers/root/impl', 'rs/nns/handlers/root/interface', 'rs/nns/sns-wasm', 'rs/prep', 'rs/registry/canister', 'rs/registry/nns_data_provider', 'rs/replica', 'rs/rosetta-api', 'rs/rosetta-api/icrc1/ledger/sm-tests', 'rs/rosetta-api/ledger_canister_blocks_synchronizer', 'rs/rosetta-api/ledger_canister_blocks_synchronizer/test_utils', 'rs/scenario_tests', 'rs/sns/governance', 'rs/sns/root', 'rs/sns/swap', 'rs/tests', 'rs/types/types', 'rs/validator', 'rs/validator/http_request_test_utils']
409409
assert findings[2].score == 6
410410

411411
class MockBazelCargoExecutor(BazelCargoExecutor):

0 commit comments

Comments
 (0)