From eb3f60d23468e02a7659eed5750f5e3b6c2175cb Mon Sep 17 00:00:00 2001 From: D-Stacks Date: Fri, 17 Jun 2022 11:33:15 +0200 Subject: [PATCH] supply id in `ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage` --- app/rpc/manager.go | 2 +- app/rpc/rpccontext/chain_changed.go | 4 ++-- .../get_virtual_selected_parent_chain_from_block.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/rpc/manager.go b/app/rpc/manager.go index 9f937e3b0..673daf163 100644 --- a/app/rpc/manager.go +++ b/app/rpc/manager.go @@ -236,7 +236,7 @@ func (m *Manager) notifyVirtualSelectedParentChainChanged(virtualChangeSet *exte } notification, err := m.context.ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage( - virtualChangeSet.VirtualSelectedParentChainChanges, includeAcceptedTransactionIDs) //DefaultNotificationId added in func + virtualChangeSet.VirtualSelectedParentChainChanges, includeAcceptedTransactionIDs, rpccontext.DefaultNotificationID) //DefaultNotificationId added in func if err != nil { return err } diff --git a/app/rpc/rpccontext/chain_changed.go b/app/rpc/rpccontext/chain_changed.go index 9af0ee674..1e764f7e5 100644 --- a/app/rpc/rpccontext/chain_changed.go +++ b/app/rpc/rpccontext/chain_changed.go @@ -9,7 +9,7 @@ import ( // ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage converts // VirtualSelectedParentChainChanges to VirtualSelectedParentChainChangedNotificationMessage func (ctx *Context) ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage( - selectedParentChainChanges *externalapi.SelectedChainPath, includeAcceptedTransactionIDs bool) ( + selectedParentChainChanges *externalapi.SelectedChainPath, includeAcceptedTransactionIDs bool, id string) ( *appmessage.VirtualSelectedParentChainChangedNotificationMessage, error) { removedChainBlockHashes := make([]string, len(selectedParentChainChanges.Removed)) @@ -32,7 +32,7 @@ func (ctx *Context) ConvertVirtualSelectedParentChainChangesToChainChangedNotifi } return appmessage.NewVirtualSelectedParentChainChangedNotificationMessage( - removedChainBlockHashes, addedChainBlocks, acceptedTransactionIDs, DefaultNotificationID), nil + removedChainBlockHashes, addedChainBlocks, acceptedTransactionIDs, id), nil } func (ctx *Context) getAndConvertAcceptedTransactionIDs(selectedParentChainChanges *externalapi.SelectedChainPath) ( diff --git a/app/rpc/rpchandlers/get_virtual_selected_parent_chain_from_block.go b/app/rpc/rpchandlers/get_virtual_selected_parent_chain_from_block.go index aec4445c0..abdf31c2e 100644 --- a/app/rpc/rpchandlers/get_virtual_selected_parent_chain_from_block.go +++ b/app/rpc/rpchandlers/get_virtual_selected_parent_chain_from_block.go @@ -27,7 +27,7 @@ func HandleGetVirtualSelectedParentChainFromBlock(context *rpccontext.Context, _ } chainChangedNotification, err := context.ConvertVirtualSelectedParentChainChangesToChainChangedNotificationMessage( - virtualSelectedParentChain, getVirtualSelectedParentChainFromBlockRequest.IncludeAcceptedTransactionIDs) + virtualSelectedParentChain, getVirtualSelectedParentChainFromBlockRequest.IncludeAcceptedTransactionIDs, rpccontext.DefaultNotificationID) if err != nil { return nil, err }