validator txn api fix

api/types/src/convert.rs

@@ -4,15 +4,16 @@
 
 use crate::{
     transaction::{
-        BlockEpilogueTransaction, DecodedTableData, DeleteModule, DeleteResource, DeleteTableItem,
-        DeletedTableData, MultisigPayload, MultisigTransactionPayload, StateCheckpointTransaction,
-        UserTransactionRequestInner, WriteModule, WriteResource, WriteTableItem,
+        BlockEpilogueTransaction, BlockMetadataExtTransaction, DecodedTableData, DeleteModule,
+        DeleteResource, DeleteTableItem, DeletedTableData, MultisigPayload,
+        MultisigTransactionPayload, StateCheckpointTransaction, UserTransactionRequestInner,
+        ValidatorTransaction, WriteModule, WriteResource, WriteTableItem,
     },
     view::{ViewFunction, ViewRequest},
-    Address, Bytecode, DirectWriteSet, EntryFunctionId, EntryFunctionPayload, Event,
-    HexEncodedBytes, MoveFunction, MoveModuleBytecode, MoveResource, MoveScriptBytecode, MoveType,
-    MoveValue, PendingTransaction, ResourceGroup, ScriptPayload, ScriptWriteSet,
-    SubmitTransactionRequest, Transaction, TransactionInfo, TransactionOnChainData,
+    Address, BlockMetadataTransaction, Bytecode, DirectWriteSet, EntryFunctionId,
+    EntryFunctionPayload, Event, HexEncodedBytes, MoveFunction, MoveModuleBytecode, MoveResource,
+    MoveScriptBytecode, MoveType, MoveValue, PendingTransaction, ResourceGroup, ScriptPayload,
+    ScriptWriteSet, SubmitTransactionRequest, Transaction, TransactionInfo, TransactionOnChainData,
     TransactionPayload, UserTransactionRequest, VersionedEvent, WriteSet, WriteSetChange,
     WriteSetPayload,
 };
@@ -176,7 +177,10 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
         timestamp: u64,
         data: TransactionOnChainData,
     ) -> Result<Transaction> {
-        use aptos_types::transaction::Transaction::*;
+        use aptos_types::transaction::Transaction::{
+            BlockEpilogue, BlockMetadata, BlockMetadataExt, GenesisTransaction, StateCheckpoint,
+            UserTransaction,
+        };
         let aux_data = self
             .db
             .get_transaction_auxiliary_data_by_version(data.version)?;
@@ -197,8 +201,15 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
                 let payload = self.try_into_write_set_payload(write_set)?;
                 (info, payload, events).into()
             },
-            BlockMetadata(txn) => (&txn, info, events).into(),
-            BlockMetadataExt(txn) => (&txn, info, events).into(),
+            BlockMetadata(txn) => {
+                Transaction::BlockMetadataTransaction(BlockMetadataTransaction::from_internal_repr(
+                    txn, info, events,
+                ))
+                // (&txn, info, events).into()
+            },
+            BlockMetadataExt(txn) => Transaction::BlockMetadataExtTransaction(
+                BlockMetadataExtTransaction::from_internal_repr(txn, info, events),
+            ),
             StateCheckpoint(_) => {
                 Transaction::StateCheckpointTransaction(StateCheckpointTransaction {
                     info,
@@ -228,7 +239,11 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
                     },
                 })
             },
-            ValidatorTransaction(_txn) => (info, events, timestamp).into(),
+            aptos_types::transaction::Transaction::ValidatorTransaction(txn) => {
+                Transaction::ValidatorTransaction(ValidatorTransaction::from_internal_repr(
+                    txn, info, events, timestamp,
+                ))
+            },
         })
     }