aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-02-10 10:02:35 +0100
committerOnur Gündüz <ogunduz@gmail.com>2026-02-10 10:02:35 +0100
commit4625d1d3d069876567ea956785e9e089aa1c69ca (patch)
tree02572697293f1ef9342318b4c6cc7cfcc0cbbdfb
parent498118ff4f4c2b0f95e943bf32868a845fb0d1ff (diff)
downloadmuxer-4625d1d3d069876567ea956785e9e089aa1c69ca.tar.gz
muxer-4625d1d3d069876567ea956785e9e089aa1c69ca.zip
Update message ID and channel types in Reader and tests
-rw-r--r--reader.go4
-rw-r--r--reader_test.go40
2 files changed, 22 insertions, 22 deletions
diff --git a/reader.go b/reader.go
index 039c3df..0d8dd3b 100644
--- a/reader.go
+++ b/reader.go
@@ -104,8 +104,8 @@ func (b *Reader) ReadMessage(message *Message) (err error) {
// Found message?
if b.state == 0 && b.latest != nil {
- message.ID = int(b.header >> 4)
- message.Channel = rune(b.header & 0b1111)
+ message.ID = b.header >> 4
+ message.Channel = uint8(b.header & 0b1111)
message.Data = b.latest
b.latest = nil
b.missing = 0
diff --git a/reader_test.go b/reader_test.go
index dcc7fa3..e908838 100644
--- a/reader_test.go
+++ b/reader_test.go
@@ -20,7 +20,7 @@ type testCase struct {
size int
}
-var maxID = int(math.Pow(2, 60)) - 1
+var maxID = uint64(math.Pow(2, 60)) - 1
func TestReadMessage(t *testing.T) {
// Run test cases in normal and reversed order.
@@ -55,10 +55,10 @@ func TestReadMessage(t *testing.T) {
bufferSize := 16
id := maxID
- for i := 1; id > 0; id = id / (i * 2) {
+ for i := 1; id > 0; id = id / uint64(i*2) {
i++
- messages = append(messages, newMessage(id, rune(i%15), 0))
- bytes = append(bytes, newBytes(id, rune(i%15), 0, 0, 0))
+ messages = append(messages, newMessage(id, uint8(i%15), 0))
+ bytes = append(bytes, newBytes(id, uint8(i%15), 0, 0, 0))
}
test("header only", messages, bytes, bufferSize)
@@ -72,11 +72,11 @@ func TestReadMessage(t *testing.T) {
bufferSize := 16
id := maxID
- for i := 1; id > 0; id = id / (i * 2) {
+ for i := 1; id > 0; id = id / uint64(i*2) {
i++
- b := newBytes(id, rune(i%15), 0, 0, 0)
- messages = append(messages, newMessage(id, rune(i%15), bufferSize-len(b)))
- bytes = append(bytes, newBytes(id, rune(i%15), bufferSize-len(b), 0, 0))
+ b := newBytes(id, uint8(i%15), 0, 0, 0)
+ messages = append(messages, newMessage(id, uint8(i%15), bufferSize-len(b)))
+ bytes = append(bytes, newBytes(id, uint8(i%15), bufferSize-len(b), 0, 0))
}
test("with payload buffer full", messages, bytes, bufferSize)
@@ -90,11 +90,11 @@ func TestReadMessage(t *testing.T) {
bufferSize := 16
id := maxID
- for i := 1; id > 0; id = id / (i * 2) {
+ for i := 1; id > 0; id = id / uint64(i*2) {
i++
- b := newBytes(id, rune(i%15), 0, 0, 0)
- messages = append(messages, newMessage(id, rune(i%15), (bufferSize-len(b))/2))
- bytes = append(bytes, newBytes(id, rune(i%15), (bufferSize-len(b))/2, 0, 0))
+ b := newBytes(id, uint8(i%15), 0, 0, 0)
+ messages = append(messages, newMessage(id, uint8(i%15), (bufferSize-len(b))/2))
+ bytes = append(bytes, newBytes(id, uint8(i%15), (bufferSize-len(b))/2, 0, 0))
}
test("with payload buffer half empty", messages, bytes, bufferSize)
@@ -244,8 +244,8 @@ func TestReadMessage(t *testing.T) {
)
}(),
reads: func() [][]byte {
- b1 := newBytes(0, rune(1), 2, 0, 0)
- b2 := newBytes(42, rune(3), 14, 0, 0)
+ b1 := newBytes(0, 1, 2, 0, 0)
+ b2 := newBytes(42, 3, 14, 0, 0)
return reading(b1, b2)
}(),
@@ -260,8 +260,8 @@ func TestReadMessage(t *testing.T) {
)
}(),
reads: func() [][]byte {
- b1 := newBytes(0, rune(1), 2, 0, 0)
- b2 := newBytes(42, rune(3), 14, 0, 0)
+ b1 := newBytes(0, 1, 2, 0, 0)
+ b2 := newBytes(42, 3, 14, 0, 0)
b := append(b1, b2...)
xs := chunksOf(b, 2)
return reading(xs...)
@@ -426,7 +426,7 @@ func reader(q [][]byte, size int) *binproto.Reader {
return binproto.NewReaderSize(&testReader{q: q}, size)
}
-func newMessage(id int, ch rune, l int) *binproto.Message {
+func newMessage(id uint64, ch uint8, l int) *binproto.Message {
return &binproto.Message{
ID: id,
Channel: ch,
@@ -434,7 +434,7 @@ func newMessage(id int, ch rune, l int) *binproto.Message {
}
}
-func newBytes(id int, ch rune, l int, start, end int) []byte {
+func newBytes(id uint64, ch uint8, l int, start, end int) []byte {
out := send(id, ch, []byte(fill(l)))
if end == 0 {
return out[start:]
@@ -613,11 +613,11 @@ func encodingLength(i uint64) int {
return 10
}
-func send(id int, ch rune, data []byte) []byte {
+func send(id uint64, ch uint8, data []byte) []byte {
if id > maxID {
panic("binproto: ID too big")
}
- header := uint64(id)<<4 | uint64(ch)
+ header := id<<4 | uint64(ch)
length := len(data) + encodingLength(header)
payload := make([]byte, encodingLength(uint64(length))+length)
n := binary.PutUvarint(payload, uint64(length))