From 3a3fff190e12e4d1dfa64e67b74b9e90d30f821e Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Thu, 22 Sep 2016 15:28:44 +0200
Subject: [PATCH] consensus: TendermintValidator lost inheritance, restored
---
consensus/types/validator.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/consensus/types/validator.go b/consensus/types/validator.go
index 146e4c17..8feefb1f 100644
--- a/consensus/types/validator.go
+++ b/consensus/types/validator.go
@@ -18,7 +18,7 @@ type Validator interface {
// Anticipating moving to our own definition of Validator, or at least
// augmenting Tendermint's.
type TendermintValidator struct {
- tmintValidator *tendermint_types.Validator `json:"validator"`
+ *tendermint_types.Validator `json:"validator"`
}
var _ Validator = (*TendermintValidator)(nil)
@@ -28,7 +28,7 @@ func (tendermintValidator *TendermintValidator) AssertIsValidator() {
}
func (tendermintValidator *TendermintValidator) Address() []byte {
- return tendermintValidator.tmintValidator.Address
+ return tendermintValidator.Address()
}
//-------------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ func FromTendermintValidators(tmValidators []*tendermint_types.Validator) []Vali
for i, tmValidator := range tmValidators {
// This embedding could be replaced by a mapping once if we want to describe
// a more general notion of validator
- validators[i] = &TendermintValidator{tmintValidator: tmValidator}
+ validators[i] = &TendermintValidator{tmValidator}
}
return validators
}
--
GitLab