diff --git a/go.mod b/go.mod index 15eeb93..d77dc34 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,3 @@ require ( github.com/google/uuid v1.6.0 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 ) - -require ( - github.com/linkdata/deadlock v0.5.2 // indirect - github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect -) diff --git a/net/lux_router.go b/net/lux_router.go index 4dc51b7..5f8af19 100644 --- a/net/lux_router.go +++ b/net/lux_router.go @@ -8,8 +8,7 @@ import ( "lux/proto" "lux/rpc" "net" - - "github.com/linkdata/deadlock" + "sync" ) type LuxRouteType int @@ -84,7 +83,7 @@ type LuxRouter struct { routes map[proto.LuxID]*LuxRoute - channelLock deadlock.RWMutex + channelLock sync.RWMutex outbound []LuxChannel inbound []LuxChannel diff --git a/node/lux_node.go b/node/lux_node.go index 505f3a4..7d15d83 100644 --- a/node/lux_node.go +++ b/node/lux_node.go @@ -7,10 +7,9 @@ import ( "lux/net" "lux/proto" "lux/rpc" + "sync" ipnet "net" - - "github.com/linkdata/deadlock" ) type LuxNode struct { @@ -19,10 +18,10 @@ type LuxNode struct { stopChan chan bool neighbors map[proto.LuxID]*ipnet.UDPAddr - neighborLock deadlock.RWMutex + neighborLock sync.RWMutex state LuxNodeState - stateLock deadlock.RWMutex + stateLock sync.RWMutex subscribers []LuxNodeSubscriber @@ -105,7 +104,7 @@ func (node *LuxNode) GetState() *LuxNodeState { return &node.state } -func (node *LuxNode) GetStateLock() *deadlock.RWMutex { +func (node *LuxNode) GetStateLock() *sync.RWMutex { return &node.stateLock }