modify move_modules and refactor default processor

aptos-labs · Oct 3, 2024 · 94ea368 · 94ea368
1 parent b5af971
commit 94ea368
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 438 deletions.
diff --git a/rust/processor/src/db/common/models/default_models/block_metadata_transactions.rs b/rust/processor/src/db/common/models/default_models/block_metadata_transactions.rs
@@ -5,25 +5,18 @@
 #![allow(clippy::extra_unused_lifetimes)]
 #![allow(clippy::unused_unit)]
 
-use super::transactions::Transaction;
 use crate::{
  schema::block_metadata_transactions,
  utils::util::{parse_timestamp, standardize_address},
 };
-use aptos_protos::{
- transaction::v1::BlockMetadataTransaction as BlockMetadataTransactionPB,
- util::timestamp::Timestamp,
-};
+use aptos_protos::{transaction::v1::BlockMetadataTransaction, util::timestamp::Timestamp};
 use field_count::FieldCount;
 use serde::{Deserialize, Serialize};
 
-#[derive(
- Associations, Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize,
-)]
-#[diesel(belongs_to(Transaction, foreign_key = version))]
+#[derive(Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize)]
 #[diesel(primary_key(version))]
 #[diesel(table_name = block_metadata_transactions)]
-pub struct BlockMetadataTransaction {
+pub struct BlockMetadataTransactionPG {
  pub version: i64,
  pub block_height: i64,
  pub id: String,
@@ -35,9 +28,9 @@ pub struct BlockMetadataTransaction {
  pub timestamp: chrono::NaiveDateTime,
 }
 
-impl BlockMetadataTransaction {
- pub fn from_transaction(
- txn: &BlockMetadataTransactionPB,
+impl BlockMetadataTransactionPG {
+ pub fn from_bmt_transaction(
+ txn: &BlockMetadataTransaction,
  version: i64,
  block_height: i64,
  epoch: i64,
@@ -60,4 +53,4 @@ impl BlockMetadataTransaction {
 }
 
 // Prevent conflicts with other things named `Transaction`
-pub type BlockMetadataTransactionModel = BlockMetadataTransaction;
+pub type BlockMetadataTransactionModel = BlockMetadataTransactionPG;
diff --git a/rust/processor/src/db/common/models/default_models/mod.rs b/rust/processor/src/db/common/models/default_models/mod.rs
@@ -2,11 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod block_metadata_transactions;
-pub mod move_modules;
 pub mod move_resources;
 pub mod move_tables;
-pub mod transactions;
-pub mod write_set_changes;
 
 // parquet models
 pub mod parquet_move_modules;

diff --git a/rust/processor/src/db/common/models/default_models/move_modules.rs b/rust/processor/src/db/common/models/default_models/move_modules.rs
diff --git a/rust/processor/src/db/common/models/default_models/move_resources.rs b/rust/processor/src/db/common/models/default_models/move_resources.rs
@@ -3,7 +3,6 @@
 
 #![allow(clippy::extra_unused_lifetimes)]
 
-use super::transactions::Transaction;
 use crate::{schema::move_resources, utils::util::standardize_address};
 use anyhow::{Context, Result};
 use aptos_protos::transaction::v1::{
@@ -12,10 +11,7 @@ use aptos_protos::transaction::v1::{
 use field_count::FieldCount;
 use serde::{Deserialize, Serialize};
 
-#[derive(
- Associations, Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize,
-)]
-#[diesel(belongs_to(Transaction, foreign_key = transaction_version))]
+#[derive(Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize)]
 #[diesel(primary_key(transaction_version, write_set_change_index))]
 #[diesel(table_name = move_resources)]
 pub struct MoveResource {

diff --git a/rust/processor/src/db/common/models/default_models/move_tables.rs b/rust/processor/src/db/common/models/default_models/move_tables.rs
@@ -3,7 +3,6 @@
 
 #![allow(clippy::extra_unused_lifetimes)]
 
-use super::transactions::Transaction;
 use crate::{
  schema::{current_table_items, table_items, table_metadatas},
  utils::util::{hash_str, standardize_address},
@@ -25,10 +24,7 @@ pub struct CurrentTableItem {
  pub is_deleted: bool,
 }
 
-#[derive(
- Associations, Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize,
-)]
-#[diesel(belongs_to(Transaction, foreign_key = transaction_version))]
+#[derive(Clone, Debug, Deserialize, FieldCount, Identifiable, Insertable, Serialize)]
 #[diesel(primary_key(transaction_version, write_set_change_index))]
 #[diesel(table_name = table_items)]
 pub struct TableItem {

diff --git a/rust/processor/src/db/common/models/default_models/parquet_move_modules.rs b/rust/processor/src/db/common/models/default_models/parquet_move_modules.rs
@@ -24,7 +24,7 @@ pub struct MoveModule {
  pub block_height: i64,
  pub name: String,
  pub address: String,
- pub bytecode: Option<Vec<u8>>,
+ pub bytecode: Vec<u8>,
  pub exposed_functions: Option<String>,
  pub friends: Option<String>,
  pub structs: Option<String>,
@@ -79,7 +79,7 @@ impl MoveModule {
  .map(|d| d.name.clone())
  .unwrap_or_default(),
  address: standardize_address(&write_module.address.to_string()),
- bytecode: parsed_data.clone().map(|d| d.bytecode.clone()),
+ bytecode: write_module.data.as_ref().unwrap().bytecode.clone(),
  exposed_functions: parsed_data.clone().map(|d| d.exposed_functions.clone()),
  friends: parsed_data.clone().map(|d| d.friends.clone()),
  structs: parsed_data.map(|d| d.structs.clone()),
@@ -107,7 +107,7 @@ impl MoveModule {
  .map(|d| d.name.clone())
  .unwrap_or_default(),
  address: standardize_address(&delete_module.address.to_string()),
- bytecode: None,
+ bytecode: vec![],
  exposed_functions: None,
  friends: None,
  structs: None,

diff --git a/rust/processor/src/db/common/models/default_models/parquet_transactions.rs b/rust/processor/src/db/common/models/default_models/parquet_transactions.rs
@@ -6,7 +6,7 @@
 #![allow(clippy::unused_unit)]
 
 use super::{
- block_metadata_transactions::BlockMetadataTransaction,
+ block_metadata_transactions::BlockMetadataTransactionModel,
  parquet_write_set_changes::{WriteSetChangeDetail, WriteSetChangeModel},
 };
 use crate::{
@@ -148,7 +148,7 @@ impl Transaction {
  transaction: &TransactionPB,
  ) -> (
  Self,
- Option<BlockMetadataTransaction>,
+ Option<BlockMetadataTransactionModel>,
  Vec<WriteSetChangeModel>,
  Vec<WriteSetChangeDetail>,
  ) {
@@ -286,7 +286,7 @@ impl Transaction {
  block_timestamp,
  txn_size_info,
  ),
- Some(BlockMetadataTransaction::from_transaction(
+ Some(BlockMetadataTransactionModel::from_bmt_transaction(
  block_metadata_txn,
  txn_version,
  block_height,
@@ -364,7 +364,7 @@ impl Transaction {
  transaction_version_to_struct_count: &mut AHashMap<i64, i64>,
  ) -> (
  Vec<Self>,
- Vec<BlockMetadataTransaction>,
+ Vec<BlockMetadataTransactionModel>,
  Vec<WriteSetChangeModel>,
  Vec<WriteSetChangeDetail>,
  ) {