blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Remove unneeded unit expression" 

This reverts commit e8e009704681999946abffb050215d14b6d2c2b1.
This commit is contained in:
Will Hickey 2022-03-23 12:19:13 -05:00 committed by Michael Vines
parent b1280b670a
commit a573cfa39d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/program/src/message/legacy.rs
View File

@ -19,7 +19,7 @@ use {
message::{CompiledKeys, MessageHeader}, message::{CompiledKeys, MessageHeader},
pubkey::Pubkey, pubkey::Pubkey,
sanitize::{Sanitize, SanitizeError}, sanitize::{Sanitize, SanitizeError},
short_vec, system_instruction, system_program, sysvar, short_vec, system_instruction, system_program, sysvar, wasm_bindgen,
}, },
lazy_static::lazy_static, lazy_static::lazy_static,
std::{convert::TryFrom, str::FromStr}, std::{convert::TryFrom, str::FromStr},
@ -82,15 +82,18 @@ fn compile_instructions(ixs: &[Instruction], keys: &[Pubkey]) -> Vec<CompiledIns
/// redundantly specifying the fee-payer is not strictly required. /// redundantly specifying the fee-payer is not strictly required.
// NOTE: Serialization-related changes must be paired with the custom serialization // NOTE: Serialization-related changes must be paired with the custom serialization
// for versioned messages in the `RemainingLegacyMessage` struct. // for versioned messages in the `RemainingLegacyMessage` struct.
#[wasm_bindgen]
#[frozen_abi(digest = "2KnLEqfLcTBQqitE22Pp8JYkaqVVbAkGbCfdeHoyxcAU")] #[frozen_abi(digest = "2KnLEqfLcTBQqitE22Pp8JYkaqVVbAkGbCfdeHoyxcAU")]
#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, AbiExample)] #[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, AbiExample)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Message { pub struct Message {
/// The message header, identifying signed and read-only `account_keys`. /// The message header, identifying signed and read-only `account_keys`.
// NOTE: Serialization-related changes must be paired with the direct read at sigverify. // NOTE: Serialization-related changes must be paired with the direct read at sigverify.
#[wasm_bindgen(skip)]
pub header: MessageHeader, pub header: MessageHeader,
/// All the account keys used by this transaction. /// All the account keys used by this transaction.
#[wasm_bindgen(skip)]
#[serde(with = "short_vec")] #[serde(with = "short_vec")]
pub account_keys: Vec<Pubkey>, pub account_keys: Vec<Pubkey>,
@ -99,6 +102,7 @@ pub struct Message {
/// Programs that will be executed in sequence and committed in one atomic transaction if all /// Programs that will be executed in sequence and committed in one atomic transaction if all
/// succeed. /// succeed.
#[wasm_bindgen(skip)]
#[serde(with = "short_vec")] #[serde(with = "short_vec")]
pub instructions: Vec<CompiledInstruction>, pub instructions: Vec<CompiledInstruction>,
} }