Skip to content

Commit 5ad0f14

Browse files
olegshmuelovolegshmuelov
authored
Pass MessageID To Broadcast (#381)
* implementation * reorg params * use GetID for message id
1 parent 331f2f0 commit 5ad0f14

12 files changed

+15
-15
lines changed

‎p2p/interface.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "github.com/bloxapp/ssv-spec/types"
44

55
// Broadcaster is the interface used to abstract message broadcasting
66
type Broadcaster interface {
7-
Broadcast(message *types.SignedSSVMessage) error
7+
Broadcast(msgID types.MessageID, message *types.SignedSSVMessage) error
88
}
99

1010
// Subscriber is used to abstract topic management

‎qbft/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (c *Controller) broadcastDecided(aggregatedCommit *SignedMessage) error {
205205
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
206206
}
207207

208-
if err := c.GetConfig().GetNetwork().Broadcast(msgToBroadcast); err != nil {
208+
if err := c.GetConfig().GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
209209
// We do not return error here, just Log broadcasting error.
210210
return errors.Wrap(err, "could not broadcast decided")
211211
}

‎qbft/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (i *Instance) Broadcast(msg *SignedMessage) error {
101101
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
102102
}
103103

104-
return i.GetConfig().GetNetwork().Broadcast(msgToBroadcast)
104+
return i.GetConfig().GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast)
105105
}
106106

107107
// ProcessMsg processes a new QBFT msg, returns non nil error on msg processing error

‎ssv/aggregator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (r *AggregatorRunner) ProcessConsensus(signedMsg *qbft.SignedMessage) error
155155
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
156156
}
157157

158-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
158+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
159159
return errors.Wrap(err, "can't broadcast partial post consensus sig")
160160
}
161161
return nil
@@ -260,7 +260,7 @@ func (r *AggregatorRunner) executeDuty(duty *types.Duty) error {
260260
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
261261
}
262262

263-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
263+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
264264
return errors.Wrap(err, "can't broadcast partial selection proof sig")
265265
}
266266
return nil

‎ssv/attester.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (r *AttesterRunner) ProcessConsensus(signedMsg *qbft.SignedMessage) error {
112112
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
113113
}
114114

115-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
115+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
116116
return errors.Wrap(err, "can't broadcast partial post consensus sig")
117117
}
118118
return nil

‎ssv/proposer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func (r *ProposerRunner) ProcessConsensus(signedMsg *qbft.SignedMessage) error {
180180
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
181181
}
182182

183-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
183+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
184184
return errors.Wrap(err, "can't broadcast partial post consensus sig")
185185
}
186186
return nil
@@ -308,7 +308,7 @@ func (r *ProposerRunner) executeDuty(duty *types.Duty) error {
308308
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
309309
}
310310

311-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
311+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
312312
return errors.Wrap(err, "can't broadcast partial randao sig")
313313
}
314314
return nil

‎ssv/sync_committee.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (r *SyncCommitteeRunner) ProcessConsensus(signedMsg *qbft.SignedMessage) er
111111
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
112112
}
113113

114-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
114+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
115115
return errors.Wrap(err, "can't broadcast partial post consensus sig")
116116
}
117117
return nil

‎ssv/sync_committee_aggregator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func (r *SyncCommitteeAggregatorRunner) ProcessConsensus(signedMsg *qbft.SignedM
196196
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
197197
}
198198

199-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
199+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
200200
return errors.Wrap(err, "can't broadcast partial post consensus sig")
201201
}
202202
return nil
@@ -372,7 +372,7 @@ func (r *SyncCommitteeAggregatorRunner) executeDuty(duty *types.Duty) error {
372372
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
373373
}
374374

375-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
375+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
376376
return errors.Wrap(err, "can't broadcast partial contribution proof sig")
377377
}
378378
return nil

‎ssv/validator_registration.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (r *ValidatorRegistrationRunner) executeDuty(duty *types.Duty) error {
151151
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
152152
}
153153

154-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
154+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
155155
return errors.Wrap(err, "can't broadcast partial randao sig")
156156
}
157157
return nil

‎ssv/voluntary_exit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (r *VoluntaryExitRunner) executeDuty(duty *types.Duty) error {
165165
return errors.Wrap(err, "could not create SignedSSVMessage from SSVMessage")
166166
}
167167

168-
if err := r.GetNetwork().Broadcast(msgToBroadcast); err != nil {
168+
if err := r.GetNetwork().Broadcast(ssvMsg.GetID(), msgToBroadcast); err != nil {
169169
return errors.Wrap(err, "can't broadcast signedPartialMsg with VoluntaryExit")
170170
}
171171

‎types/messages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (msg *SSVMessage) Decode(data []byte) error {
136136
return msg.UnmarshalSSZ(data)
137137
}
138138

139-
// SSVMessage is the main message passed within the SSV network. It encapsulates the SSVMessage structure and a signature
139+
// SignedSSVMessage is the main message passed within the SSV network. It encapsulates the SSVMessage structure and a signature
140140
type SignedSSVMessage struct {
141141
Signature [256]byte // Created by the operator's network key
142142
OperatorID OperatorID

‎types/testingutils/network.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func NewTestingNetwork(operatorID types.OperatorID, sk *rsa.PrivateKey) *Testing
2020
}
2121
}
2222

23-
func (net *TestingNetwork) Broadcast(message *types.SignedSSVMessage) error {
23+
func (net *TestingNetwork) Broadcast(msgID types.MessageID, message *types.SignedSSVMessage) error {
2424
net.BroadcastedMsgs = append(net.BroadcastedMsgs, message)
2525
return nil
2626
}

0 commit comments

Comments
 (0)