From 27c76c7494b34581e3d90e0b69f62557c392df04 Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Mon, 9 May 2022 13:24:33 +0200 Subject: [PATCH] comments Signed-off-by: microwavedcola1 --- keeper/src/consume_events.rs | 15 ++++----------- keeper/src/crank.rs | 1 + keeper/src/main.rs | 1 + keeper/src/update_index.rs | 3 +-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/keeper/src/consume_events.rs b/keeper/src/consume_events.rs index 37d5d80af..2bc4dedbd 100644 --- a/keeper/src/consume_events.rs +++ b/keeper/src/consume_events.rs @@ -2,7 +2,6 @@ use std::{sync::Arc, time::Duration}; use anchor_lang::{AccountDeserialize, __private::bytemuck::cast_ref}; -use log::{info, warn}; use mango_v4::state::{EventQueue, EventType, FillEvent, OutEvent, PerpMarket}; use solana_sdk::{ @@ -36,6 +35,8 @@ pub fn perform_operation( let mut ams_ = vec![]; + // TODO: future, choose better constant of how many max events to pack + // TODO: future, choose better constant of how many max mango accounts to pack for _ in 0..10 { let event = match event_queue.peek_front() { None => break, @@ -92,7 +93,7 @@ pub fn perform_operation( .send(); match sig_result { Ok(sig) => { - info!( + log::info!( "Crank: consume event for perp_market {:?} ix signature: {:?}", format!("{: >6}", perp_market.name()), sig @@ -113,15 +114,7 @@ fn get_event_queue( .rpc .get_account_with_commitment(&perp_market.event_queue, mango_client.commitment); - let res = match res { - Ok(x) => x, - Err(e) => { - warn!("{}", e); - return Err(Ok(())); - } - }; - - let data = res.value.unwrap().data; + let data = res.unwrap().value.unwrap().data; let mut data_slice: &[u8] = &data; AccountDeserialize::try_deserialize(&mut data_slice).ok() }; diff --git a/keeper/src/crank.rs b/keeper/src/crank.rs index 0c315e640..e320a8079 100644 --- a/keeper/src/crank.rs +++ b/keeper/src/crank.rs @@ -60,6 +60,7 @@ pub async fn runner( // TODO: enable // ensure!(!perp_markets.is_empty()); + // atm no perp code is deployed to devnet, and no perp markets have been init let handles2 = perp_markets .iter() diff --git a/keeper/src/main.rs b/keeper/src/main.rs index ce5acc0e8..0261e2bfd 100644 --- a/keeper/src/main.rs +++ b/keeper/src/main.rs @@ -159,6 +159,7 @@ fn main() -> Result<(), anyhow::Error> { .build() .unwrap(); + // TODO: future: remove, just for learning purposes let debugging_handle = async { let mut interval = time::interval(time::Duration::from_secs(5)); loop { diff --git a/keeper/src/update_index.rs b/keeper/src/update_index.rs index c2409b846..ab64888a9 100644 --- a/keeper/src/update_index.rs +++ b/keeper/src/update_index.rs @@ -1,6 +1,5 @@ use std::{sync::Arc, time::Duration}; -use log::info; use mango_v4::state::Bank; use solana_sdk::{instruction::Instruction, pubkey::Pubkey}; @@ -38,7 +37,7 @@ pub fn perform_operation( .send(); match sig_result { Ok(sig) => { - info!( + log::info!( "Crank: update_index for bank {:?} ix signature: {:?}", format!("{: >6}", bank.name()), sig