From 83b85a6b6a940c341020b7c4b517a574ce6461a1 Mon Sep 17 00:00:00 2001 From: Peter Broadhurst Date: Fri, 13 Dec 2024 14:05:06 -0500 Subject: [PATCH] Merge conflict in testbed Signed-off-by: Peter Broadhurst --- core/go/pkg/testbed/testbed_jsonrpc_actions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/go/pkg/testbed/testbed_jsonrpc_actions.go b/core/go/pkg/testbed/testbed_jsonrpc_actions.go index 4f93bc337..a63c398a2 100644 --- 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,