From 880a5ee563d7b1f1b60ad72fb77a47fed301c6f4 Mon Sep 17 00:00:00 2001 From: acheron Date: Sat, 10 Aug 2024 21:59:07 +0200 Subject: [PATCH 1/3] lang: Remove `discriminator` method from `Discriminator` trait --- lang/src/lib.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/lang/src/lib.rs b/lang/src/lib.rs index a169159ec3..5fb3b24fb7 100644 --- a/lang/src/lib.rs +++ b/lang/src/lib.rs @@ -303,9 +303,6 @@ pub trait Event: AnchorSerialize + AnchorDeserialize + Discriminator { /// 8 byte unique identifier for a type. pub trait Discriminator { const DISCRIMINATOR: &'static [u8]; - fn discriminator() -> &'static [u8] { - Self::DISCRIMINATOR - } } /// Defines the space of an account for initialization. From ce48b4c6f3dc1ad695cccc9c18d57509786462fa Mon Sep 17 00:00:00 2001 From: acheron Date: Sat, 10 Aug 2024 21:59:44 +0200 Subject: [PATCH 2/3] Fix tests --- tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs b/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs index 182c13d6b8..9457cfe970 100644 --- a/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs +++ b/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs @@ -22,7 +22,7 @@ async fn update_foo() { let foo_pubkey = Pubkey::new_unique(); let foo_account = { let mut foo_data = Vec::new(); - foo_data.extend_from_slice(&zero_copy::Foo::discriminator()); + foo_data.extend_from_slice(zero_copy::Foo::DISCRIMINATOR); foo_data.extend_from_slice(bytemuck::bytes_of(&zero_copy::Foo { authority: authority.pubkey(), ..zero_copy::Foo::default() From fc568d07a1a22ac01f4135f5caa536dd8bc4814b Mon Sep 17 00:00:00 2001 From: acheron Date: Sat, 10 Aug 2024 23:17:56 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bdea5413..207856889c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ The minor version will be incremented upon a breaking change and the patch versi - lang: `#[account]` attribute arguments no longer parses identifiers as namespaces ([#3140](https://github.com/coral-xyz/anchor/pull/3140)). - spl: Rename metadata interface instruction fields from `token_program_id` to `program_id` ([#3076](https://github.com/coral-xyz/anchor/pull/3076)). - lang, ts: Remove "8 byte" requirement from discriminator error messages ([#3161](https://github.com/coral-xyz/anchor/pull/3161)). +- lang: Remove `discriminator` method from `Discriminator` trait ([#3163](https://github.com/coral-xyz/anchor/pull/3163)). ## [0.30.1] - 2024-06-20