cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict in bls

Browse Source 
Issue came about from Michael and Kirk doing simultaneous work.
This commit is contained in:
Paul Hauner 2019-04-02 15:33:38 +11:00
parent 3a42d7fa6e
commit f61db9cac8
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eth2/utils/bls/src/aggregate_signature.rs
View File

@ -38,7 +38,8 @@ impl AggregateSignature {
/// Add (aggregate) another `AggregateSignature`. /// Add (aggregate) another `AggregateSignature`.
pub fn add_aggregate(&mut self, agg_signature: &AggregateSignature) { pub fn add_aggregate(&mut self, agg_signature: &AggregateSignature) {
self.0.add_aggregate(&agg_signature.0) self.aggregate_signature
.add_aggregate(&agg_signature.aggregate_signature)
} }
/// Verify the `AggregateSignature` against an `AggregatePublicKey`. /// Verify the `AggregateSignature` against an `AggregatePublicKey`.