Fix data race on hcr.channels (2)

Signed-off-by: Anton Litvinov <[email protected]>
mysteriumnetwork · Mar 25, 2024 · e5d0518 · e5d0518
1 parent 031c7fe
commit e5d0518
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/session/pingpong/hermes_channel.go b/session/pingpong/hermes_channel.go
@@ -37,13 +37,13 @@ func NewHermesChannel(channelID string, id identity.Identity, hermesID common.Ad
 		lastPromise: promise,
 		Beneficiary: beneficiary,
 	}
-	return hc.Copy()
+	return hc
 }
 
 // Copy returns a deep copy of channel
-func (hc *HermesChannel) Copy() HermesChannel {
+func (hc HermesChannel) Copy() HermesChannel {
 	var hcCopy HermesChannel
-	if err := copier.CopyWithOption(&hcCopy, *hc, copier.Option{DeepCopy: true}); err != nil {
+	if err := copier.CopyWithOption(&hcCopy, hc, copier.Option{DeepCopy: true}); err != nil {
 		panic(err)
 	}
 	return hcCopy

diff --git a/session/pingpong/hermes_channel_repository.go b/session/pingpong/hermes_channel_repository.go
@@ -441,7 +441,8 @@ func (hcr *HermesChannelRepository) fetchChannel(chainID int64, channelID string
 	if err != nil {
 		return HermesChannel{}, fmt.Errorf("could not get provider beneficiary for %v, hermes %v: %w", id, hermesID.Hex(), err)
 	}
-	hermesChannel := NewHermesChannel(channelID, id, hermesID, channel, promise, benef)
+	hermesChannel := NewHermesChannel(channelID, id, hermesID, channel, promise, benef).
+		Copy()
 
 	hcr.updateChannel(chainID, hermesChannel)
 
@@ -456,7 +457,8 @@ func (hcr *HermesChannelRepository) updateChannelWithLatestPromise(chainID int64
 		return err
 	}
 
-	hermesChannel := NewHermesChannel(channelID, id, hermesID, gotten.Channel, promise, gotten.Beneficiary)
+	hermesChannel := NewHermesChannel(channelID, id, hermesID, gotten.Channel, promise, gotten.Beneficiary).
+		Copy()
 
 	// protect hcr.channels: handleHermesPromiseReceived -> updateChannelWithLatestPromise -> updateChannel
 	if protectChannels {