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

Resolve rust compiler warnings 

Change-Id: Iaac63d0fb44ecb7e03d68a10df7bddbb521c73a0
This commit is contained in:
Hendrik Hofstadt 2021-08-23 09:51:31 +02:00
parent a05017c043
commit f42453be45
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solana/bridge/program/src/api/post_message.rs
View File

@ -57,7 +57,8 @@ pub struct PostMessage<'b> {
pub clock: Sysvar<'b, Clock>, pub clock: Sysvar<'b, Clock>,
} }
impl<'b> InstructionContext<'b> for PostMessage<'b> {} impl<'b> InstructionContext<'b> for PostMessage<'b> {
}
#[derive(BorshDeserialize, BorshSerialize)] #[derive(BorshDeserialize, BorshSerialize)]
pub struct PostMessageData { pub struct PostMessageData {

1
solana/bridge/program/src/api/post_vaa.rs
View File

@ -23,7 +23,6 @@ use crate::{
PostVAAConsensusFailed, PostVAAConsensusFailed,
PostVAAGuardianSetExpired, PostVAAGuardianSetExpired,
}, },
CHAIN_ID_SOLANA,
}; };
use byteorder::{ use byteorder::{
BigEndian, BigEndian,

2
solana/bridge/program/src/instructions.rs
View File

@ -173,7 +173,7 @@ pub fn post_vaa(
&program_id, &program_id,
); );
let mut msg_derivation_data = &PostedVAADerivationData { let msg_derivation_data = &PostedVAADerivationData {
payload_hash: hash_vaa(&vaa).to_vec(), payload_hash: hash_vaa(&vaa).to_vec(),
}; };

31
solana/bridge/program/src/types.rs
View File

@ -41,7 +41,6 @@ use std::{
Deref, Deref,
DerefMut, DerefMut,
}, },
str::FromStr,
}; };
#[derive(Default, BorshSerialize, BorshDeserialize, Serialize, Deserialize)] #[derive(Default, BorshSerialize, BorshDeserialize, Serialize, Deserialize)]
@ -176,9 +175,8 @@ impl Owned for PostedMessageData {
#[cfg(feature = "cpi")] #[cfg(feature = "cpi")]
impl Owned for PostedMessageData { impl Owned for PostedMessageData {
fn owner(&self) -> AccountOwner { fn owner(&self) -> AccountOwner {
AccountOwner::Other( use std::str::FromStr;
Pubkey::from_str(env!("BRIDGE_ADDRESS")).unwrap(), AccountOwner::Other(Pubkey::from_str(env!("BRIDGE_ADDRESS")).unwrap())
)
} }
} }
@ -270,9 +268,8 @@ impl Owned for PostedVAAData {
#[cfg(feature = "cpi")] #[cfg(feature = "cpi")]
impl Owned for PostedVAAData { impl Owned for PostedVAAData {
fn owner(&self) -> AccountOwner { fn owner(&self) -> AccountOwner {
AccountOwner::Other( use std::str::FromStr;
Pubkey::from_str(env!("BRIDGE_ADDRESS")).unwrap(), AccountOwner::Other(Pubkey::from_str(env!("BRIDGE_ADDRESS")).unwrap())
)
} }
} }
@ -311,7 +308,7 @@ impl SerializePayload for GovernancePayloadUpgrade {
} }
impl DeserializePayload for GovernancePayloadUpgrade impl DeserializePayload for GovernancePayloadUpgrade
where where
Self: DeserializeGovernancePayload, Self: DeserializeGovernancePayload,
{ {
fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> { fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> {
@ -336,7 +333,8 @@ impl SerializeGovernancePayload for GovernancePayloadUpgrade {
const ACTION: u8 = 1; const ACTION: u8 = 1;
} }
impl DeserializeGovernancePayload for GovernancePayloadUpgrade {} impl DeserializeGovernancePayload for GovernancePayloadUpgrade {
}
pub struct GovernancePayloadGuardianSetChange { pub struct GovernancePayloadGuardianSetChange {
// New GuardianSetIndex // New GuardianSetIndex
@ -359,7 +357,7 @@ impl SerializePayload for GovernancePayloadGuardianSetChange {
} }
impl DeserializePayload for GovernancePayloadGuardianSetChange impl DeserializePayload for GovernancePayloadGuardianSetChange
where where
Self: DeserializeGovernancePayload, Self: DeserializeGovernancePayload,
{ {
fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> { fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> {
@ -392,7 +390,8 @@ impl SerializeGovernancePayload for GovernancePayloadGuardianSetChange {
const ACTION: u8 = 2; const ACTION: u8 = 2;
} }
impl DeserializeGovernancePayload for GovernancePayloadGuardianSetChange {} impl DeserializeGovernancePayload for GovernancePayloadGuardianSetChange {
}
pub struct GovernancePayloadSetMessageFee { pub struct GovernancePayloadSetMessageFee {
// New fee in lamports // New fee in lamports
@ -410,7 +409,7 @@ impl SerializePayload for GovernancePayloadSetMessageFee {
} }
impl DeserializePayload for GovernancePayloadSetMessageFee impl DeserializePayload for GovernancePayloadSetMessageFee
where where
Self: DeserializeGovernancePayload, Self: DeserializeGovernancePayload,
{ {
fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> { fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> {
@ -434,7 +433,8 @@ impl SerializeGovernancePayload for GovernancePayloadSetMessageFee {
const ACTION: u8 = 3; const ACTION: u8 = 3;
} }
impl DeserializeGovernancePayload for GovernancePayloadSetMessageFee {} impl DeserializeGovernancePayload for GovernancePayloadSetMessageFee {
}
pub struct GovernancePayloadTransferFees { pub struct GovernancePayloadTransferFees {
// Amount to be transferred // Amount to be transferred
@ -455,7 +455,7 @@ impl SerializePayload for GovernancePayloadTransferFees {
} }
impl DeserializePayload for GovernancePayloadTransferFees impl DeserializePayload for GovernancePayloadTransferFees
where where
Self: DeserializeGovernancePayload, Self: DeserializeGovernancePayload,
{ {
fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> { fn deserialize(buf: &mut &[u8]) -> Result<Self, SolitaireError> {
@ -482,7 +482,8 @@ impl SerializeGovernancePayload for GovernancePayloadTransferFees {
const ACTION: u8 = 4; const ACTION: u8 = 4;
} }
impl DeserializeGovernancePayload for GovernancePayloadTransferFees {} impl DeserializeGovernancePayload for GovernancePayloadTransferFees {
}
#[repr(u8)] #[repr(u8)]
#[derive(BorshSerialize, BorshDeserialize, Clone, Serialize, Deserialize)] #[derive(BorshSerialize, BorshDeserialize, Clone, Serialize, Deserialize)]