Code refactoring (change interface to any)

This commit is contained in:
Alexey Khit
2023-03-17 06:44:40 +03:00
parent d4d91e4920
commit 2146ea470b
23 changed files with 54 additions and 54 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ type Client struct {
audioSeq uint16
}
type Response map[string]interface{}
type Response map[string]any
const Login = uint16(1000)
const OPMonitorClaim = uint16(1413)
+3 -3
View File
@@ -91,7 +91,7 @@ func (c *Character) GenerateEvent() (data []byte, err error) {
}
// Set new value and NotifyListeners
func (c *Character) Set(v interface{}) (err error) {
func (c *Character) Set(v any) (err error) {
if err = c.Write(v); err != nil {
return
}
@@ -99,7 +99,7 @@ func (c *Character) Set(v interface{}) (err error) {
}
// Write new value with right format
func (c *Character) Write(v interface{}) (err error) {
func (c *Character) Write(v any) (err error) {
switch c.Format {
case characteristic.FormatTLV8:
var data []byte
@@ -120,7 +120,7 @@ func (c *Character) Write(v interface{}) (err error) {
}
// ReadTLV8 value to right struct
func (c *Character) ReadTLV8(v interface{}) (err error) {
func (c *Character) ReadTLV8(v any) (err error) {
var data []byte
if data, err = base64.StdEncoding.DecodeString(c.Value.(string)); err != nil {
return
+1 -1
View File
@@ -35,7 +35,7 @@ type Conn struct {
ClientPrivate []byte
OnEvent func(res *http.Response)
Output func(msg interface{})
Output func(msg any)
conn net.Conn
secure *Secure
+2 -2
View File
@@ -38,7 +38,7 @@ type PairVerifyPayload struct {
Signature []byte `tlv8:"10,optional"`
}
//func (c *Character) Unmarshal(value interface{}) error {
//func (c *Character) Unmarshal(value any) error {
// switch c.Format {
// case characteristic.FormatTLV8:
// data, err := base64.StdEncoding.DecodeString(c.Value.(string))
@@ -50,7 +50,7 @@ type PairVerifyPayload struct {
// return nil
//}
//func (c *Character) Marshal(value interface{}) error {
//func (c *Character) Marshal(value any) error {
// switch c.Format {
// case characteristic.FormatTLV8:
// data, err := tlv8.Marshal(value)
+7 -7
View File
@@ -27,7 +27,7 @@ func NewReader(b []byte) *AMF0 {
return &AMF0{buf: b}
}
func (a *AMF0) ReadMetaData() map[string]interface{} {
func (a *AMF0) ReadMetaData() map[string]any {
if b, _ := a.ReadByte(); b != TypeString {
return nil
}
@@ -48,8 +48,8 @@ func (a *AMF0) ReadMetaData() map[string]interface{} {
return nil
}
func (a *AMF0) ReadMap() (map[interface{}]interface{}, error) {
dict := make(map[interface{}]interface{})
func (a *AMF0) ReadMap() (map[any]any, error) {
dict := make(map[any]any)
for a.pos < len(a.buf) {
k, err := a.ReadItem()
@@ -66,7 +66,7 @@ func (a *AMF0) ReadMap() (map[interface{}]interface{}, error) {
return dict, nil
}
func (a *AMF0) ReadItem() (interface{}, error) {
func (a *AMF0) ReadItem() (any, error) {
dataType, err := a.ReadByte()
if err != nil {
return nil, err
@@ -131,8 +131,8 @@ func (a *AMF0) ReadString() (string, error) {
return s, nil
}
func (a *AMF0) ReadObject() (map[string]interface{}, error) {
obj := make(map[string]interface{})
func (a *AMF0) ReadObject() (map[string]any, error) {
obj := make(map[string]any)
for {
k, err := a.ReadString()
@@ -155,7 +155,7 @@ func (a *AMF0) ReadObject() (map[string]interface{}, error) {
return obj, nil
}
func (a *AMF0) ReadEcmaArray() (map[string]interface{}, error) {
func (a *AMF0) ReadEcmaArray() (map[string]any, error) {
if a.pos+4 >= len(a.buf) {
return nil, Err
}
+1 -1
View File
@@ -176,7 +176,7 @@ func (c *Conn) Close() (err error) {
return c.conn.Close()
}
func parseAudioConfig(meta map[string]interface{}) av.CodecData {
func parseAudioConfig(meta map[string]any) av.CodecData {
if meta["audiocodecid"] != float64(10) {
return nil
}
+1 -1
View File
@@ -24,7 +24,7 @@ type Message struct {
Line string
}
func NewNgrok(command interface{}) (*Ngrok, error) {
func NewNgrok(command any) (*Ngrok, error) {
var arg []string
switch command.(type) {
case string:
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"testing"
)
func assert(t *testing.T, one, two interface{}) {
func assert(t *testing.T, one, two any) {
if one != two {
t.FailNow()
}