From b02b35e7e0ce8d63e3b9e4d80c3f001ba51bb99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Krzy=C5=BCanowski?= <krzmaciek@gmail.com>
Date: Mon, 25 Mar 2024 22:29:19 +0100
Subject: [PATCH] Removed unecessary function and chaged GetRID() name to RID()

---
 common/common.go | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/common/common.go b/common/common.go
index cb43b74..283787e 100644
--- a/common/common.go
+++ b/common/common.go
@@ -35,7 +35,7 @@ func RequestFrameFrom(req Request) (RequestFrame, error) {
 		return *new(RequestFrame), err
 	}
 
-	return RequestFrame{req.GetRID(), jsonBytes}, nil
+	return RequestFrame{req.RID(), jsonBytes}, nil
 }
 
 func RequestFromFrame[T Request](reqFrame RequestFrame) (T, error) {
@@ -61,7 +61,7 @@ func ResponseFrameFrom(res Response) (ResponseFrame, error) {
 		return *new(ResponseFrame), err
 	}
 
-	return ResponseFrame{res.GetRID(), jsonBytes}, nil
+	return ResponseFrame{res.RID(), jsonBytes}, nil
 }
 
 func ResponseFromFrame[T Response](resFrame ResponseFrame) (T, error) {
@@ -76,7 +76,7 @@ func ResponseFromFrame[T Response](resFrame ResponseFrame) (T, error) {
 }
 
 type Request interface {
-	GetRID() int
+	RID() int
 }
 
 type Response Request
@@ -85,7 +85,7 @@ type EchoRequest struct {
 	EchoByte byte `json:"echoByte"`
 }
 
-func (EchoRequest) GetRID() int {
+func (EchoRequest) RID() int {
 	return EchoRID
 }
 
@@ -93,14 +93,14 @@ type EchoResponse struct {
 	EchoByte byte `json:"echoByte"`
 }
 
-func (EchoResponse) GetRID() int {
+func (EchoResponse) RID() int {
 	return EchoRID
 }
 
 type ListPeersRequest struct {
 }
 
-func (ListPeersRequest) GetRID() int {
+func (ListPeersRequest) RID() int {
 	return ListPeersRID
 }
 
@@ -108,7 +108,7 @@ type ListPeersResponse struct {
 	PeersInfo []PeerInfo `json:"peers"`
 }
 
-func (ListPeersResponse) GetRID() int {
+func (ListPeersResponse) RID() int {
 	return ListPeersRID
 }
 
@@ -117,18 +117,7 @@ type AuthRequest struct {
 	Password string `json:"password"`
 }
 
-func (req AuthRequest) MarshalJSON() ([]byte, error) {
-	type Alias AuthRequest
-	return json.Marshal(&struct {
-		ID int `json:"id"`
-		Alias
-	}{
-		AuthRID,
-		Alias(req),
-	})
-}
-
-func (AuthRequest) GetRID() int {
+func (AuthRequest) RID() int {
 	return AuthRID
 }
 
@@ -136,6 +125,6 @@ type AuthResponse struct {
 	IsSuccess bool
 }
 
-func (AuthResponse) GetRID() int {
+func (AuthResponse) RID() int {
 	return AuthRID
 }