refactor!: rename TransactionValue into CommittedTransaction

core/src/block.rs

@@ -103,7 +103,7 @@ pub struct BlockBuilder<B>(B);
 mod pending {
     use std::time::SystemTime;
 
-    use iroha_data_model::transaction::TransactionValue;
+    use iroha_data_model::transaction::CommittedTransaction;
 
     use super::*;
     use crate::state::StateBlock;
@@ -148,7 +148,7 @@ mod pending {
             previous_height: u64,
             prev_block_hash: Option<HashOf<SignedBlock>>,
             view_change_index: u64,
-            transactions: &[TransactionValue],
+            transactions: &[CommittedTransaction],
         ) -> BlockHeader {
             BlockHeader {
                 height: previous_height + 1,
@@ -175,12 +175,12 @@ mod pending {
         fn categorize_transactions(
             transactions: Vec<AcceptedTransaction>,
             state_block: &mut StateBlock<'_>,
-        ) -> Vec<TransactionValue> {
+        ) -> Vec<CommittedTransaction> {
             transactions
                 .into_iter()
                 .map(
                     |tx| match state_block.transaction_executor().validate(tx, state_block) {
-                        Ok(tx) => TransactionValue {
+                        Ok(tx) => CommittedTransaction {
                             value: tx,
                             error: None,
                         },
@@ -190,7 +190,7 @@ mod pending {
                                 caused_by = ?error.source(),
                                 "Transaction validation failed",
                             );
-                            TransactionValue {
+                            CommittedTransaction {
                                 value: tx,
                                 error: Some(error),
                             }
@@ -374,7 +374,7 @@ mod valid {
                 .transactions()
                 // TODO: Unnecessary clone?
                 .cloned()
-                .try_for_each(|TransactionValue { value, error }| {
+                .try_for_each(|CommittedTransaction { value, error }| {
                     let transaction_executor = state_block.transaction_executor();
                     let limits = &transaction_executor.transaction_limits;
 

core/src/smartcontracts/isi/tx.rs

@@ -11,7 +11,7 @@ use iroha_data_model::{
         error::{FindError, QueryExecutionFail},
         TransactionQueryOutput,
     },
-    transaction::TransactionValue,
+    transaction::CommittedTransaction,
 };
 use iroha_telemetry::metrics;
 
@@ -54,7 +54,7 @@ impl BlockTransactionRef {
             .as_ref()
             .authority()
     }
-    fn value(&self) -> TransactionValue {
+    fn value(&self) -> CommittedTransaction {
         self.0
             .transactions()
             .nth(self.1)

data_model/src/block.rs

@@ -92,7 +92,7 @@ mod model {
         /// Topology of the network at the time of block commit.
         pub commit_topology: UniqueVec<peer::PeerId>,
         /// array of transactions, which successfully passed validation and consensus step.
-        pub transactions: Vec<TransactionValue>,
+        pub transactions: Vec<CommittedTransaction>,
         /// Event recommendations.
         pub event_recommendations: Vec<EventBox>,
     }
@@ -149,7 +149,7 @@ impl SignedBlock {
 
     /// Block transactions
     #[inline]
-    pub fn transactions(&self) -> impl ExactSizeIterator<Item = &TransactionValue> {
+    pub fn transactions(&self) -> impl ExactSizeIterator<Item = &CommittedTransaction> {
         let SignedBlock::V1(block) = self;
         block.payload.transactions.iter()
     }

data_model/src/query/mod.rs

@@ -35,7 +35,7 @@ use crate::{
     events::TriggeringEventFilterBox,
     metadata::MetadataValueBox,
     seal,
-    transaction::{SignedTransaction, TransactionPayload, TransactionValue},
+    transaction::{CommittedTransaction, SignedTransaction, TransactionPayload},
     IdBox, Identifiable, IdentifiableBox,
 };
 
@@ -256,7 +256,7 @@ mod model {
         pub block_hash: HashOf<SignedBlock>,
         /// Transaction
         #[getset(skip)]
-        pub transaction: TransactionValue,
+        pub transaction: CommittedTransaction,
     }
 
     /// Request type clients (like http clients or wasm) can send to a query endpoint.
@@ -528,8 +528,8 @@ where
     }
 }
 
-impl AsRef<TransactionValue> for TransactionQueryOutput {
-    fn as_ref(&self) -> &TransactionValue {
+impl AsRef<CommittedTransaction> for TransactionQueryOutput {
+    fn as_ref(&self) -> &CommittedTransaction {
         &self.transaction
     }
 }

data_model/src/transaction.rs

@@ -178,7 +178,7 @@ mod model {
     )]
     #[ffi_type]
     #[getset(get = "pub")]
-    pub struct TransactionValue {
+    pub struct CommittedTransaction {
         /// Committed transaction
         #[getset(skip)]
         pub value: SignedTransaction,
@@ -335,7 +335,7 @@ impl SignedTransactionV1 {
     }
 }
 
-impl AsRef<SignedTransaction> for TransactionValue {
+impl AsRef<SignedTransaction> for CommittedTransaction {
     fn as_ref(&self) -> &SignedTransaction {
         &self.value
     }
@@ -759,7 +759,7 @@ pub mod prelude {
     #[cfg(feature = "http")]
     pub use super::http::TransactionBuilder;
     pub use super::{
-        error::prelude::*, Executable, SignedTransaction, TransactionValue, WasmSmartContract,
+        error::prelude::*, CommittedTransaction, Executable, SignedTransaction, WasmSmartContract,
     };
 }
 

docs/source/references/schema.json

@@ -641,7 +641,7 @@
       },
       {
         "name": "transactions",
-        "type": "Vec<TransactionValue>"
+        "type": "Vec<CommittedTransaction>"
       },
       {
         "name": "event_recommendations",
@@ -746,6 +746,18 @@
       }
     ]
   },
+  "CommittedTransaction": {
+    "Struct": [
+      {
+        "name": "value",
+        "type": "SignedTransaction"
+      },
+      {
+        "name": "error",
+        "type": "Option<TransactionRejectionReason>"
+      }
+    ]
+  },
   "Compact<u128>": {
     "Int": "Compact"
   },
@@ -3858,7 +3870,7 @@
       },
       {
         "name": "transaction",
-        "type": "TransactionValue"
+        "type": "CommittedTransaction"
       }
     ]
   },
@@ -3912,18 +3924,6 @@
       }
     ]
   },
-  "TransactionValue": {
-    "Struct": [
-      {
-        "name": "value",
-        "type": "SignedTransaction"
-      },
-      {
-        "name": "error",
-        "type": "Option<TransactionRejectionReason>"
-      }
-    ]
-  },
   "Transfer<Account, AssetDefinitionId, Account>": {
     "Struct": [
       {
@@ -4342,6 +4342,9 @@
       }
     ]
   },
+  "Vec<CommittedTransaction>": {
+    "Vec": "CommittedTransaction"
+  },
   "Vec<EventBox>": {
     "Vec": "EventBox"
   },
@@ -4366,9 +4369,6 @@
   "Vec<QueryOutputBox>": {
     "Vec": "QueryOutputBox"
   },
-  "Vec<TransactionValue>": {
-    "Vec": "TransactionValue"
-  },
   "Vec<u8>": {
     "Vec": "u8"
   },

schema/gen/src/lib.rs

@@ -108,6 +108,7 @@ types!(
     Burn<Numeric, Asset>,
     BurnBox,
     ChainId,
+    CommittedTransaction,
     ConfigurationEvent,
     ConfigurationEventFilter,
     ConfigurationEventSet,
@@ -343,7 +344,6 @@ types!(
     TransactionPayload,
     TransactionQueryOutput,
     TransactionRejectionReason,
-    TransactionValue,
     TransactionStatus,
     Transfer<Account, AssetDefinitionId, Account>,
     Transfer<Account, DomainId, Account>,
@@ -373,6 +373,7 @@ types!(
     UnregisterBox,
     Upgrade,
     ValidationFail,
+    Vec<CommittedTransaction>,
     Vec<EventBox>,
     Vec<EventFilterBox>,
     Vec<InstructionBox>,
@@ -381,7 +382,6 @@ types!(
     Vec<PeerId>,
     Vec<PredicateBox>,
     Vec<QueryOutputBox>,
-    Vec<TransactionValue>,
     Vec<u8>,
     WasmExecutionFail,
     WasmSmartContract,