Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean up default processor #507

Merged
merged 5 commits into from
Sep 27, 2024
Merged

clean up default processor #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6922840
clean up default processor
yuunlimm Sep 13, 2024
3e26919
lint
yuunlimm Sep 17, 2024
915bff4
resolve conflicts
yuunlimm Sep 18, 2024
e72e226
lint
yuunlimm Sep 26, 2024
2608d74
lint
yuunlimm Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rust/indexer-metrics/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ impl RunnableConfig for PostProcessorConfig {
}
}

#[allow(clippy::needless_return)]
#[tokio::main]
async fn main() -> Result<()> {
let args = ServerArgs::parse();
Expand Down Expand Up @@ -198,6 +199,7 @@ async fn start_processor_status_fetch(url: String, chain_name: String) {
}
}

#[allow(clippy::needless_return)]
#[cfg(test)]
mod test {
use super::*;
Expand Down
1 change: 1 addition & 0 deletions rust/integration-tests/src/event_processor/event_processor_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[allow(clippy::needless_return)]
#[cfg(test)]
mod test {
use crate::{TestContext, TestProcessorConfig};
Expand Down
264 changes: 14 additions & 250 deletions rust/processor/src/db/common/models/default_models/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,10 @@
#![allow(clippy::unused_unit)]

use super::{
block_metadata_transactions::BlockMetadataTransaction,
write_set_changes::{WriteSetChangeDetail, WriteSetChangeModel},
};
use crate::{
schema::transactions,
utils::{
counters::PROCESSOR_UNKNOWN_TYPE_COUNT,
util::{
get_clean_payload, get_clean_writeset, get_payload_type, standardize_address,
u64_to_bigdecimal,
},
},
};
use aptos_protos::transaction::v1::{
transaction::{TransactionType, TxnData},
Transaction as TransactionPB, TransactionInfo,
block_metadata_transactions::BlockMetadataTransaction, write_set_changes::WriteSetChangeDetail,
};
use crate::{schema::transactions, utils::counters::PROCESSOR_UNKNOWN_TYPE_COUNT};
use aptos_protos::transaction::v1::{transaction::TxnData, Transaction as TransactionPB};
use bigdecimal::BigDecimal;
use field_count::FieldCount;
use rayon::prelude::*;
Expand Down Expand Up @@ -50,109 +37,10 @@ pub struct Transaction {
pub payload_type: Option<String>,
}

impl Default for Transaction {
fn default() -> Self {
Self {
version: 0,
block_height: 0,
hash: "".to_string(),
type_: "".to_string(),
payload: None,
state_change_hash: "".to_string(),
event_root_hash: "".to_string(),
state_checkpoint_hash: None,
gas_used: BigDecimal::from(0),
success: true,
vm_status: "".to_string(),
accumulator_root_hash: "".to_string(),
num_events: 0,
num_write_set_changes: 0,
epoch: 0,
payload_type: None,
}
}
}

impl Transaction {
fn from_transaction_info(
info: &TransactionInfo,
version: i64,
epoch: i64,
block_height: i64,
) -> Self {
Self {
version,
block_height,
hash: standardize_address(hex::encode(info.hash.as_slice()).as_str()),
state_change_hash: standardize_address(
hex::encode(info.state_change_hash.as_slice()).as_str(),
),
event_root_hash: standardize_address(
hex::encode(info.event_root_hash.as_slice()).as_str(),
),
state_checkpoint_hash: info
.state_checkpoint_hash
.as_ref()
.map(|hash| standardize_address(hex::encode(hash).as_str())),
gas_used: u64_to_bigdecimal(info.gas_used),
success: info.success,
vm_status: info.vm_status.clone(),
accumulator_root_hash: standardize_address(
hex::encode(info.accumulator_root_hash.as_slice()).as_str(),
),
num_write_set_changes: info.changes.len() as i64,
epoch,
..Default::default()
}
}

fn from_transaction_info_with_data(
info: &TransactionInfo,
payload: Option<serde_json::Value>,
payload_type: Option<String>,
version: i64,
type_: String,
num_events: i64,
block_height: i64,
epoch: i64,
) -> Self {
Self {
type_,
payload,
version,
block_height,
hash: standardize_address(hex::encode(info.hash.as_slice()).as_str()),
state_change_hash: standardize_address(
hex::encode(info.state_change_hash.as_slice()).as_str(),
),
event_root_hash: standardize_address(
hex::encode(info.event_root_hash.as_slice()).as_str(),
),
state_checkpoint_hash: info
.state_checkpoint_hash
.as_ref()
.map(|hash| standardize_address(hex::encode(hash).as_str())),
gas_used: u64_to_bigdecimal(info.gas_used),
success: info.success,
vm_status: info.vm_status.clone(),
accumulator_root_hash: standardize_address(
hex::encode(info.accumulator_root_hash.as_slice()).as_str(),
),
num_events,
num_write_set_changes: info.changes.len() as i64,
epoch,
payload_type,
}
}

pub fn from_transaction(
transaction: &TransactionPB,
) -> (
Self,
Option<BlockMetadataTransaction>,
Vec<WriteSetChangeModel>,
Vec<WriteSetChangeDetail>,
) {
) -> (Option<BlockMetadataTransaction>, Vec<WriteSetChangeDetail>) {
let block_height = transaction.block_height as i64;
let epoch = transaction.epoch as i64;
let transaction_info = transaction
Expand All @@ -169,166 +57,44 @@ impl Transaction {
transaction_version = transaction.version,
"Transaction data doesn't exist",
);
let transaction_out = Self::from_transaction_info(
transaction_info,
transaction.version as i64,
epoch,
block_height,
);
return (transaction_out, None, Vec::new(), Vec::new());
return (None, Vec::new());
},
};
let version = transaction.version as i64;
let transaction_type = TransactionType::try_from(transaction.r#type)
.expect("Transaction type doesn't exist!")
.as_str_name()
.to_string();
let timestamp = transaction
.timestamp
.as_ref()
.expect("Transaction timestamp doesn't exist!");

let (wsc, wsc_detail) = WriteSetChangeModel::from_write_set_changes(
let wsc_detail = WriteSetChangeDetail::from_write_set_changes(
&transaction_info.changes,
version,
block_height,
);

match txn_data {
TxnData::User(user_txn) => {
let request = &user_txn
.request
.as_ref()
.expect("Getting user request failed.");

let (payload_cleaned, payload_type) = match request.payload.as_ref() {
Some(payload) => {
let payload_cleaned = get_clean_payload(payload, version);
(payload_cleaned, Some(get_payload_type(payload)))
},
None => (None, None),
};

(
Self::from_transaction_info_with_data(
transaction_info,
payload_cleaned,
payload_type,
version,
transaction_type,
user_txn.events.len() as i64,
block_height,
epoch,
),
None,
wsc,
wsc_detail,
)
},
TxnData::Genesis(genesis_txn) => {
let payload_cleaned = genesis_txn
.payload
.as_ref()
.map(|payload| get_clean_writeset(payload, version))
.unwrap_or(None);
// It's genesis so no big deal
let payload_type = None;
(
Self::from_transaction_info_with_data(
transaction_info,
payload_cleaned,
payload_type,
version,
transaction_type,
genesis_txn.events.len() as i64,
block_height,
epoch,
),
None,
wsc,
wsc_detail,
)
},
TxnData::BlockMetadata(block_metadata_txn) => (
Self::from_transaction_info_with_data(
transaction_info,
None,
None,
version,
transaction_type,
block_metadata_txn.events.len() as i64,
block_height,
epoch,
),
Some(BlockMetadataTransaction::from_transaction(
block_metadata_txn,
version,
block_height,
epoch,
timestamp,
)),
wsc,
wsc_detail,
),
TxnData::StateCheckpoint(_) => (
Self::from_transaction_info_with_data(
transaction_info,
None,
None,
version,
transaction_type,
0,
block_height,
epoch,
),
None,
vec![],
vec![],
),
TxnData::Validator(_) => (
Self::from_transaction_info_with_data(
transaction_info,
None,
None,
version,
transaction_type,
0,
block_height,
epoch,
),
None,
wsc,
wsc_detail,
),
TxnData::BlockEpilogue(_) => (
Self::from_transaction_info_with_data(
transaction_info,
None,
None,
version,
transaction_type,
0,
block_height,
epoch,
),
None,
vec![],
vec![],
),
TxnData::User(_) => (None, wsc_detail),
TxnData::Genesis(_) => (None, wsc_detail),
TxnData::StateCheckpoint(_) => (None, vec![]),
TxnData::Validator(_) => (None, wsc_detail),
TxnData::BlockEpilogue(_) => (None, vec![]),
}
}

pub fn from_transactions(
transactions: &[TransactionPB],
) -> (
Vec<Self>,
Vec<BlockMetadataTransaction>,
Vec<WriteSetChangeModel>,
Vec<WriteSetChangeDetail>,
) {
let mut txns = vec![];
) -> (Vec<BlockMetadataTransaction>, Vec<WriteSetChangeDetail>) {
let mut block_metadata_txns = vec![];
let mut wscs = vec![];
let mut wsc_details = vec![];

let processed_txns: Vec<_> = transactions
Expand All @@ -337,15 +103,13 @@ impl Transaction {
.collect();

for processed_txn in processed_txns {
let (txn, block_metadata, mut wsc_list, mut wsc_detail_list) = processed_txn;
txns.push(txn);
let (block_metadata, mut wsc_detail_list) = processed_txn;
if let Some(a) = block_metadata {
block_metadata_txns.push(a);
}
wscs.append(&mut wsc_list);
wsc_details.append(&mut wsc_detail_list);
}
(txns, block_metadata_txns, wscs, wsc_details)
(block_metadata_txns, wsc_details)
}
}

Expand Down
Loading
Loading