Skip to content
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.

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

sdk: evict rent collector #4160

Merged
merged 2 commits into from
Jan 21, 2025

Conversation

buffalojoec
Copy link

Completes the work for #3932 and finally evicts RentCollector from the SDK.

@buffalojoec buffalojoec force-pushed the sdk-evict-rent-collector branch from 3d3dbec to 951c8c7 Compare January 7, 2025 07:08
@buffalojoec buffalojoec force-pushed the sdk-evict-rent-collector branch 3 times, most recently from 5574dec to c137850 Compare January 17, 2025 04:05
@buffalojoec buffalojoec requested a review from joncinque January 17, 2025 04:49
@buffalojoec buffalojoec marked this pull request as ready for review January 17, 2025 04:49
@buffalojoec buffalojoec force-pushed the sdk-evict-rent-collector branch from c137850 to 76be235 Compare January 17, 2025 07:39
Copy link

@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! Just some small things

Comment on lines 256 to 260
extern crate log as logger;
#[cfg_attr(not(target_os = "solana"), macro_use)]
extern crate serde_derive;

#[cfg_attr(feature = "frozen-abi", macro_use)]
#[cfg(feature = "frozen-abi")]
extern crate solana_frozen_abi_macro;

Choose a reason for hiding this comment

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

We can probably remove all of these, but it seems unrelated to this PR -- can you split it out into another PR?

Copy link
Author

Choose a reason for hiding this comment

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

It was a clippy error, but sure.

Copy link
Author

Choose a reason for hiding this comment

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

It will not pass CI here if it's not part of this PR, though.

Choose a reason for hiding this comment

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

Ooh, this is actually beautiful! This is the last module still using frozen-abi and serde-derive, we can remove frozen-abi and move serde-derive to dev-deps. I can put that change in once yours goes in.

Copy link
Author

Choose a reason for hiding this comment

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

Sounds good!

@@ -22,7 +22,7 @@ pub mod tests {

#[test]
fn test_limited_deserialize() {
#[derive(Deserialize, Serialize)]
#[derive(serde_derive::Deserialize, serde_derive::Serialize)]

Choose a reason for hiding this comment

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

Same with this, unless I'm missing something, it should get split out into another PR.

Copy link
Author

Choose a reason for hiding this comment

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

Also clippy.

Copy link

@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 great!

Comment on lines 256 to 260
extern crate log as logger;
#[cfg_attr(not(target_os = "solana"), macro_use)]
extern crate serde_derive;

#[cfg_attr(feature = "frozen-abi", macro_use)]
#[cfg(feature = "frozen-abi")]
extern crate solana_frozen_abi_macro;

Choose a reason for hiding this comment

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

Ooh, this is actually beautiful! This is the last module still using frozen-abi and serde-derive, we can remove frozen-abi and move serde-derive to dev-deps. I can put that change in once yours goes in.

@buffalojoec buffalojoec merged commit 37f6967 into anza-xyz:master Jan 21, 2025
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants