From 51628aea08615206ab7dca0af132a8bdbb24bdec Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 2 Mar 2018 01:33:38 -0500 Subject: [PATCH] types: revert to old wire. builds --- types/evidence.go | 10 +++++----- wire/wire.go | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/types/evidence.go b/types/evidence.go index d4916e32a..9e1f6af0e 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -80,13 +80,13 @@ func (evl EvidenceList) Has(evidence Evidence) bool { //------------------------------------------- const ( - wireTypeEvidenceDuplicateVote = "com.tendermint.types.evidence.duplicate_vote" + evidenceTypeDuplicateVote = byte(0x01) ) -func init() { - wire.RegisterInterface((*Evidence)(nil), nil) - wire.RegisterConcrete(&DuplicateVoteEvidence{}, wireTypeEvidenceDuplicateVote, nil) -} +var _ = wire.RegisterInterface( + struct{ Evidence }{}, + wire.ConcreteType{&DuplicateVoteEvidence{}, evidenceTypeDuplicateVote}, +) //------------------------------------------- diff --git a/wire/wire.go b/wire/wire.go index 255e66538..9d0d2c208 100644 --- a/wire/wire.go +++ b/wire/wire.go @@ -36,6 +36,14 @@ func UnmarshalJSON(jsonBz []byte, ptr interface{}) error { return wire.UnmarshalJSON(jsonBz, ptr) } +type ConcreteType = wire.ConcreteType + +func RegisterInterface(o interface{}, ctypes ...ConcreteType) *wire.TypeInfo { + return wire.RegisterInterface(o, ctypes...) +} + +const RFC3339Millis = wire.RFC3339Millis + /* func RegisterInterface(ptr interface{}, opts *wire.InterfaceOptions) {