Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit a15fee9

Browse files
authored
Governance: Unify borsh serialisation api (#4224)
1 parent 718a6b6 commit a15fee9

30 files changed

+72
-72
lines changed

governance/program/src/processor/process_add_signatory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub fn process_add_signatory(
6666
)?;
6767

6868
proposal_data.signatories_count = proposal_data.signatories_count.checked_add(1).unwrap();
69-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
69+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
7070

7171
Ok(())
7272
}

governance/program/src/processor/process_cancel_proposal.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ pub fn process_cancel_proposal(program_id: &Pubkey, accounts: &[AccountInfo]) ->
4545
.assert_token_owner_or_delegate_is_signer(governance_authority_info)?;
4646

4747
proposal_owner_record_data.decrease_outstanding_proposal_count();
48-
proposal_owner_record_data.serialize(&mut *proposal_owner_record_info.data.borrow_mut())?;
48+
proposal_owner_record_data.serialize(&mut proposal_owner_record_info.data.borrow_mut()[..])?;
4949

5050
proposal_data.state = ProposalState::Cancelled;
5151
proposal_data.closed_at = Some(clock.unix_timestamp);
5252

53-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
53+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
5454

5555
// Update Governance active_proposal_count
5656
governance_data.active_proposal_count = governance_data.active_proposal_count.saturating_sub(1);
57-
governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
57+
governance_data.serialize(&mut governance_info.data.borrow_mut()[..])?;
5858

5959
Ok(())
6060
}

governance/program/src/processor/process_cast_vote.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,21 @@ pub fn process_cast_vote(
179179
} else {
180180
proposal_owner_record_data.decrease_outstanding_proposal_count();
181181
proposal_owner_record_data
182-
.serialize(&mut *proposal_owner_record_info.data.borrow_mut())?;
182+
.serialize(&mut proposal_owner_record_info.data.borrow_mut()[..])?;
183183
};
184184

185185
// If the proposal is tipped decrease Governance active_proposal_count
186186
governance_data.active_proposal_count =
187187
governance_data.active_proposal_count.saturating_sub(1);
188-
governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
188+
governance_data.serialize(&mut governance_info.data.borrow_mut()[..])?;
189189
}
190190

191191
let governing_token_owner = voter_token_owner_record_data.governing_token_owner;
192192

193193
voter_token_owner_record_data
194-
.serialize(&mut *voter_token_owner_record_info.data.borrow_mut())?;
194+
.serialize(&mut voter_token_owner_record_info.data.borrow_mut()[..])?;
195195

196-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
196+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
197197

198198
// Create and serialize VoteRecord
199199
let vote_record_data = VoteRecordV2 {

governance/program/src/processor/process_complete_proposal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ pub fn process_complete_proposal(program_id: &Pubkey, accounts: &[AccountInfo])
3636
proposal_data.closed_at = Some(clock.unix_timestamp);
3737
proposal_data.state = ProposalState::Completed;
3838

39-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
39+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
4040
Ok(())
4141
}

governance/program/src/processor/process_create_proposal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub fn process_create_proposal(
108108
.outstanding_proposal_count
109109
.checked_add(1)
110110
.unwrap();
111-
proposal_owner_record_data.serialize(&mut *proposal_owner_record_info.data.borrow_mut())?;
111+
proposal_owner_record_data.serialize(&mut proposal_owner_record_info.data.borrow_mut()[..])?;
112112

113113
assert_valid_proposal_options(&options, &vote_type)?;
114114

governance/program/src/processor/process_deposit_governing_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pub fn process_deposit_governing_tokens(
132132
.checked_add(amount)
133133
.unwrap();
134134

135-
token_owner_record_data.serialize(&mut *token_owner_record_info.data.borrow_mut())?;
135+
token_owner_record_data.serialize(&mut token_owner_record_info.data.borrow_mut()[..])?;
136136
}
137137

138138
Ok(())

governance/program/src/processor/process_execute_transaction.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ pub fn process_execute_transaction(program_id: &Pubkey, accounts: &[AccountInfo]
105105
proposal_data.state = ProposalState::Completed;
106106
}
107107

108-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
108+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
109109

110110
proposal_transaction_data.executed_at = Some(clock.unix_timestamp);
111111
proposal_transaction_data.execution_status = TransactionExecutionStatus::Success;
112-
proposal_transaction_data.serialize(&mut *proposal_transaction_info.data.borrow_mut())?;
112+
proposal_transaction_data.serialize(&mut proposal_transaction_info.data.borrow_mut()[..])?;
113113

114114
Ok(())
115115
}

governance/program/src/processor/process_finalize_vote.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ pub fn process_finalize_vote(program_id: &Pubkey, accounts: &[AccountInfo]) -> P
7676
)?;
7777

7878
proposal_owner_record_data.decrease_outstanding_proposal_count();
79-
proposal_owner_record_data.serialize(&mut *proposal_owner_record_info.data.borrow_mut())?;
79+
proposal_owner_record_data.serialize(&mut proposal_owner_record_info.data.borrow_mut()[..])?;
8080

81-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
81+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
8282

8383
// Update Governance active_proposal_count
8484
governance_data.active_proposal_count = governance_data.active_proposal_count.saturating_sub(1);
85-
governance_data.serialize(&mut *governance_info.data.borrow_mut())?;
85+
governance_data.serialize(&mut governance_info.data.borrow_mut()[..])?;
8686

8787
Ok(())
8888
}

governance/program/src/processor/process_flag_transaction_error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ pub fn process_flag_transaction_error(
5656
}
5757

5858
proposal_data.state = ProposalState::ExecutingWithErrors;
59-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
59+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
6060

6161
proposal_transaction_data.execution_status = TransactionExecutionStatus::Error;
62-
proposal_transaction_data.serialize(&mut *proposal_transaction_info.data.borrow_mut())?;
62+
proposal_transaction_data.serialize(&mut proposal_transaction_info.data.borrow_mut()[..])?;
6363

6464
Ok(())
6565
}

governance/program/src/processor/process_insert_transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn process_insert_transaction(
8383
}
8484

8585
option.transactions_count = option.transactions_count.checked_add(1).unwrap();
86-
proposal_data.serialize(&mut *proposal_info.data.borrow_mut())?;
86+
proposal_data.serialize(&mut proposal_info.data.borrow_mut()[..])?;
8787

8888
let proposal_transaction_data = ProposalTransactionV2 {
8989
account_type: GovernanceAccountType::ProposalTransactionV2,

0 commit comments

Comments
 (0)