Skip to content

Commit c2c98a8

Browse files
committed
degrade borsh version for compatibility
1 parent 9416dd3 commit c2c98a8

Some content is hidden

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

45 files changed

+6675
-121
lines changed

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

Lines changed: 6538 additions & 0 deletions
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ test-sbf = []
1111

1212
[dependencies]
1313
anchor-lang = { version = "0.30.0", optional = true }
14-
borsh = "^1.5.3"
15-
borsh-derive = "^1.5.3"
14+
borsh = "^0.10"
1615
kaigan = "0.2.5"
1716
num-derive = "^0.3"
1817
num-traits = "^0.2"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ impl CreateGuard {
7575
false,
7676
));
7777
accounts.extend_from_slice(remaining_accounts);
78-
let mut data = borsh::to_vec(&CreateGuardInstructionData::new()).unwrap();
79-
let mut args = borsh::to_vec(&args).unwrap();
78+
let mut data = CreateGuardInstructionData::new().try_to_vec().unwrap();
79+
let mut args = args.try_to_vec().unwrap();
8080
data.append(&mut args);
8181

8282
solana_program::instruction::Instruction {
@@ -428,8 +428,8 @@ impl<'a, 'b> CreateGuardCpi<'a, 'b> {
428428
is_writable: remaining_account.2,
429429
})
430430
});
431-
let mut data = borsh::to_vec(&CreateGuardInstructionData::new()).unwrap();
432-
let mut args = borsh::to_vec(&self.__args).unwrap();
431+
let mut data = CreateGuardInstructionData::new().try_to_vec().unwrap();
432+
let mut args = self.__args.try_to_vec().unwrap();
433433
data.append(&mut args);
434434

435435
let instruction = solana_program::instruction::Instruction {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ impl Execute {
6767
false,
6868
));
6969
accounts.extend_from_slice(remaining_accounts);
70-
let mut data = borsh::to_vec(&ExecuteInstructionData::new()).unwrap();
71-
let mut args = borsh::to_vec(&args).unwrap();
70+
let mut data = ExecuteInstructionData::new().try_to_vec().unwrap();
71+
let mut args = args.try_to_vec().unwrap();
7272
data.append(&mut args);
7373

7474
solana_program::instruction::Instruction {
@@ -351,8 +351,8 @@ impl<'a, 'b> ExecuteCpi<'a, 'b> {
351351
is_writable: remaining_account.2,
352352
})
353353
});
354-
let mut data = borsh::to_vec(&ExecuteInstructionData::new()).unwrap();
355-
let mut args = borsh::to_vec(&self.__args).unwrap();
354+
let mut data = ExecuteInstructionData::new().try_to_vec().unwrap();
355+
let mut args = self.__args.try_to_vec().unwrap();
356356
data.append(&mut args);
357357

358358
let instruction = solana_program::instruction::Instruction {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl Initialize {
5656
self.payer, true,
5757
));
5858
accounts.extend_from_slice(remaining_accounts);
59-
let data = borsh::to_vec(&InitializeInstructionData::new()).unwrap();
59+
let data = InitializeInstructionData::new().try_to_vec().unwrap();
6060

6161
solana_program::instruction::Instruction {
6262
program_id: crate::WEN_TRANSFER_GUARD_ID,
@@ -299,7 +299,7 @@ impl<'a, 'b> InitializeCpi<'a, 'b> {
299299
is_writable: remaining_account.2,
300300
})
301301
});
302-
let data = borsh::to_vec(&InitializeInstructionData::new()).unwrap();
302+
let data = InitializeInstructionData::new().try_to_vec().unwrap();
303303

304304
let instruction = solana_program::instruction::Instruction {
305305
program_id: crate::WEN_TRANSFER_GUARD_ID,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ impl UpdateGuard {
6464
false,
6565
));
6666
accounts.extend_from_slice(remaining_accounts);
67-
let mut data = borsh::to_vec(&UpdateGuardInstructionData::new()).unwrap();
68-
let mut args = borsh::to_vec(&args).unwrap();
67+
let mut data = UpdateGuardInstructionData::new().try_to_vec().unwrap();
68+
let mut args = args.try_to_vec().unwrap();
6969
data.append(&mut args);
7070

7171
solana_program::instruction::Instruction {
@@ -348,8 +348,8 @@ impl<'a, 'b> UpdateGuardCpi<'a, 'b> {
348348
is_writable: remaining_account.2,
349349
})
350350
});
351-
let mut data = borsh::to_vec(&UpdateGuardInstructionData::new()).unwrap();
352-
let mut args = borsh::to_vec(&self.__args).unwrap();
351+
let mut data = UpdateGuardInstructionData::new().try_to_vec().unwrap();
352+
let mut args = self.__args.try_to_vec().unwrap();
353353
data.append(&mut args);
354354

355355
let instruction = solana_program::instruction::Instruction {

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

Lines changed: 1 addition & 2 deletions
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ test-sbf = []
1111

1212
[dependencies]
1313
anchor-lang = { version = "0.30.0", optional = true }
14-
borsh = "^1.5.3"
15-
borsh-derive = "^1.5.3"
14+
borsh = "^0.10"
1615
kaigan = "0.2.5"
1716
num-derive = "^0.3"
1817
num-traits = "^0.2"

packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Instruction1 {
2323
) -> solana_program::instruction::Instruction {
2424
let mut accounts = Vec::with_capacity(remaining_accounts.len());
2525
accounts.extend_from_slice(remaining_accounts);
26-
let data = borsh::to_vec(&Instruction1InstructionData::new()).unwrap();
26+
let data = Instruction1InstructionData::new().try_to_vec().unwrap();
2727

2828
solana_program::instruction::Instruction {
2929
program_id: crate::DUMMY_ID,
@@ -138,7 +138,7 @@ impl<'a, 'b> Instruction1Cpi<'a, 'b> {
138138
is_writable: remaining_account.2,
139139
})
140140
});
141-
let data = borsh::to_vec(&Instruction1InstructionData::new()).unwrap();
141+
let data = Instruction1InstructionData::new().try_to_vec().unwrap();
142142

143143
let instruction = solana_program::instruction::Instruction {
144144
program_id: crate::DUMMY_ID,

packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl Instruction2 {
2323
) -> solana_program::instruction::Instruction {
2424
let mut accounts = Vec::with_capacity(remaining_accounts.len());
2525
accounts.extend_from_slice(remaining_accounts);
26-
let data = borsh::to_vec(&Instruction2InstructionData::new()).unwrap();
26+
let data = Instruction2InstructionData::new().try_to_vec().unwrap();
2727

2828
solana_program::instruction::Instruction {
2929
program_id: crate::DUMMY_ID,
@@ -138,7 +138,7 @@ impl<'a, 'b> Instruction2Cpi<'a, 'b> {
138138
is_writable: remaining_account.2,
139139
})
140140
});
141-
let data = borsh::to_vec(&Instruction2InstructionData::new()).unwrap();
141+
let data = Instruction2InstructionData::new().try_to_vec().unwrap();
142142

143143
let instruction = solana_program::instruction::Instruction {
144144
program_id: crate::DUMMY_ID,

0 commit comments

Comments
 (0)