From 855e1d6dfa2d6a7baafd746917d4fbd65bed1efd Mon Sep 17 00:00:00 2001 From: Hendrik Hofstadt Date: Wed, 1 Sep 2021 17:09:39 +0200 Subject: [PATCH] Resolve compiler warnings Change-Id: I73c560b90ce4318d3aeb37f3dc336141dfef0e94 --- solana/modules/token_bridge/client/src/main.rs | 2 +- .../token_bridge/program/src/api/create_wrapped.rs | 4 ++-- .../modules/token_bridge/program/src/api/governance.rs | 10 +++++----- solana/modules/token_bridge/program/src/lib.rs | 2 +- solana/modules/token_bridge/program/src/messages.rs | 8 ++++---- solana/solitaire/program/src/macros.rs | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/solana/modules/token_bridge/client/src/main.rs b/solana/modules/token_bridge/client/src/main.rs index f4510315..3a5efab8 100644 --- a/solana/modules/token_bridge/client/src/main.rs +++ b/solana/modules/token_bridge/client/src/main.rs @@ -215,7 +215,7 @@ fn main() { .index(1) .required(true) .help("Specify the token bridge program address"), - ), + ), ) .subcommand( SubCommand::with_name("create-meta") diff --git a/solana/modules/token_bridge/program/src/api/create_wrapped.rs b/solana/modules/token_bridge/program/src/api/create_wrapped.rs index cf3c75c6..f202dc6a 100644 --- a/solana/modules/token_bridge/program/src/api/create_wrapped.rs +++ b/solana/modules/token_bridge/program/src/api/create_wrapped.rs @@ -116,7 +116,7 @@ pub fn create_wrapped( // Create mint account accs.mint - .create(&((&*accs).into()), ctx, accs.payer.key, Exempt); + .create(&((&*accs).into()), ctx, accs.payer.key, Exempt)?; // Initialize mint let init_ix = spl_token::instruction::initialize_mint( @@ -130,7 +130,7 @@ pub fn create_wrapped( // Create meta account accs.meta - .create(&((&*accs).into()), ctx, accs.payer.key, Exempt); + .create(&((&*accs).into()), ctx, accs.payer.key, Exempt)?; // Initialize spl meta accs.spl_metadata.verify_derivation( diff --git a/solana/modules/token_bridge/program/src/api/governance.rs b/solana/modules/token_bridge/program/src/api/governance.rs index 42ee6fe9..78876d84 100644 --- a/solana/modules/token_bridge/program/src/api/governance.rs +++ b/solana/modules/token_bridge/program/src/api/governance.rs @@ -101,8 +101,8 @@ pub fn upgrade_contract( accs: &mut UpgradeContract, _data: UpgradeContractData, ) -> Result<()> { - verify_governance(&accs.vaa); - accs.vaa.verify(&ctx.program_id)?; + verify_governance(&accs.vaa)?; + accs.vaa.verify(ctx.program_id)?; accs.vaa.claim(ctx, accs.payer.key)?; @@ -158,8 +158,8 @@ pub fn register_chain( .verify_derivation(ctx.program_id, &derivation_data)?; // Claim VAA - verify_governance(&accs.vaa); - accs.vaa.verify(&ctx.program_id)?; + verify_governance(&accs.vaa)?; + accs.vaa.verify(ctx.program_id)?; accs.vaa.claim(ctx, accs.payer.key)?; if accs.vaa.chain == CHAIN_ID_SOLANA { @@ -168,7 +168,7 @@ pub fn register_chain( // Create endpoint accs.endpoint - .create(&((&*accs).into()), ctx, accs.payer.key, Exempt); + .create(&((&*accs).into()), ctx, accs.payer.key, Exempt)?; accs.endpoint.chain = accs.vaa.chain; accs.endpoint.contract = accs.vaa.endpoint_address; diff --git a/solana/modules/token_bridge/program/src/lib.rs b/solana/modules/token_bridge/program/src/lib.rs index 8478b7e3..77547e2e 100644 --- a/solana/modules/token_bridge/program/src/lib.rs +++ b/solana/modules/token_bridge/program/src/lib.rs @@ -1,5 +1,5 @@ #![feature(const_generics)] -#![allow(warnings)] +#![deny(unused_must_use)] // #![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))] diff --git a/solana/modules/token_bridge/program/src/messages.rs b/solana/modules/token_bridge/program/src/messages.rs index a59aa2f2..d024661d 100644 --- a/solana/modules/token_bridge/program/src/messages.rs +++ b/solana/modules/token_bridge/program/src/messages.rs @@ -190,13 +190,13 @@ impl SerializePayload for PayloadAssetMeta { for i in 0..self.symbol.len() { symbol[i] = self.symbol.as_bytes()[i]; } - writer.write(&symbol); + writer.write(&symbol)?; let mut name: [u8; 32] = [0; 32]; for i in 0..self.name.len() { name[i] = self.name.as_bytes()[i]; } - writer.write(&name); + writer.write(&name)?; Ok(()) } @@ -246,7 +246,7 @@ where Self: SerializeGovernancePayload, { fn serialize(&self, writer: &mut W) -> Result<(), SolitaireError> { - self.write_governance_header(writer); + self.write_governance_header(writer)?; // Payload ID writer.write_u16::(self.chain)?; writer.write(&self.endpoint_address[..])?; @@ -263,7 +263,7 @@ pub struct GovernancePayloadUpgrade { impl SerializePayload for GovernancePayloadUpgrade { fn serialize(&self, v: &mut W) -> std::result::Result<(), SolitaireError> { - self.write_governance_header(v); + self.write_governance_header(v)?; v.write(&self.new_contract.to_bytes())?; Ok(()) } diff --git a/solana/solitaire/program/src/macros.rs b/solana/solitaire/program/src/macros.rs index 679464ac..b5a10846 100644 --- a/solana/solitaire/program/src/macros.rs +++ b/solana/solitaire/program/src/macros.rs @@ -136,7 +136,7 @@ macro_rules! pack_type { fn serialize(&self, writer: &mut W) -> std::io::Result<()> { let mut data = [0u8; <$embed as solana_program::program_pack::Pack>::LEN]; solana_program::program_pack::Pack::pack_into_slice(&self.0, &mut data); - writer.write(&data); + writer.write(&data)?; Ok(()) }