clean up and main pull

Author: simplysabir

basics/rent/steel/api/src/instruction.rs

@@ -13,4 +13,4 @@ pub struct CreateSystemAccount {
     pub address: [u8; 64],
 }
 
-instruction!(RentInstruction, CreateSystemAccount);
+instruction!(RentInstruction, CreateSystemAccount);

basics/rent/steel/api/src/lib.rs

@@ -1,25 +1,21 @@
 pub mod error;
 pub mod instruction;
-pub mod state;
 pub mod sdk;
+pub mod state;
 
 pub mod prelude {
     pub use crate::error::*;
     pub use crate::instruction::*;
-    pub use crate::state::*; 
     pub use crate::sdk::*;
+    pub use crate::state::*;
     // Re-export common solana dependencies
     pub use solana_program::{
-        account_info::AccountInfo,
-        entrypoint::ProgramResult,
-        msg,
-        pubkey::Pubkey,
-        rent::Rent,
+        account_info::AccountInfo, entrypoint::ProgramResult, msg, pubkey::Pubkey, rent::Rent,
         system_program,
     };
 }
 
 use steel::*;
 
 // TODO Set program id
-declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35"); 
+declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35");

basics/rent/steel/api/src/sdk.rs

@@ -1,5 +1,5 @@
-use steel::*;
 use crate::prelude::*;
+use steel::*;
 
 pub fn create_system_account(
     payer: Pubkey,
@@ -9,7 +9,7 @@ pub fn create_system_account(
 ) -> Instruction {
     let mut name_bytes = [0u8; 32];
     let mut address_bytes = [0u8; 64];
-    
+
     name_bytes[..name.len()].copy_from_slice(name.as_bytes());
     address_bytes[..address.len()].copy_from_slice(address.as_bytes());
 
@@ -23,6 +23,7 @@ pub fn create_system_account(
         data: CreateSystemAccount {
             name: name_bytes,
             address: address_bytes,
-        }.to_bytes(),
+        }
+        .to_bytes(),
     }
-}
+}

basics/rent/steel/api/src/state/address.rs

@@ -1,5 +1,5 @@
-use steel::*;
 use super::RentAccount;
+use steel::*;
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
@@ -8,4 +8,4 @@ pub struct Address {
     pub address: [u8; 64],
 }
 
-account!(RentAccount, Address);
+account!(RentAccount, Address);

basics/rent/steel/api/src/state/mod.rs

@@ -8,4 +8,4 @@ use steel::*;
 #[derive(Clone, Copy, Debug, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
 pub enum RentAccount {
     Address = 0,
-}
+}

basics/rent/steel/package.json

@@ -1,14 +1,14 @@
 {
-    "name": "rent-example",
-    "version": "1.0.0",
-    "description": "rent example with steel framework for solana",
-    "scripts": {
-      "test": "cargo test-sbf",
-      "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
-      "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
-      "deploy": "solana program deploy ./program/target/so/rent_example_program.so"
-    },
-    "keywords": [],
-    "author": "Sabir Khan",
-    "license": "ISC"
-  }
+  "name": "rent-example",
+  "version": "1.0.0",
+  "description": "rent example with steel framework for solana",
+  "scripts": {
+    "test": "cargo test-sbf",
+    "build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
+    "build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
+    "deploy": "solana program deploy ./program/target/so/rent_example_program.so"
+  },
+  "keywords": [],
+  "author": "Sabir Khan",
+  "license": "ISC"
+}

basics/rent/steel/program/src/create_account.rs

@@ -4,14 +4,14 @@ use steel::*;
 
 pub fn process_create_account(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     let args = CreateSystemAccount::try_from_bytes(data)?;
-    
+
     let [payer_info, new_account_info, system_program] = accounts else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
 
     payer_info.is_signer()?;
     new_account_info.is_signer()?;
-    
+
     let account_size = std::mem::size_of::<Address>();
     let rent = Rent::get()?;
     let lamports_required = rent.minimum_balance(account_size);

basics/rent/steel/program/src/lib.rs

@@ -18,4 +18,4 @@ pub fn process_instruction(
     Ok(())
 }
 
-entrypoint!(process_instruction);
+entrypoint!(process_instruction);

basics/rent/steel/program/tests/test.rs

@@ -21,7 +21,7 @@ async fn test_create_system_account() {
 
     // Generate a new keypair for the account we'll create
     let new_account = Keypair::new();
-    
+
     // Test data
     let name = "John Doe";
     let address = "123 Blockchain Street";
@@ -44,7 +44,11 @@ async fn test_create_system_account() {
 
     // Process transaction
     let result = banks_client.process_transaction(transaction).await;
-    assert!(result.is_ok(), "Failed to process transaction: {:?}", result);
+    assert!(
+        result.is_ok(),
+        "Failed to process transaction: {:?}",
+        result
+    );
 
     // Fetch and verify the created account
     let account = banks_client
@@ -54,30 +58,38 @@ async fn test_create_system_account() {
         .expect("Account not found");
 
     // Verify account owner
-    assert_eq!(account.owner, rent_example_api::ID, "Incorrect account owner");
+    assert_eq!(
+        account.owner,
+        rent_example_api::ID,
+        "Incorrect account owner"
+    );
 
     // Deserialize and verify account data
-    let address_account = Address::try_from_bytes(&account.data)
-        .expect("Failed to deserialize account data");
+    let address_account =
+        Address::try_from_bytes(&account.data).expect("Failed to deserialize account data");
 
     // Convert stored bytes back to strings for comparison
     let stored_name = String::from_utf8(
-        address_account.name
+        address_account
+            .name
             .iter()
             .take_while(|&&b| b != 0)
             .cloned()
-            .collect::<Vec<u8>>()
-    ).unwrap();
+            .collect::<Vec<u8>>(),
+    )
+    .unwrap();
 
     let stored_address = String::from_utf8(
-        address_account.address
+        address_account
+            .address
             .iter()
             .take_while(|&&b| b != 0)
             .cloned()
-            .collect::<Vec<u8>>()
-    ).unwrap();
+            .collect::<Vec<u8>>(),
+    )
+    .unwrap();
 
     // Verify the stored data matches what we sent
     assert_eq!(stored_name, name, "Stored name doesn't match");
     assert_eq!(stored_address, address, "Stored address doesn't match");
-}
+}