diff --git a/connmgr/null.go b/connmgr/null.go index 2de861c3b14e29d1216edaad9bef0efa1046a643..6e00b0878a2987d327a28846ca28e9deefd8a20f 100644 --- a/connmgr/null.go +++ b/connmgr/null.go @@ -12,13 +12,13 @@ type NullConnMgr struct{} var _ ConnManager = (*NullConnMgr)(nil) -func (_ NullConnMgr) TagPeer(peer.ID, string, int) {} -func (_ NullConnMgr) UntagPeer(peer.ID, string) {} -func (_ NullConnMgr) UpsertTag(peer.ID, string, func(int) int) {} -func (_ NullConnMgr) GetTagInfo(peer.ID) *TagInfo { return &TagInfo{} } -func (_ NullConnMgr) TrimOpenConns(ctx context.Context) {} -func (_ NullConnMgr) Notifee() network.Notifiee { return network.GlobalNoopNotifiee } -func (_ NullConnMgr) Protect(peer.ID, string) {} -func (_ NullConnMgr) Unprotect(peer.ID, string) bool { return false } -func (_ NullConnMgr) IsProtected(peer.ID, string) bool { return false } -func (_ NullConnMgr) Close() error { return nil } +func (NullConnMgr) TagPeer(peer.ID, string, int) {} +func (NullConnMgr) UntagPeer(peer.ID, string) {} +func (NullConnMgr) UpsertTag(peer.ID, string, func(int) int) {} +func (NullConnMgr) GetTagInfo(peer.ID) *TagInfo { return &TagInfo{} } +func (NullConnMgr) TrimOpenConns(ctx context.Context) {} +func (NullConnMgr) Notifee() network.Notifiee { return network.GlobalNoopNotifiee } +func (NullConnMgr) Protect(peer.ID, string) {} +func (NullConnMgr) Unprotect(peer.ID, string) bool { return false } +func (NullConnMgr) IsProtected(peer.ID, string) bool { return false } +func (NullConnMgr) Close() error { return nil } diff --git a/connmgr/presets.go b/connmgr/presets.go index 2bda032d990a0d7d273377cfe9e054b1f91b08ca..34bd1c077cf90de94f894041d53c00150c157754 100644 --- a/connmgr/presets.go +++ b/connmgr/presets.go @@ -33,7 +33,7 @@ func DecayLinear(coef float64) DecayFn { // DecayExpireWhenInactive expires a tag after a certain period of no bumps. func DecayExpireWhenInactive(after time.Duration) DecayFn { return func(value DecayingValue) (_ int, rm bool) { - rm = value.LastVisit.Sub(time.Now()) >= after + rm = time.Until(value.LastVisit) >= after return 0, rm } } diff --git a/crypto/key_test.go b/crypto/key_test.go index 97ab02432c1bab2f6af941138d08548d459c8c45..3089b90feea06d88af6a6ec337c08c027b9d6db8 100644 --- a/crypto/key_test.go +++ b/crypto/key_test.go @@ -293,37 +293,6 @@ func testKeyEquals(t *testing.T, k Key) { } } -type testkey []byte - -func (pk testkey) Bytes() ([]byte, error) { - return pk, nil -} - -func (pk testkey) Type() pb.KeyType { - return pb.KeyType_RSA -} - -func (pk testkey) Raw() ([]byte, error) { - return pk, nil -} - -func (pk testkey) Equals(k Key) bool { - if pk.Type() != k.Type() { - return false - } - a, err := pk.Raw() - if err != nil { - return false - } - - b, err := k.Raw() - if err != nil { - return false - } - - return bytes.Equal(a, b) -} - func TestUnknownCurveErrors(t *testing.T) { _, _, err := GenerateEKeyPair("P-256") if err != nil { diff --git a/go.sum b/go.sum index fa92039e22f31e3ff725a63e7e7463c3417f8d39..a180ccfdc4880e926d909559d41bfd3a06aaf3f3 100644 --- a/go.sum +++ b/go.sum @@ -52,7 +52,6 @@ github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1 github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= -github.com/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc= github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= @@ -64,25 +63,21 @@ github.com/multiformats/go-multiaddr v0.2.2 h1:XZLDTszBIJe6m0zF6ITBrEcZR73OPUhCB github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y= github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= -github.com/multiformats/go-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc= github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I= github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= -github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg= github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU= github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -118,7 +113,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/peer/addrinfo.go b/peer/addrinfo.go index 3e23c5f423e451ea25eae247b0ad08b8bae27596..175b93e472377b5bc13db0886043ce2dba5d035f 100644 --- a/peer/addrinfo.go +++ b/peer/addrinfo.go @@ -3,7 +3,6 @@ package peer import ( "fmt" - "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr" ) @@ -64,7 +63,7 @@ func SplitAddr(m ma.Multiaddr) (transport ma.Multiaddr, id ID) { // AddrInfoFromString builds an AddrInfo from the string representation of a Multiaddr func AddrInfoFromString(s string) (*AddrInfo, error) { - a, err := multiaddr.NewMultiaddr(s) + a, err := ma.NewMultiaddr(s) if err != nil { return nil, err } diff --git a/peer/addrinfo_test.go b/peer/addrinfo_test.go index 5d1ce0a92e1ef39c488126f72969b4ea185ca3bf..1369ff8e00c428c45147179b344a2c82082161e9 100644 --- a/peer/addrinfo_test.go +++ b/peer/addrinfo_test.go @@ -87,8 +87,7 @@ func TestAddrInfosFromP2pAddrs(t *testing.T) { if len(infos) != 0 { t.Fatal("expected no addrs") } - infos, err = AddrInfosFromP2pAddrs(nil) - if err == nil { + if _, err = AddrInfosFromP2pAddrs(nil); err == nil { t.Fatal("expected nil multiaddr to fail") } diff --git a/peer/peer.go b/peer/peer.go index 176b9dffa78487e7eb2f218fd7f8c2e69e6ade27..81b88d9f9daaea3bc85abfe7e88abb0d0f837b74 100644 --- a/peer/peer.go +++ b/peer/peer.go @@ -226,7 +226,7 @@ func IDFromPublicKey(pk ic.PubKey) (ID, error) { } var alg uint64 = mh.SHA2_256 if AdvancedEnableInlining && len(b) <= maxInlineKeyLength { - alg = mh.ID + alg = mh.IDENTITY } hash, _ := mh.Sum(b, alg, -1) return ID(hash), nil diff --git a/peer/record.go b/peer/record.go index 3638c337f37244d04e37d6c0d37d75cd80ce5948..3968fc2252f041e200273f6978561821e87b49ed 100644 --- a/peer/record.go +++ b/peer/record.go @@ -190,7 +190,7 @@ func (r *PeerRecord) Equal(other *PeerRecord) bool { if len(r.Addrs) != len(other.Addrs) { return false } - for i, _ := range r.Addrs { + for i := range r.Addrs { if !r.Addrs[i].Equal(other.Addrs[i]) { return false } diff --git a/peer/set.go b/peer/set.go index 2251a677e21e5c39177f44299f9d979706a79c72..c3730cd4fc65128ea830f3fa4eda02c3cbc07acf 100644 --- a/peer/set.go +++ b/peer/set.go @@ -63,7 +63,7 @@ func (ps *Set) TryAdd(p ID) bool { func (ps *Set) Peers() []ID { ps.lk.Lock() out := make([]ID, 0, len(ps.ps)) - for p, _ := range ps.ps { + for p := range ps.ps { out = append(out, p) } ps.lk.Unlock() diff --git a/record/envelope.go b/record/envelope.go index bdc33abdf1c5095156199455f363f1050759bde5..10115910a0bf63842e4632fb78c9ff879a4252ed 100644 --- a/record/envelope.go +++ b/record/envelope.go @@ -215,9 +215,9 @@ func (e *Envelope) Equal(other *Envelope) bool { return e == nil } return e.PublicKey.Equals(other.PublicKey) && - bytes.Compare(e.PayloadType, other.PayloadType) == 0 && - bytes.Compare(e.signature, other.signature) == 0 && - bytes.Compare(e.RawPayload, other.RawPayload) == 0 + bytes.Equal(e.PayloadType, other.PayloadType) && + bytes.Equal(e.signature, other.signature) && + bytes.Equal(e.RawPayload, other.RawPayload) } // Record returns the Envelope's payload unmarshalled as a Record. diff --git a/record/envelope_test.go b/record/envelope_test.go index 3946a572b8996ea1046f17c54e10adc75df6d1d7..40c50d61ab1be74fb1c0dc4f5412273039e51658 100644 --- a/record/envelope_test.go +++ b/record/envelope_test.go @@ -61,7 +61,7 @@ func TestEnvelopeHappyPath(t *testing.T) { t.Error("envelope has unexpected public key") } - if bytes.Compare(rec.Codec(), envelope.PayloadType) != 0 { + if !bytes.Equal(rec.Codec(), envelope.PayloadType) { t.Error("PayloadType does not match record Codec") } @@ -72,7 +72,7 @@ func TestEnvelopeHappyPath(t *testing.T) { deserialized, rec2, err := ConsumeEnvelope(serialized, rec.Domain()) test.AssertNilError(t, err) - if bytes.Compare(deserialized.RawPayload, payload) != 0 { + if !bytes.Equal(deserialized.RawPayload, payload) { t.Error("payload of envelope does not match input") } @@ -242,6 +242,7 @@ func TestEnvelopeValidateFailsForDifferentDomain(t *testing.T) { test.AssertNilError(t, err) serialized, err := envelope.Marshal() + test.AssertNilError(t, err) // try to open our modified envelope _, _, err = ConsumeEnvelope(serialized, "wrong-domain") diff --git a/routing/query_serde.go b/routing/query_serde.go index c7423ffe4ca5d8ee6daef2f1019fee9b778148d7..18c3f91a09c4da33ecf3e5506e5e2d7c0846192f 100644 --- a/routing/query_serde.go +++ b/routing/query_serde.go @@ -8,7 +8,7 @@ import ( func (qe *QueryEvent) MarshalJSON() ([]byte, error) { return json.Marshal(map[string]interface{}{ - "ID": peer.IDB58Encode(qe.ID), + "ID": peer.Encode(qe.ID), "Type": int(qe.Type), "Responses": qe.Responses, "Extra": qe.Extra, @@ -27,7 +27,7 @@ func (qe *QueryEvent) UnmarshalJSON(b []byte) error { return err } if len(temp.ID) > 0 { - pid, err := peer.IDB58Decode(temp.ID) + pid, err := peer.Decode(temp.ID) if err != nil { return err }