From 06cd0c894a83c13c43ada577d76aa9bd533c0095 Mon Sep 17 00:00:00 2001 From: Paladz Date: Tue, 19 Feb 2019 16:58:34 +0800 Subject: [PATCH] clean code (#1577) --- vendor/github.com/tendermint/go-crypto/priv_key.go | 11 -- .../tendermint/go-crypto/privkeyinner_wrapper.go | 4 - .../tendermint/go-crypto/pubkeyinner_wrapper.go | 4 - .../github.com/tendermint/go-crypto/signature.go | 20 --- .../tendermint/go-crypto/signatureinner_wrapper.go | 4 - vendor/github.com/tendermint/go-wire/byteslice.go | 15 --- vendor/github.com/tendermint/go-wire/int.go | 79 ------------ vendor/github.com/tendermint/go-wire/wire.go | 20 --- vendor/github.com/tendermint/tmlibs/common/math.go | 142 --------------------- .../github.com/tendermint/tmlibs/common/random.go | 70 ---------- 10 files changed, 369 deletions(-) diff --git a/vendor/github.com/tendermint/go-crypto/priv_key.go b/vendor/github.com/tendermint/go-crypto/priv_key.go index 2e80a11e..233563fe 100644 --- a/vendor/github.com/tendermint/go-crypto/priv_key.go +++ b/vendor/github.com/tendermint/go-crypto/priv_key.go @@ -1,8 +1,6 @@ package crypto import ( - "bytes" - "github.com/tendermint/ed25519" "github.com/tendermint/go-wire" data "github.com/tendermint/go-wire/data" @@ -36,7 +34,6 @@ type validatable interface { type PrivKeyInner interface { Sign(msg []byte) Signature PubKey() PubKey - Equals(PrivKey) bool Wrap() PrivKey } @@ -59,14 +56,6 @@ func (privKey PrivKeyEd25519) PubKey() PubKey { return PubKeyEd25519(pubBytes).Wrap() } -func (privKey PrivKeyEd25519) Equals(other PrivKey) bool { - if otherEd, ok := other.Unwrap().(PrivKeyEd25519); ok { - return bytes.Equal(privKey[:], otherEd[:]) - } else { - return false - } -} - func (p PrivKeyEd25519) MarshalJSON() ([]byte, error) { return data.Encoder.Marshal(p[:]) } diff --git a/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go index da824348..78b17540 100644 --- a/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go +++ b/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go @@ -39,10 +39,6 @@ func (h PrivKey) Unwrap() PrivKeyInner { return hi } -func (h PrivKey) Empty() bool { - return h.PrivKeyInner == nil -} - /*** below are bindings for each implementation ***/ func init() { diff --git a/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go index 55caa71e..c9c8156a 100644 --- a/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go +++ b/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go @@ -39,10 +39,6 @@ func (h PubKey) Unwrap() PubKeyInner { return hi } -func (h PubKey) Empty() bool { - return h.PubKeyInner == nil -} - /*** below are bindings for each implementation ***/ func init() { diff --git a/vendor/github.com/tendermint/go-crypto/signature.go b/vendor/github.com/tendermint/go-crypto/signature.go index 2037f46e..0c9b32ad 100644 --- a/vendor/github.com/tendermint/go-crypto/signature.go +++ b/vendor/github.com/tendermint/go-crypto/signature.go @@ -1,8 +1,6 @@ package crypto import ( - "bytes" - "github.com/tendermint/go-wire" data "github.com/tendermint/go-wire/data" ) @@ -19,8 +17,6 @@ func SignatureFromBytes(sigBytes []byte) (sig Signature, err error) { // +gen wrapper:"Signature,Impl[SignatureEd25519,SignatureSecp256k1],ed25519,secp256k1" type SignatureInner interface { Bytes() []byte - IsZero() bool - Equals(Signature) bool Wrap() Signature } @@ -35,16 +31,6 @@ func (sig SignatureEd25519) Bytes() []byte { return wire.BinaryBytes(Signature{sig}) } -func (sig SignatureEd25519) IsZero() bool { return len(sig) == 0 } - -func (sig SignatureEd25519) Equals(other Signature) bool { - if otherEd, ok := other.Unwrap().(SignatureEd25519); ok { - return bytes.Equal(sig[:], otherEd[:]) - } else { - return false - } -} - func (sig SignatureEd25519) MarshalJSON() ([]byte, error) { return data.Encoder.Marshal(sig[:]) } @@ -55,9 +41,3 @@ func (sig *SignatureEd25519) UnmarshalJSON(enc []byte) error { copy(sig[:], ref) return err } - -func SignatureEd25519FromBytes(data []byte) Signature { - var sig SignatureEd25519 - copy(sig[:], data) - return sig.Wrap() -} diff --git a/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go index 7de633ac..917218dc 100644 --- a/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go +++ b/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go @@ -39,10 +39,6 @@ func (h Signature) Unwrap() SignatureInner { return hi } -func (h Signature) Empty() bool { - return h.SignatureInner == nil -} - /*** below are bindings for each implementation ***/ func init() { diff --git a/vendor/github.com/tendermint/go-wire/byteslice.go b/vendor/github.com/tendermint/go-wire/byteslice.go index a02a201b..721c94ba 100644 --- a/vendor/github.com/tendermint/go-wire/byteslice.go +++ b/vendor/github.com/tendermint/go-wire/byteslice.go @@ -39,19 +39,4 @@ func ReadByteSlice(r io.Reader, lmt int, n *int, err *error) []byte { buf := make([]byte, length) ReadFull(buf, r, n, err) return buf - -} - -func PutByteSlice(buf []byte, bz []byte) (n int, err error) { - n_, err := PutVarint(buf, len(bz)) - if err != nil { - return 0, err - } - buf = buf[n_:] - n += n_ - if len(buf) < len(bz) { - return 0, ErrBinaryWriteOverflow - } - copy(buf, bz) - return n + len(bz), nil } diff --git a/vendor/github.com/tendermint/go-wire/int.go b/vendor/github.com/tendermint/go-wire/int.go index 2e3eded2..10f1c02a 100644 --- a/vendor/github.com/tendermint/go-wire/int.go +++ b/vendor/github.com/tendermint/go-wire/int.go @@ -6,51 +6,6 @@ import ( "io" ) -// Bool - -func WriteBool(b bool, w io.Writer, n *int, err *error) { - var bb byte - if b { - bb = 0x01 - } else { - bb = 0x00 - } - WriteTo([]byte{bb}, w, n, err) -} - -func ReadBool(r io.Reader, n *int, err *error) bool { - var buf [1]byte - ReadFull(buf[:], r, n, err) - switch buf[0] { - case 0x00: - return false - case 0x01: - return true - default: - setFirstErr(err, errors.New("Invalid bool")) - return false - } -} - -func PutBool(buf []byte, b bool) { - if b { - buf[0] = 0x01 - } else { - buf[0] = 0x00 - } -} - -func GetBool(buf []byte) (bool, error) { - switch buf[0] { - case 0x00: - return false, nil - case 0x01: - return true, nil - default: - return false, errors.New("Invalid bool") - } -} - // Byte func WriteByte(b byte, w io.Writer, n *int, err *error) { @@ -129,34 +84,6 @@ func GetUint16(buf []byte) uint16 { return binary.BigEndian.Uint16(buf) } -// []Uint16 - -func WriteUint16s(iz []uint16, w io.Writer, n *int, err *error) { - WriteUint32(uint32(len(iz)), w, n, err) - for _, i := range iz { - WriteUint16(i, w, n, err) - if *err != nil { - return - } - } -} - -func ReadUint16s(r io.Reader, n *int, err *error) []uint16 { - length := ReadUint32(r, n, err) - if *err != nil { - return nil - } - iz := make([]uint16, length) - for j := uint32(0); j < length; j++ { - ii := ReadUint16(r, n, err) - if *err != nil { - return nil - } - iz[j] = ii - } - return iz -} - // Int32 func WriteInt32(i int32, w io.Writer, n *int, err *error) { @@ -249,12 +176,6 @@ func GetUint64(buf []byte) uint64 { return binary.BigEndian.Uint64(buf) } -// Varint - -func UvarintSize(i uint64) int { - return uvarintSize(i) + 1 // The first byte encodes uvarintSize(i) -} - func uvarintSize(i uint64) int { if i == 0 { return 0 diff --git a/vendor/github.com/tendermint/go-wire/wire.go b/vendor/github.com/tendermint/go-wire/wire.go index 8ff2a91b..1056019e 100644 --- a/vendor/github.com/tendermint/go-wire/wire.go +++ b/vendor/github.com/tendermint/go-wire/wire.go @@ -1,7 +1,6 @@ package wire import ( - "bytes" "encoding/json" "errors" "io" @@ -60,17 +59,6 @@ func ReadBinaryPtr(o interface{}, r io.Reader, lmt int, n *int, err *error) (res return res } -func ReadBinaryPtrLengthPrefixed(o interface{}, r io.Reader, lmt int, n *int, err *error) (res interface{}) { - length := ReadVarint(r, n, err) - nSave := *n - res = ReadBinaryPtr(o, r, lmt, n, err) - nRes := *n - nSave - if nRes != length && *err == nil { - *err = errors.New(cmn.Fmt("Error: binary ready wrong length prefix. Declared:%v vs actual:%v", length, nRes)) - } - return res -} - // WriteBinary is the binary encoder. Its arguments are the subject to be // encoded, the writer that'll receive the encoded bytes, as well as a // receiver to store the bytes written and any error encountered. @@ -80,14 +68,6 @@ func WriteBinary(o interface{}, w io.Writer, n *int, err *error) { writeReflectBinary(rv, rt, Options{}, w, n, err) } -func WriteBinaryLengthPrefixed(o interface{}, w io.Writer, n *int, err *error) { - var bufN int - var buf = new(bytes.Buffer) - WriteBinary(o, buf, &bufN, err) - WriteVarint(buf.Len(), w, n, err) - WriteTo(buf.Bytes(), w, n, err) -} - func ReadJSON(o interface{}, bytes []byte, err *error) interface{} { var object interface{} *err = json.Unmarshal(bytes, &object) diff --git a/vendor/github.com/tendermint/tmlibs/common/math.go b/vendor/github.com/tendermint/tmlibs/common/math.go index b037d1a7..0c427f45 100644 --- a/vendor/github.com/tendermint/tmlibs/common/math.go +++ b/vendor/github.com/tendermint/tmlibs/common/math.go @@ -1,61 +1,5 @@ package common -func MaxInt8(a, b int8) int8 { - if a > b { - return a - } - return b -} - -func MaxUint8(a, b uint8) uint8 { - if a > b { - return a - } - return b -} - -func MaxInt16(a, b int16) int16 { - if a > b { - return a - } - return b -} - -func MaxUint16(a, b uint16) uint16 { - if a > b { - return a - } - return b -} - -func MaxInt32(a, b int32) int32 { - if a > b { - return a - } - return b -} - -func MaxUint32(a, b uint32) uint32 { - if a > b { - return a - } - return b -} - -func MaxInt64(a, b int64) int64 { - if a > b { - return a - } - return b -} - -func MaxUint64(a, b uint64) uint64 { - if a > b { - return a - } - return b -} - func MaxInt(a, b int) int { if a > b { return a @@ -63,95 +7,9 @@ func MaxInt(a, b int) int { return b } -func MaxUint(a, b uint) uint { - if a > b { - return a - } - return b -} - -//----------------------------------------------------------------------------- - -func MinInt8(a, b int8) int8 { - if a < b { - return a - } - return b -} - -func MinUint8(a, b uint8) uint8 { - if a < b { - return a - } - return b -} - -func MinInt16(a, b int16) int16 { - if a < b { - return a - } - return b -} - -func MinUint16(a, b uint16) uint16 { - if a < b { - return a - } - return b -} - -func MinInt32(a, b int32) int32 { - if a < b { - return a - } - return b -} - -func MinUint32(a, b uint32) uint32 { - if a < b { - return a - } - return b -} - -func MinInt64(a, b int64) int64 { - if a < b { - return a - } - return b -} - -func MinUint64(a, b uint64) uint64 { - if a < b { - return a - } - return b -} - func MinInt(a, b int) int { if a < b { return a } return b } - -func MinUint(a, b uint) uint { - if a < b { - return a - } - return b -} - -//----------------------------------------------------------------------------- - -func ExpUint64(a, b uint64) uint64 { - accum := uint64(1) - for b > 0 { - if b&1 == 1 { - accum *= a - } - a *= a - b >>= 1 - } - return accum -} diff --git a/vendor/github.com/tendermint/tmlibs/common/random.go b/vendor/github.com/tendermint/tmlibs/common/random.go index 73bd1635..bcb81546 100644 --- a/vendor/github.com/tendermint/tmlibs/common/random.go +++ b/vendor/github.com/tendermint/tmlibs/common/random.go @@ -3,7 +3,6 @@ package common import ( crand "crypto/rand" "math/rand" - "time" ) const ( @@ -44,79 +43,10 @@ MAIN_LOOP: return string(chars) } -func RandUint16() uint16 { - return uint16(rand.Uint32() & (1<<16 - 1)) -} - -func RandUint32() uint32 { - return rand.Uint32() -} - -func RandUint64() uint64 { - return uint64(rand.Uint32())<<32 + uint64(rand.Uint32()) -} - -func RandUint() uint { - return uint(rand.Int()) -} - -func RandInt16() int16 { - return int16(rand.Uint32() & (1<<16 - 1)) -} - -func RandInt32() int32 { - return int32(rand.Uint32()) -} - -func RandInt64() int64 { - return int64(rand.Uint32())<<32 + int64(rand.Uint32()) -} - func RandInt() int { return rand.Int() } -// Distributed pseudo-exponentially to test for various cases -func RandUint16Exp() uint16 { - bits := rand.Uint32() % 16 - if bits == 0 { - return 0 - } - n := uint16(1 << (bits - 1)) - n += uint16(rand.Int31()) & ((1 << (bits - 1)) - 1) - return n -} - -// Distributed pseudo-exponentially to test for various cases -func RandUint32Exp() uint32 { - bits := rand.Uint32() % 32 - if bits == 0 { - return 0 - } - n := uint32(1 << (bits - 1)) - n += uint32(rand.Int31()) & ((1 << (bits - 1)) - 1) - return n -} - -// Distributed pseudo-exponentially to test for various cases -func RandUint64Exp() uint64 { - bits := rand.Uint32() % 64 - if bits == 0 { - return 0 - } - n := uint64(1 << (bits - 1)) - n += uint64(rand.Int63()) & ((1 << (bits - 1)) - 1) - return n -} - -func RandFloat32() float32 { - return rand.Float32() -} - -func RandTime() time.Time { - return time.Unix(int64(RandUint64Exp()), 0) -} - func RandBytes(n int) []byte { bs := make([]byte, n) for i := 0; i < n; i++ { -- 2.11.0