[diem-transactional-tests] fix event pretty printing

diem-move/diem-framework/core/transactional-tests/block/block_prologue.exp

@@ -1,13 +1,13 @@
 processed 5 tasks
 
 task 1 'block'. lines 3-3:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d60040420f0000000000"
 }
 
-
 task 4 'run'. lines 29-37:
 Error: Transaction discarded. VMStatus: status ABORTED of type Execution with sub status 514

diem-move/diem-framework/core/transactional-tests/block/expired_transaction.exp

@@ -1,28 +1,28 @@
 processed 10 tasks
 
 task 1 'block'. lines 3-3:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d60000e1f50500000000"
 }
 
-
 task 2 'publish'. lines 5-6:
 Error: Transaction discarded. VMStatus: status TRANSACTION_EXPIRED of type Validation
 
 task 3 'publish'. lines 8-9:
 Error: Transaction discarded. VMStatus: status TRANSACTION_EXPIRED of type Validation
 
 task 6 'block'. lines 17-17:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6004023050600000000"
 }
 
-
 task 8 'publish'. lines 22-23:
 Error: Transaction discarded. VMStatus: status TRANSACTION_EXPIRED of type Validation

diem-move/diem-framework/core/transactional-tests/block/get_block_height.exp

@@ -1,16 +1,17 @@
 processed 6 tasks
 
 task 2 'block'. lines 12-12:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d60000e1f50500000000"
 }
 
-
 task 4 'block'. lines 25-25:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemBlock::NewBlockEvent

diem-move/diem-framework/core/transactional-tests/block/none_validator_propser.exp

@@ -1,13 +1,13 @@
 processed 4 tasks
 
 task 1 'block'. lines 3-3:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d60040420f0000000000"
 }
 
-
 task 3 'block'. lines 16-16:
 Error: status UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION of type Invariant violation

diem-move/diem-framework/core/transactional-tests/block/older_timestamp.exp

@@ -1,13 +1,13 @@
 processed 4 tasks
 
 task 1 'block'. lines 3-3:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d60000e1f50500000000"
 }
 
-
 task 3 'block'. lines 16-16:
 Error: status UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION of type Invariant violation

diem-move/diem-framework/core/transactional-tests/epilogue/fib_out_of_gas.exp

@@ -0,0 +1,4 @@
+processed 5 tasks
+
+task 3 'run'. lines 23-23:
+Error: Failed to execute transaction. VMStatus: status OUT_OF_GAS of type Execution

diem-move/diem-framework/core/transactional-tests/epilogue/out_of_gas_in_nested_module.exp

@@ -0,0 +1,4 @@
+processed 5 tasks
+
+task 3 'run'. lines 32-32:
+Error: Failed to execute transaction. VMStatus: status OUT_OF_GAS of type Execution

diem-move/diem-framework/core/transactional-tests/events/event_emit_struct.exp

@@ -1,7 +1,8 @@
 processed 3 tasks
 
 task 2 'run'. lines 18-25:
-Events:{
+Events:
+{
     key:     0400000000000000c5e34b925cf6875fec02d4b77adbd2d6
     seq_num: 0
     type:    0xc5e34b925cf6875fec02d4b77adbd2d6::M::MyEvent

diem-move/diem-framework/core/transactional-tests/events/event_emit_struct_with_type_params.exp

@@ -1,7 +1,8 @@
 processed 3 tasks
 
 task 2 'run'. lines 18-25:
-Events:{
+Events:
+{
     key:     0400000000000000c5e34b925cf6875fec02d4b77adbd2d6
     seq_num: 0
     type:    0xc5e34b925cf6875fec02d4b77adbd2d6::M::MyEvent<u64, bool>

diem-move/diem-framework/core/transactional-tests/events/event_emit_u64.exp

@@ -1,7 +1,8 @@
 processed 2 tasks
 
 task 1 'run'. lines 5-14:
-Events:{
+Events:
+{
     key:     0400000000000000c5e34b925cf6875fec02d4b77adbd2d6
     seq_num: 0
     type:    u64

diem-move/diem-framework/core/transactional-tests/network_identity/network_identity.exp

@@ -0,0 +1,46 @@
+processed 5 tasks
+
+task 2 'run'. lines 15-31:
+Events:
+{
+    key:     03000000000000000000000000000000000000000b1e55ed
+    seq_num: 0
+    type:    0x1::NetworkIdentity::NetworkIdentityChangeNotification
+    data:    "0000000000000000000000000b1e55ed010469645f310000000000000000"
+}
+{
+    key:     01000000000000000000000000000000000000000a550c18
+    seq_num: 1
+    type:    0x1::DiemAccount::AdminTransactionEvent
+    data:    "0000000000000000"
+}
+
+task 3 'run'. lines 33-54:
+Events:
+{
+    key:     03000000000000000000000000000000000000000b1e55ed
+    seq_num: 1
+    type:    0x1::NetworkIdentity::NetworkIdentityChangeNotification
+    data:    "0000000000000000000000000b1e55ed020469645f310469645f320000000000000000"
+}
+{
+    key:     01000000000000000000000000000000000000000a550c18
+    seq_num: 2
+    type:    0x1::DiemAccount::AdminTransactionEvent
+    data:    "0000000000000000"
+}
+
+task 4 'run'. lines 56-73:
+Events:
+{
+    key:     03000000000000000000000000000000000000000b1e55ed
+    seq_num: 2
+    type:    0x1::NetworkIdentity::NetworkIdentityChangeNotification
+    data:    "0000000000000000000000000b1e55ed010469645f310000000000000000"
+}
+{
+    key:     01000000000000000000000000000000000000000a550c18
+    seq_num: 3
+    type:    0x1::DiemAccount::AdminTransactionEvent
+    data:    "0000000000000000"
+}

diem-move/diem-framework/core/transactional-tests/on_chain_config/change_publishing_options.exp

@@ -4,13 +4,13 @@ task 3 'run'. lines 21-31:
 Error: Transaction discarded. VMStatus: status ABORTED of type Execution with sub status 2
 
 task 4 'block'. lines 34-36:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000200000000000000"
 }
 
-
 task 6 'publish'. lines 46-49:
 Error: Transaction discarded. VMStatus: status INVALID_MODULE_PUBLISHER of type Validation

diem-move/diem-framework/core/transactional-tests/on_chain_config/disable_txes.exp

@@ -1,26 +1,26 @@
 processed 8 tasks
 
 task 1 'block'. lines 3-5:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000200000000000000"
 }
 
-
 task 3 'run'. lines 14-18:
 Error: Transaction discarded. VMStatus: status UNKNOWN_SCRIPT of type Validation
 
 task 4 'block'. lines 20-23:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000300000000000000"
 }
 
-
 task 6 'run'. lines 34-36:
 Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 2055
 

diem-move/diem-framework/core/transactional-tests/reconfiguration/reconfiguration.exp

@@ -1,19 +1,20 @@
 processed 6 tasks
 
 task 1 'block'. lines 3-5:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000200000000000000"
 }
 
-
 task 2 'run'. lines 6-16:
 Error: Transaction discarded. VMStatus: status ABORTED of type Execution with sub status 2
 
 task 3 'run'. lines 17-25:
-Events:{
+Events:
+{
     key:     04000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemConfig::NewEpochEvent
@@ -26,18 +27,18 @@ Events:{
     data:    "0000000000000000"
 }
 
-
 task 4 'block'. lines 27-29:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000300000000000000"
 }
 
-
 task 5 'run'. lines 30-37:
-Events:{
+Events:
+{
     key:     04000000000000000000000000000000000000000a550c18
     seq_num: 2
     type:    0x1::DiemConfig::NewEpochEvent

diem-move/diem-framework/core/transactional-tests/smoke_tests/approved_payment.exp

@@ -0,0 +1,25 @@
+processed 19 tasks
+
+task 2 'run'. lines 128-130:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003
+
+task 4 'run'. lines 136-150:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003
+
+task 11 'run'. lines 202-212:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003
+
+task 14 'run'. lines 229-237:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9001
+
+task 15 'run'. lines 239-247:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9002
+
+task 16 'run'. lines 249-251:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003
+
+task 17 'run'. lines 253-255:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003
+
+task 18 'run'. lines 257-257:
+Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 9003

diem-move/diem-framework/core/transactional-tests/transaction_fee/add_transaction_fee_currency.exp

@@ -1,23 +1,23 @@
 processed 10 tasks
 
 task 1 'block'. lines 3-7:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000300000000000000"
 }
 
-
 task 3 'block'. lines 29-29:
-Events:{
+Events:
+{
     key:     11000000000000000000000000000000000000000a550c18
     seq_num: 1
     type:    0x1::DiemBlock::NewBlockEvent
     data:    "0000000000000000c5e34b925cf6875fec02d4b77adbd2d6000400000000000000"
 }
 
-
 task 5 'run'. lines 39-47:
 Error: Transaction discarded. VMStatus: status ABORTED of type Execution with sub status 5
 

diem-move/diem-framework/core/transactional-tests/transaction_fee/burn_collected_fees.exp

@@ -11,7 +11,8 @@ key 0x1::DiemAccount::Balance<0x1::XUS::XUS> {
 }
 
 task 5 'run'. lines 17-20:
-Events:{
+Events:
+{
     key:     07000000000000000000000000000000000000000a550c18
     seq_num: 0
     type:    0x1::Diem::PreburnEvent
@@ -24,6 +25,5 @@ Events:{
     data:    "bc02000000000000035855530000000000000000000000000b1e55ed"
 }
 
-
 task 6 'run'. lines 21-22:
 Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 1799

diem-move/diem-framework/core/transactional-tests/vasp_domain/vasp_domain.exp

@@ -1,26 +1,26 @@
 processed 13 tasks
 
 task 4 'run'. lines 28-31:
-Events:{
+Events:
+{
     key:     00000000000000000000000000000000000000000b1e55ed
     seq_num: 0
     type:    0x1::VASPDomain::VASPDomainEvent
     data:    "00046469656d7898b9021c0ed4af78fc7bd8e75b8e5d"
 }
 
-
 task 6 'run'. lines 42-45:
 Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 775
 
 task 8 'run'. lines 56-59:
-Events:{
+Events:
+{
     key:     00000000000000000000000000000000000000000b1e55ed
     seq_num: 1
     type:    0x1::VASPDomain::VASPDomainEvent
     data:    "01046469656d7898b9021c0ed4af78fc7bd8e75b8e5d"
 }
 
-
 task 10 'run'. lines 70-73:
 Error: Failed to execute transaction. VMStatus: status ABORTED of type Execution with sub status 1287
 

diem-move/diem-transactional-test-harness/src/diem_test_harness.rs

@@ -1128,7 +1128,8 @@ impl<'a> fmt::Display for PrettyEvents<'a> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "Events:")?;
         for event in self.0.iter() {
-            writeln!(f, "{}", PrettyEvent(event))?;
+            writeln!(f)?;
+            write!(f, "{}", PrettyEvent(event))?;
         }
         Ok(())
     }