Skip to content

Commit 9f03cfd

Browse files
committed
create canoto strcut
1 parent f566c0b commit 9f03cfd

File tree

4 files changed

+1906
-25
lines changed

4 files changed

+1906
-25
lines changed

epoch_failover_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,6 @@ func createEmptyVote(md ProtocolMetadata, signer NodeID) *EmptyVote {
769769
},
770770
},
771771
}
772-
emptyVoteFrom2.Vote.CalculateCanotoCache()
773772
return emptyVoteFrom2
774773
}
775774

msg.canoto.go

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

msg.go

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,39 @@ type Message struct {
2626
}
2727

2828
type EmptyVoteMetadata struct {
29+
Round uint64
30+
Epoch uint64
31+
}
32+
33+
type canotoEmptyVoteMetadata struct {
2934
Round uint64 `canoto:"uint,4"`
3035
Epoch uint64 `canoto:"uint,2"`
3136

32-
canotoData canotoData_EmptyVoteMetadata
37+
canotoData canotoData_canotoEmptyVoteMetadata
3338
}
3439

3540
type ToBeSignedEmptyVote struct {
3641
EmptyVoteMetadata
3742
}
3843

3944
func (v *ToBeSignedEmptyVote) Bytes() []byte {
40-
return v.EmptyVoteMetadata.MarshalCanoto()
45+
canotoEV := canotoEmptyVoteMetadata{
46+
Round: v.EmptyVoteMetadata.Round,
47+
Epoch: v.EmptyVoteMetadata.Epoch,
48+
}
49+
return canotoEV.MarshalCanoto()
4150
}
4251

4352
func (v *ToBeSignedEmptyVote) FromBytes(buff []byte) error {
44-
var emptyVoteMetadata EmptyVoteMetadata
53+
var emptyVoteMetadata canotoEmptyVoteMetadata
4554
if err := emptyVoteMetadata.UnmarshalCanoto(buff); err != nil {
4655
return fmt.Errorf("failed to unmarshal ToBeSignedEmptyVote: %w", err)
4756
}
4857

49-
v.EmptyVoteMetadata = emptyVoteMetadata
58+
v.EmptyVoteMetadata = EmptyVoteMetadata{
59+
Round: emptyVoteMetadata.Round,
60+
Epoch: emptyVoteMetadata.Epoch,
61+
}
5062
return nil
5163
}
5264

0 commit comments

Comments
 (0)