Skip to content

Commit 480026d

Browse files
refactor(renderers-rust): extract solana-cpi, solana-msg and cleanup (#654)
* refactor: extract solana-cpi, solana-msg and cleanup * fix: linter error in tests due to the line len
1 parent dcedfb5 commit 480026d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1257
-371
lines changed

.changeset/nasty-cars-smile.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@codama/renderers-rust': minor
3+
---
4+
5+
extract solana-cpi, solana-msg and cleanup

packages/renderers-rust/e2e/anchor/Cargo.lock

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/renderers-rust/e2e/anchor/Cargo.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ num-traits = "^0.2"
1919
serde = { version = "^1.0", features = ["derive"], optional = true }
2020
serde_with = { version = "^3.0", optional = true }
2121
solana-account-info = "2.2.1"
22-
solana-program = "2.2.1"
22+
solana-client = { version = "~1.18", optional = true }
23+
solana-cpi = "2.2.1"
24+
solana-decode-error = "2.2.1"
25+
solana-instruction = "2.2.1"
26+
solana-msg = "2.2.1"
2327
solana-program-entrypoint = "2.2.1"
2428
solana-program-error = "2.2.1"
25-
solana-instruction = "2.2.1"
26-
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
27-
solana-client = { version = "~1.18", optional = true }
29+
solana-pubkey = { version = "2.2.1", features = ["curve25519", "borsh"] }
2830
solana-sdk = { version = "~1.18", optional = true }
2931
thiserror = "^1.0"
3032

packages/renderers-rust/e2e/anchor/src/generated/errors/wen_transfer_guard.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ pub enum WenTransferGuardError {
3838

3939
impl solana_program_error::PrintProgramError for WenTransferGuardError {
4040
fn print<E>(&self) {
41-
solana_program::msg!(&self.to_string());
41+
solana_msg::msg!(&self.to_string());
4242
}
4343
}
4444

45-
impl<T> solana_program::decode_error::DecodeError<T> for WenTransferGuardError {
45+
impl<T> solana_decode_error::DecodeError<T> for WenTransferGuardError {
4646
fn type_of() -> &'static str {
4747
"WenTransferGuardError"
4848
}

packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,9 @@ impl<'a, 'b> CreateGuardCpi<'a, 'b> {
420420
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));
421421

422422
if signers_seeds.is_empty() {
423-
solana_program::program::invoke(&instruction, &account_infos)
423+
solana_cpi::invoke(&instruction, &account_infos)
424424
} else {
425-
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
425+
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
426426
}
427427
}
428428
}

packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ impl<'a, 'b> ExecuteCpi<'a, 'b> {
357357
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));
358358

359359
if signers_seeds.is_empty() {
360-
solana_program::program::invoke(&instruction, &account_infos)
360+
solana_cpi::invoke(&instruction, &account_infos)
361361
} else {
362-
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
362+
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
363363
}
364364
}
365365
}

packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ impl<'a, 'b> InitializeCpi<'a, 'b> {
303303
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));
304304

305305
if signers_seeds.is_empty() {
306-
solana_program::program::invoke(&instruction, &account_infos)
306+
solana_cpi::invoke(&instruction, &account_infos)
307307
} else {
308-
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
308+
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
309309
}
310310
}
311311
}

packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ impl<'a, 'b> UpdateGuardCpi<'a, 'b> {
351351
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));
352352

353353
if signers_seeds.is_empty() {
354-
solana_program::program::invoke(&instruction, &account_infos)
354+
solana_cpi::invoke(&instruction, &account_infos)
355355
} else {
356-
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
356+
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
357357
}
358358
}
359359
}

packages/renderers-rust/e2e/dummy/Cargo.lock

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/renderers-rust/e2e/dummy/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ kaigan = "0.2.5"
1616
num-derive = "^0.3"
1717
num-traits = "^0.2"
1818
serde = { version = "^1.0", features = ["derive"], optional = true }
19+
serde-big-array = { version = "^0.5", optional = true }
1920
serde_with = { version = "^3.0", optional = true }
2021
solana-account-info = "2.2.1"
21-
solana-program = "2.2.1"
22+
solana-cpi = "2.2.1"
23+
solana-decode-error = "2.2.1"
24+
solana-instruction = "2.2.1"
25+
solana-msg = "2.2.1"
2226
solana-program-entrypoint = "2.2.1"
2327
solana-program-error = "2.2.1"
24-
solana-instruction = "2.2.1"
2528
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
26-
serde-big-array = { version = "^0.5", optional = true }
2729
thiserror = "^1.0"
2830

2931
[dev-dependencies]

0 commit comments

Comments
 (0)