Skip to content

Commit 0ab07de

Browse files
Sawchordeichhorl
Sawchord
and
eichhorl
authored
refactor(CRP-2616): Rename idkg_subnet_public_keys in Consensus and Execution (#2817)
This PR renames `idkg_subnet_public_keys` to `chain_key_subnet_public_keys` in a lot of places. The reason is that we will soon include VetKeys in these lists, which are not `IDkg` keys, and the term would be confusing. --------- Co-authored-by: Leo Eichhorn <99166915+eichhorl@users.noreply.github.com>
1 parent 672f9d1 commit 0ab07de

File tree

13 files changed

+26
-25
lines changed

13 files changed

+26
-25
lines changed

‎rs/consensus/src/consensus/batch_delivery.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ pub fn deliver_batches(
135135

136136
let randomness = Randomness::from(crypto_hashable_to_seed(&tape));
137137

138-
let idkg_subnet_public_keys = match get_idkg_subnet_public_keys(&block, pool, log) {
138+
// TODO(CON-1419): Add vetKD keys to this map as well
139+
let chain_key_subnet_public_keys = match get_idkg_subnet_public_keys(&block, pool, log) {
139140
Ok(keys) => keys,
140141
Err(e) => {
141142
// Do not deliver batch if we can't find a previous summary block,
@@ -227,7 +228,7 @@ pub fn deliver_batches(
227228
requires_full_state_hash,
228229
messages: batch_messages,
229230
randomness,
230-
idkg_subnet_public_keys,
231+
chain_key_subnet_public_keys,
231232
idkg_pre_signature_ids: get_pre_signature_ids_to_deliver(&block),
232233
registry_version: block.context.registry_version,
233234
time: block.context.time,

‎rs/consensus/tests/integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ fn run_n_rounds_and_check_pubkeys(
331331

332332
let mut found_keys = 0;
333333
for key_id in test_threshold_key_ids() {
334-
if batch.idkg_subnet_public_keys.contains_key(&key_id) {
334+
if batch.chain_key_subnet_public_keys.contains_key(&key_id) {
335335
found_keys += 1
336336
}
337337
}

‎rs/determinism_test/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn build_batch(message_routing: &dyn MessageRouting, msgs: Vec<SignedIngress>) -
3232
..BatchMessages::default()
3333
},
3434
randomness: Randomness::from([0; 32]),
35-
idkg_subnet_public_keys: BTreeMap::new(),
35+
chain_key_subnet_public_keys: BTreeMap::new(),
3636
idkg_pre_signature_ids: BTreeMap::new(),
3737
registry_version: RegistryVersion::from(1),
3838
time: UNIX_EPOCH,
@@ -49,7 +49,7 @@ fn build_batch_with_full_state_hash(message_routing: &dyn MessageRouting) -> Bat
4949
requires_full_state_hash: true,
5050
messages: BatchMessages::default(),
5151
randomness: Randomness::from([0; 32]),
52-
idkg_subnet_public_keys: BTreeMap::new(),
52+
chain_key_subnet_public_keys: BTreeMap::new(),
5353
idkg_pre_signature_ids: BTreeMap::new(),
5454
registry_version: RegistryVersion::from(1),
5555
time: UNIX_EPOCH,

‎rs/drun/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ fn build_batch(message_routing: &dyn MessageRouting, msgs: Vec<SignedIngress>) -
383383
..BatchMessages::default()
384384
},
385385
randomness: Randomness::from(get_random_seed()),
386-
idkg_subnet_public_keys: BTreeMap::new(),
386+
chain_key_subnet_public_keys: BTreeMap::new(),
387387
idkg_pre_signature_ids: BTreeMap::new(),
388388
registry_version: RegistryVersion::from(1),
389389
time: time::current_time(),

‎rs/execution_environment/src/scheduler/test_utilities.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ pub(crate) struct SchedulerTest {
113113
registry_settings: RegistryExecutionSettings,
114114
// Metrics Registry.
115115
metrics_registry: MetricsRegistry,
116-
// iDKG subnet public keys.
117-
idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
116+
// Chain key subnet public keys.
117+
chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
118118
// Pre-signature IDs.
119119
idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
120120
// Version of the running replica, not the registry's Entry
@@ -518,7 +518,7 @@ impl SchedulerTest {
518518
let state = self.scheduler.execute_round(
519519
state,
520520
Randomness::from([0; 32]),
521-
self.idkg_subnet_public_keys.clone(),
521+
self.chain_key_subnet_public_keys.clone(),
522522
self.idkg_pre_signature_ids.clone(),
523523
&self.replica_version,
524524
self.round,
@@ -839,7 +839,7 @@ impl SchedulerTestBuilder {
839839
},
840840
);
841841
}
842-
let idkg_subnet_public_keys: BTreeMap<_, _> = self
842+
let chain_key_subnet_public_keys: BTreeMap<_, _> = self
843843
.idkg_keys
844844
.into_iter()
845845
.map(|key_id| {
@@ -956,7 +956,7 @@ impl SchedulerTestBuilder {
956956
wasm_executor,
957957
registry_settings,
958958
metrics_registry: self.metrics_registry,
959-
idkg_subnet_public_keys,
959+
chain_key_subnet_public_keys,
960960
idkg_pre_signature_ids: BTreeMap::new(),
961961
replica_version: self.replica_version,
962962
}

‎rs/interfaces/src/execution_environment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ pub trait Scheduler: Send {
12541254
&self,
12551255
state: Self::State,
12561256
randomness: Randomness,
1257-
idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
1257+
chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
12581258
idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
12591259
replica_version: &ReplicaVersion,
12601260
current_round: ExecutionRound,

‎rs/messaging/src/message_routing/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ fn try_read_registry_succeeds_with_fully_specified_registry_records() {
10381038
requires_full_state_hash: false,
10391039
messages: BatchMessages::default(),
10401040
randomness: Randomness::new([123; 32]),
1041-
idkg_subnet_public_keys: BTreeMap::default(),
1041+
chain_key_subnet_public_keys: BTreeMap::default(),
10421042
idkg_pre_signature_ids: BTreeMap::new(),
10431043
registry_version: fixture.registry.get_latest_version(),
10441044
time: Time::from_nanos_since_unix_epoch(0),
@@ -1838,7 +1838,7 @@ fn process_batch_updates_subnet_metrics() {
18381838
requires_full_state_hash: false,
18391839
messages: BatchMessages::default(),
18401840
randomness: Randomness::new([123; 32]),
1841-
idkg_subnet_public_keys: BTreeMap::default(),
1841+
chain_key_subnet_public_keys: BTreeMap::default(),
18421842
idkg_pre_signature_ids: BTreeMap::new(),
18431843
registry_version: fixture.registry.get_latest_version(),
18441844
time: Time::from_nanos_since_unix_epoch(0),

‎rs/messaging/src/state_machine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl StateMachine for StateMachineImpl {
168168
let state_after_execution = self.scheduler.execute_round(
169169
state_with_messages,
170170
batch.randomness,
171-
batch.idkg_subnet_public_keys,
171+
batch.chain_key_subnet_public_keys,
172172
batch.idkg_pre_signature_ids,
173173
&batch.replica_version,
174174
ExecutionRound::from(batch.batch_number.get()),

‎rs/messaging/src/state_machine/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mock! {
3434
&self,
3535
state: ic_replicated_state::ReplicatedState,
3636
randomness: ic_types::Randomness,
37-
idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
37+
chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
3838
idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
3939
replica_version: &ReplicaVersion,
4040
current_round: ExecutionRound,
@@ -91,7 +91,7 @@ fn test_fixture(provided_batch: &Batch) -> StateMachineTestFixture {
9191
.with(
9292
always(),
9393
eq(provided_batch.randomness),
94-
eq(provided_batch.idkg_subnet_public_keys.clone()),
94+
eq(provided_batch.chain_key_subnet_public_keys.clone()),
9595
eq(provided_batch.idkg_pre_signature_ids.clone()),
9696
eq(provided_batch.replica_version.clone()),
9797
eq(round),

‎rs/replay/src/player.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ impl Player {
759759
messages: BatchMessages::default(),
760760
// Use a fake randomness here since we don't have random tape for extra messages
761761
randomness,
762-
idkg_subnet_public_keys: BTreeMap::new(),
762+
chain_key_subnet_public_keys: BTreeMap::new(),
763763
idkg_pre_signature_ids: BTreeMap::new(),
764764
registry_version,
765765
time,

0 commit comments

Comments
 (0)