Merge pull request #2068 from Cargill/ltseeley-1-1-txn-execution-data

1-1 BACKPORT: Fix TxnExecutionResult.data field
hyperledger-archives · Apr 15, 2019 · 11ecb96 · 11ecb96
2 parents 6f98e14 + 3114853
commit 11ecb96
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/validator/sawtooth_validator/execution/context_manager.py b/validator/sawtooth_validator/execution/context_manager.py
@@ -425,7 +425,6 @@ def add_execution_data(self, context_id, data):
 
         Args:
             context_id (str): the context id returned by create_context
-            data_type (str): type of data to append
             data (bytes): data to append
 
         Returns:

diff --git a/validator/src/journal/chain.rs b/validator/src/journal/chain.rs
@@ -932,7 +932,7 @@ impl<'a> From<&'a TxnExecutionResult> for TransactionReceipt {
         let mut receipt = TransactionReceipt::new();
 
         receipt.set_data(protobuf::RepeatedField::from_vec(
-            result.data.iter().map(|(_, data)| data.clone()).collect(),
+            result.data.iter().map(|data| data.clone()).collect(),
         ));
         receipt.set_state_changes(protobuf::RepeatedField::from_vec(
             result.state_changes.clone(),

diff --git a/validator/src/scheduler/execution_result_ffi.rs b/validator/src/scheduler/execution_result_ffi.rs
@@ -38,7 +38,7 @@ pub struct PyTxnExecutionResult {
     pub state_hash: Option<String>,
     pub state_changes: Vec<StateChange>,
     pub events: Vec<Event>,
-    pub data: Vec<(String, Vec<u8>)>,
+    pub data: Vec<Vec<u8>>,
     pub error_message: String,
     pub error_data: Vec<u8>,
 }

diff --git a/validator/src/scheduler/mod.rs b/validator/src/scheduler/mod.rs
@@ -60,7 +60,7 @@ pub struct TxnExecutionResult {
     pub is_valid: bool,
     pub state_changes: Vec<StateChange>,
     pub events: Vec<Event>,
-    pub data: Vec<(String, Vec<u8>)>,
+    pub data: Vec<Vec<u8>>,
     pub error_message: String,
     pub error_data: Vec<u8>,
 }