Merge conflict in testbed

Signed-off-by: Peter Broadhurst <[email protected]>
LF-Decentralized-Trust-labs · Dec 13, 2024 · 83b85a6 · 83b85a6
1 parent 9dfdb6a
commit 83b85a6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/go/pkg/testbed/testbed_jsonrpc_actions.go b/core/go/pkg/testbed/testbed_jsonrpc_actions.go
@@ -423,7 +423,7 @@ func (tb *testbed) mapTransaction(ctx context.Context, tx *testbedTransaction) (
 	}
 
 	return &TransactionResult{
-		ID:                  tx.ID,
+		ID:                  tx.ptx.ID,
 		EncodedCall:         encodedCall,
 		PreparedTransaction: preparedTransaction,
 		PreparedMetadata:    tx.ptx.PreparedMetadata,