From e5ba90639c1d4d452d3566b4af1d85ca760e3fa2 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 4 Dec 2021 16:53:56 +0400 Subject: [PATCH] panic when peer ID validation fails --- pstoremem/metadata.go | 8 ++++---- pstoremem/protobook.go | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pstoremem/metadata.go b/pstoremem/metadata.go index 7bd0fb3..fa9adf9 100644 --- a/pstoremem/metadata.go +++ b/pstoremem/metadata.go @@ -3,7 +3,7 @@ package pstoremem import ( "sync" - peer "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p-core/peer" pstore "github.com/libp2p/go-libp2p-core/peerstore" ) @@ -19,7 +19,7 @@ type metakey struct { type memoryPeerMetadata struct { // store other data, like versions - //ds ds.ThreadSafeDatastore + // ds ds.ThreadSafeDatastore ds map[metakey]interface{} dslock sync.RWMutex interned map[string]interface{} @@ -36,7 +36,7 @@ func NewPeerMetadata() *memoryPeerMetadata { func (ps *memoryPeerMetadata) Put(p peer.ID, key string, val interface{}) error { if err := p.Validate(); err != nil { - return err + panic(err) } ps.dslock.Lock() defer ps.dslock.Unlock() @@ -53,7 +53,7 @@ func (ps *memoryPeerMetadata) Put(p peer.ID, key string, val interface{}) error func (ps *memoryPeerMetadata) Get(p peer.ID, key string) (interface{}, error) { if err := p.Validate(); err != nil { - return nil, err + panic(err) } ps.dslock.RLock() defer ps.dslock.RUnlock() diff --git a/pstoremem/protobook.go b/pstoremem/protobook.go index f2fbe50..64c4d4f 100644 --- a/pstoremem/protobook.go +++ b/pstoremem/protobook.go @@ -83,7 +83,7 @@ func (pb *memoryProtoBook) internProtocol(proto string) string { func (pb *memoryProtoBook) SetProtocols(p peer.ID, protos ...string) error { if err := p.Validate(); err != nil { - return err + panic(err) } if len(protos) > pb.maxProtos { return errTooManyProtocols @@ -104,7 +104,7 @@ func (pb *memoryProtoBook) SetProtocols(p peer.ID, protos ...string) error { func (pb *memoryProtoBook) AddProtocols(p peer.ID, protos ...string) error { if err := p.Validate(); err != nil { - return err + panic(err) } s := pb.segments.get(p) @@ -128,7 +128,7 @@ func (pb *memoryProtoBook) AddProtocols(p peer.ID, protos ...string) error { func (pb *memoryProtoBook) GetProtocols(p peer.ID) ([]string, error) { if err := p.Validate(); err != nil { - return nil, err + panic(err) } s := pb.segments.get(p) @@ -145,7 +145,7 @@ func (pb *memoryProtoBook) GetProtocols(p peer.ID) ([]string, error) { func (pb *memoryProtoBook) RemoveProtocols(p peer.ID, protos ...string) error { if err := p.Validate(); err != nil { - return err + panic(err) } s := pb.segments.get(p) @@ -166,7 +166,7 @@ func (pb *memoryProtoBook) RemoveProtocols(p peer.ID, protos ...string) error { func (pb *memoryProtoBook) SupportsProtocols(p peer.ID, protos ...string) ([]string, error) { if err := p.Validate(); err != nil { - return nil, err + panic(err) } s := pb.segments.get(p) @@ -185,7 +185,7 @@ func (pb *memoryProtoBook) SupportsProtocols(p peer.ID, protos ...string) ([]str func (pb *memoryProtoBook) FirstSupportedProtocol(p peer.ID, protos ...string) (string, error) { if err := p.Validate(); err != nil { - return "", err + panic(err) } s := pb.segments.get(p)