types cleanup
All checks were successful
Build and Publish / BuildAndDeployAmd64 (push) Successful in 28s
Build and Publish / BuildAndDeploy (push) Successful in 2m22s

This commit is contained in:
matst80
2024-11-12 18:17:43 +01:00
parent 3f8cdec9af
commit 7e0f070637
11 changed files with 75 additions and 73 deletions

View File

@@ -10,7 +10,7 @@ import (
type CartPacketQueue struct {
mu sync.RWMutex
expectedPackages map[uint32]*CartListener
expectedPackages map[CartMessage]*CartListener
}
const CurrentPacketVersion = 2
@@ -20,7 +20,7 @@ type CartListener map[CartId]Listener
func NewCartPacketQueue(connection *PersistentConnection) *CartPacketQueue {
queue := &CartPacketQueue{
expectedPackages: make(map[uint32]*CartListener),
expectedPackages: make(map[CartMessage]*CartListener),
}
go queue.HandleConnection(connection)
return queue
@@ -34,7 +34,7 @@ func (p *CartPacketQueue) RemoveListeners() {
close(l.Chan)
}
}
p.expectedPackages = make(map[uint32]*CartListener)
p.expectedPackages = make(map[CartMessage]*CartListener)
}
func (p *CartPacketQueue) HandleConnection(connection *PersistentConnection) error {
@@ -73,7 +73,7 @@ func (p *CartPacketQueue) HandleConnection(connection *PersistentConnection) err
}
}
func (p *CartPacketQueue) HandleData(t uint32, id CartId, data CallResult) {
func (p *CartPacketQueue) HandleData(t CartMessage, id CartId, data CallResult) {
p.mu.Lock()
defer p.mu.Unlock()
pl, ok := p.expectedPackages[t]
@@ -90,7 +90,7 @@ func (p *CartPacketQueue) HandleData(t uint32, id CartId, data CallResult) {
}
}
func (p *CartPacketQueue) Expect(messageType uint32, id CartId) <-chan CallResult {
func (p *CartPacketQueue) Expect(messageType CartMessage, id CartId) <-chan CallResult {
p.mu.Lock()
defer p.mu.Unlock()
l, ok := p.expectedPackages[messageType]