Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

remove solana-program from token-group-interface #7430

Merged

Conversation

kevinheavey
Copy link
Contributor

Updated imports and replace spl_program_error usage with inline impls

@mergify mergify bot added the community Community contribution label Oct 31, 2024
Copy link
Contributor

@joncinque joncinque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but let's finish the job!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason that you didn't update the usage of solana_program at the top of this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope just missed it

num-traits = "0.2"
solana-decode-error = "2.1.0"
solana-instruction = "2.1.0"
solana-msg = "2.1.0"
solana-program = "2.1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks the only usage of solana-program can be removed from state.rs, see my other comment

@joncinque
Copy link
Contributor

CI error is being fixed in #7432

@joncinque joncinque merged commit 5d8e76d into solana-labs:master Oct 31, 2024
8 of 9 checks passed
Comment on lines +10 to +11
#[repr(u32)]
#[derive(Clone, Debug, Eq, thiserror::Error, num_derive::FromPrimitive, PartialEq)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just update the macro?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried, but that macro is quite tied to the assumption that there is a single solana_program crate that we import, and I didn't find a way to update it without breaking everything

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is my fault, remember #7112?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
community Community contribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants