Resolve compiler warnings
Change-Id: I73c560b90ce4318d3aeb37f3dc336141dfef0e94
This commit is contained in:
parent
086cd0d706
commit
855e1d6dfa
|
@ -215,7 +215,7 @@ fn main() {
|
||||||
.index(1)
|
.index(1)
|
||||||
.required(true)
|
.required(true)
|
||||||
.help("Specify the token bridge program address"),
|
.help("Specify the token bridge program address"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.subcommand(
|
.subcommand(
|
||||||
SubCommand::with_name("create-meta")
|
SubCommand::with_name("create-meta")
|
||||||
|
|
|
@ -116,7 +116,7 @@ pub fn create_wrapped(
|
||||||
|
|
||||||
// Create mint account
|
// Create mint account
|
||||||
accs.mint
|
accs.mint
|
||||||
.create(&((&*accs).into()), ctx, accs.payer.key, Exempt);
|
.create(&((&*accs).into()), ctx, accs.payer.key, Exempt)?;
|
||||||
|
|
||||||
// Initialize mint
|
// Initialize mint
|
||||||
let init_ix = spl_token::instruction::initialize_mint(
|
let init_ix = spl_token::instruction::initialize_mint(
|
||||||
|
@ -130,7 +130,7 @@ pub fn create_wrapped(
|
||||||
|
|
||||||
// Create meta account
|
// Create meta account
|
||||||
accs.meta
|
accs.meta
|
||||||
.create(&((&*accs).into()), ctx, accs.payer.key, Exempt);
|
.create(&((&*accs).into()), ctx, accs.payer.key, Exempt)?;
|
||||||
|
|
||||||
// Initialize spl meta
|
// Initialize spl meta
|
||||||
accs.spl_metadata.verify_derivation(
|
accs.spl_metadata.verify_derivation(
|
||||||
|
|
|
@ -101,8 +101,8 @@ pub fn upgrade_contract(
|
||||||
accs: &mut UpgradeContract,
|
accs: &mut UpgradeContract,
|
||||||
_data: UpgradeContractData,
|
_data: UpgradeContractData,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
verify_governance(&accs.vaa);
|
verify_governance(&accs.vaa)?;
|
||||||
accs.vaa.verify(&ctx.program_id)?;
|
accs.vaa.verify(ctx.program_id)?;
|
||||||
|
|
||||||
accs.vaa.claim(ctx, accs.payer.key)?;
|
accs.vaa.claim(ctx, accs.payer.key)?;
|
||||||
|
|
||||||
|
@ -158,8 +158,8 @@ pub fn register_chain(
|
||||||
.verify_derivation(ctx.program_id, &derivation_data)?;
|
.verify_derivation(ctx.program_id, &derivation_data)?;
|
||||||
|
|
||||||
// Claim VAA
|
// Claim VAA
|
||||||
verify_governance(&accs.vaa);
|
verify_governance(&accs.vaa)?;
|
||||||
accs.vaa.verify(&ctx.program_id)?;
|
accs.vaa.verify(ctx.program_id)?;
|
||||||
accs.vaa.claim(ctx, accs.payer.key)?;
|
accs.vaa.claim(ctx, accs.payer.key)?;
|
||||||
|
|
||||||
if accs.vaa.chain == CHAIN_ID_SOLANA {
|
if accs.vaa.chain == CHAIN_ID_SOLANA {
|
||||||
|
@ -168,7 +168,7 @@ pub fn register_chain(
|
||||||
|
|
||||||
// Create endpoint
|
// Create endpoint
|
||||||
accs.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.chain = accs.vaa.chain;
|
||||||
accs.endpoint.contract = accs.vaa.endpoint_address;
|
accs.endpoint.contract = accs.vaa.endpoint_address;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#![feature(const_generics)]
|
#![feature(const_generics)]
|
||||||
#![allow(warnings)]
|
#![deny(unused_must_use)]
|
||||||
|
|
||||||
// #![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
|
// #![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
|
||||||
|
|
||||||
|
|
|
@ -190,13 +190,13 @@ impl SerializePayload for PayloadAssetMeta {
|
||||||
for i in 0..self.symbol.len() {
|
for i in 0..self.symbol.len() {
|
||||||
symbol[i] = self.symbol.as_bytes()[i];
|
symbol[i] = self.symbol.as_bytes()[i];
|
||||||
}
|
}
|
||||||
writer.write(&symbol);
|
writer.write(&symbol)?;
|
||||||
|
|
||||||
let mut name: [u8; 32] = [0; 32];
|
let mut name: [u8; 32] = [0; 32];
|
||||||
for i in 0..self.name.len() {
|
for i in 0..self.name.len() {
|
||||||
name[i] = self.name.as_bytes()[i];
|
name[i] = self.name.as_bytes()[i];
|
||||||
}
|
}
|
||||||
writer.write(&name);
|
writer.write(&name)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -246,7 +246,7 @@ where
|
||||||
Self: SerializeGovernancePayload,
|
Self: SerializeGovernancePayload,
|
||||||
{
|
{
|
||||||
fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), SolitaireError> {
|
fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), SolitaireError> {
|
||||||
self.write_governance_header(writer);
|
self.write_governance_header(writer)?;
|
||||||
// Payload ID
|
// Payload ID
|
||||||
writer.write_u16::<BigEndian>(self.chain)?;
|
writer.write_u16::<BigEndian>(self.chain)?;
|
||||||
writer.write(&self.endpoint_address[..])?;
|
writer.write(&self.endpoint_address[..])?;
|
||||||
|
@ -263,7 +263,7 @@ pub struct GovernancePayloadUpgrade {
|
||||||
|
|
||||||
impl SerializePayload for GovernancePayloadUpgrade {
|
impl SerializePayload for GovernancePayloadUpgrade {
|
||||||
fn serialize<W: Write>(&self, v: &mut W) -> std::result::Result<(), SolitaireError> {
|
fn serialize<W: Write>(&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())?;
|
v.write(&self.new_contract.to_bytes())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,7 +136,7 @@ macro_rules! pack_type {
|
||||||
fn serialize<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
|
fn serialize<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
|
||||||
let mut data = [0u8; <$embed as solana_program::program_pack::Pack>::LEN];
|
let mut data = [0u8; <$embed as solana_program::program_pack::Pack>::LEN];
|
||||||
solana_program::program_pack::Pack::pack_into_slice(&self.0, &mut data);
|
solana_program::program_pack::Pack::pack_into_slice(&self.0, &mut data);
|
||||||
writer.write(&data);
|
writer.write(&data)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue