From 30d83eb987e5cc55af2544e1412b64ac463af9b1 Mon Sep 17 00:00:00 2001 From: febo Date: Tue, 3 Sep 2024 21:54:03 +0100 Subject: [PATCH 1/2] Rename to sdk --- Cargo.toml | 2 +- {program => sdk}/Cargo.toml | 0 {program => sdk}/README.md | 0 {program => sdk}/src/account_info.rs | 0 {program => sdk}/src/entrypoint.rs | 0 {program => sdk}/src/instruction.rs | 0 {program => sdk}/src/lib.rs | 0 {program => sdk}/src/log.rs | 0 {program => sdk}/src/program_error.rs | 0 {program => sdk}/src/pubkey.rs | 0 {program => sdk}/src/syscalls.rs | 0 {program => sdk}/src/sysvars/clock.rs | 3 ++- {program => sdk}/src/sysvars/fees.rs | 0 {program => sdk}/src/sysvars/mod.rs | 0 {program => sdk}/src/sysvars/rent.rs | 0 15 files changed, 3 insertions(+), 2 deletions(-) rename {program => sdk}/Cargo.toml (100%) rename {program => sdk}/README.md (100%) rename {program => sdk}/src/account_info.rs (100%) rename {program => sdk}/src/entrypoint.rs (100%) rename {program => sdk}/src/instruction.rs (100%) rename {program => sdk}/src/lib.rs (100%) rename {program => sdk}/src/log.rs (100%) rename {program => sdk}/src/program_error.rs (100%) rename {program => sdk}/src/pubkey.rs (100%) rename {program => sdk}/src/syscalls.rs (100%) rename {program => sdk}/src/sysvars/clock.rs (97%) rename {program => sdk}/src/sysvars/fees.rs (100%) rename {program => sdk}/src/sysvars/mod.rs (100%) rename {program => sdk}/src/sysvars/rent.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index cf98ee8..cdb8ca1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver = "2" -members = ["macro", "program"] \ No newline at end of file +members = ["sdk", "macro"] \ No newline at end of file diff --git a/program/Cargo.toml b/sdk/Cargo.toml similarity index 100% rename from program/Cargo.toml rename to sdk/Cargo.toml diff --git a/program/README.md b/sdk/README.md similarity index 100% rename from program/README.md rename to sdk/README.md diff --git a/program/src/account_info.rs b/sdk/src/account_info.rs similarity index 100% rename from program/src/account_info.rs rename to sdk/src/account_info.rs diff --git a/program/src/entrypoint.rs b/sdk/src/entrypoint.rs similarity index 100% rename from program/src/entrypoint.rs rename to sdk/src/entrypoint.rs diff --git a/program/src/instruction.rs b/sdk/src/instruction.rs similarity index 100% rename from program/src/instruction.rs rename to sdk/src/instruction.rs diff --git a/program/src/lib.rs b/sdk/src/lib.rs similarity index 100% rename from program/src/lib.rs rename to sdk/src/lib.rs diff --git a/program/src/log.rs b/sdk/src/log.rs similarity index 100% rename from program/src/log.rs rename to sdk/src/log.rs diff --git a/program/src/program_error.rs b/sdk/src/program_error.rs similarity index 100% rename from program/src/program_error.rs rename to sdk/src/program_error.rs diff --git a/program/src/pubkey.rs b/sdk/src/pubkey.rs similarity index 100% rename from program/src/pubkey.rs rename to sdk/src/pubkey.rs diff --git a/program/src/syscalls.rs b/sdk/src/syscalls.rs similarity index 100% rename from program/src/syscalls.rs rename to sdk/src/syscalls.rs diff --git a/program/src/sysvars/clock.rs b/sdk/src/sysvars/clock.rs similarity index 97% rename from program/src/sysvars/clock.rs rename to sdk/src/sysvars/clock.rs index 0f16b02..9baafdc 100644 --- a/program/src/sysvars/clock.rs +++ b/sdk/src/sysvars/clock.rs @@ -1,6 +1,7 @@ -use crate::impl_sysvar_get; +//! Information about the network's clock, ticks, slots, etc. use super::Sysvar; +use crate::impl_sysvar_get; /// The unit of time given to a leader for encoding a block. /// diff --git a/program/src/sysvars/fees.rs b/sdk/src/sysvars/fees.rs similarity index 100% rename from program/src/sysvars/fees.rs rename to sdk/src/sysvars/fees.rs diff --git a/program/src/sysvars/mod.rs b/sdk/src/sysvars/mod.rs similarity index 100% rename from program/src/sysvars/mod.rs rename to sdk/src/sysvars/mod.rs diff --git a/program/src/sysvars/rent.rs b/sdk/src/sysvars/rent.rs similarity index 100% rename from program/src/sysvars/rent.rs rename to sdk/src/sysvars/rent.rs From bac897757b9f0e264a3047291a11adceda4c95bb Mon Sep 17 00:00:00 2001 From: febo Date: Tue, 3 Sep 2024 21:55:31 +0100 Subject: [PATCH 2/2] Fix clippy warning --- sdk/src/sysvars/rent.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/sysvars/rent.rs b/sdk/src/sysvars/rent.rs index acd8ce0..9569f6e 100644 --- a/sdk/src/sysvars/rent.rs +++ b/sdk/src/sysvars/rent.rs @@ -33,7 +33,7 @@ impl Sysvar for Rent { /// The total rent in lamports impl Rent { pub fn due(&self, bytes: u64, years: f64) -> u64 { - (self.lamports_per_byte_year * bytes as u64) + (self.lamports_per_byte_year * bytes) .saturating_mul((years * 100.0) as u64) .saturating_div(100) }