Fix merge conflict in bls

Issue came about from Michael and Kirk doing simultaneous work.
2019-04-02 15:33:38 +11:00 · 2019-04-02 15:33:38 +11:00 · f61db9cac8
commit f61db9cac8
parent 3a42d7fa6e
1 changed files with 2 additions and 1 deletions
--- a/eth2/utils/bls/src/aggregate_signature.rs
+++ b/eth2/utils/bls/src/aggregate_signature.rs
@ -38,7 +38,8 @@ impl AggregateSignature {

    /// Add (aggregate) another `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`.