[incubator-milagro-dta] branch splitroles-blockchain updated: Set sender for dump

[cmorris]

This is an automated email from the ASF dual-hosted git repository.

cmorris pushed a commit to branch splitroles-blockchain
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-dta.git


The following commit(s) were added to refs/heads/splitroles-blockchain by this 
push:
     new 5802766  Set sender for dump
5802766 is described below

commit 5802766e5a611b6d2a06ead611430d774101658b
Author: Christopher Morris <ch...@morris.net>
AuthorDate: Mon Sep 30 20:36:17 2019 +0100

    Set sender for dump
---
 pkg/defaultservice/orderTX.go | 4 ++--
 pkg/tendermint/websockets.go  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkg/defaultservice/orderTX.go b/pkg/defaultservice/orderTX.go
index 8a9b9ea..4fe62f4 100644
--- a/pkg/defaultservice/orderTX.go
+++ b/pkg/defaultservice/orderTX.go
@@ -78,7 +78,7 @@ func (s *Service) Order2(tx *api.BlockChainTX) (string, 
error) {
        //Write the Order2 results to the chain
        chainTX := &api.BlockChainTX{
                Processor:              api.TXOrderResponse,
-               SenderID:               "",
+               SenderID:               nodeID,
                RecipientID:            nodeID,
                AdditionalRecipientIDs: []string{},
                Payload:                payload,
@@ -145,7 +145,7 @@ func (s *Service) OrderSecret2(tx *api.BlockChainTX) 
(string, error) {
        //Write the requests to the chain
        chainTX := &api.BlockChainTX{
                Processor:              api.TXOrderSecretResponse, //NONE
-               SenderID:               "",
+               SenderID:               nodeID,
                RecipientID:            nodeID,
                AdditionalRecipientIDs: []string{},
                Payload:                payload,
diff --git a/pkg/tendermint/websockets.go b/pkg/tendermint/websockets.go
index 2a75ae6..7f6c0fc 100644
--- a/pkg/tendermint/websockets.go
+++ b/pkg/tendermint/websockets.go
@@ -62,8 +62,6 @@ func subscribeAndQueue(queueWaiting chan api.BlockChainTX, 
logger *logger.Logger
                                break
                        }
 
-                       //check if this node is Sender - if so we don't need to 
process it
-
                        //check if this node is in receipient list
                        if payload.RecipientID != nodeID {
                                logger.Info("******** Invalid Recipient - why 
are we receiving this TX?")