Skip to content

[nodes] compatibility checks merge name and address checking to "id" check #20813

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 8, 2025
Merged

[nodes] compatibility checks merge name and address checking to "id" check #20813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions external-crates/move/crates/move-binary-format/src/compatibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,14 @@ impl InclusionCheck {
) -> Result<(), M::Error> {
let mut context = M::default();

// Module checks
if old_module.name != new_module.name {
context.module_name_mismatch(&old_module.name, &new_module.name);
}

if old_module.address != new_module.address {
context.module_address_mismatch(&old_module.address, &new_module.address);
// module's name and address are unchanged
if old_module.address != new_module.address || old_module.name != new_module.name {
context.module_id_mismatch(
&old_module.address,
&old_module.name,
&new_module.address,
&new_module.name,
);
}

if old_module.file_format_version > new_module.file_format_version {
Expand Down
16 changes: 7 additions & 9 deletions external-crates/move/crates/move-binary-format/src/inclusion_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
use crate::compatibility::InclusionCheck;
use crate::normalized::{Enum, Function, Struct};
use move_core_types::account_address::AccountAddress;
use move_core_types::identifier::Identifier;
use move_core_types::identifier::{IdentStr, Identifier};

pub trait InclusionCheckMode: Default {
type Error;
fn module_name_mismatch(&mut self, old_address: &Identifier, new_address: &Identifier);
fn module_address_mismatch(
fn module_id_mismatch(
&mut self,
old_address: &AccountAddress,
old_name: &IdentStr,
new_address: &AccountAddress,
new_name: &IdentStr,
);
fn file_format_version_downgrade(&mut self, old_version: u32, new_version: u32);
fn struct_new(&mut self, name: &Identifier, new_struct: &Struct);
Expand Down Expand Up @@ -45,15 +46,12 @@ impl Default for InclusionCheckExecutionMode {
impl InclusionCheckMode for InclusionCheckExecutionMode {
type Error = ();

fn module_name_mismatch(&mut self, _old_address: &Identifier, _new_address: &Identifier) {
self.is_subset = false;
self.is_equal = false;
}

fn module_address_mismatch(
fn module_id_mismatch(
&mut self,
_old_address: &AccountAddress,
_old_name: &IdentStr,
_new_address: &AccountAddress,
_new_name: &IdentStr,
) {
self.is_subset = false;
self.is_equal = false;
Expand Down
Loading