Renamed variables to be more appropriate

Author: rakshith-ravi

src/models/messages.rs

@@ -24,7 +24,7 @@ pub enum BaseMessage {
 		request_id: String,
 		hook: String,
 	},
-	ListenHookResponse {
+	RegisterHookResponse {
 		request_id: String,
 	},
 	TriggerHookRequest {
@@ -55,12 +55,12 @@ impl BaseMessage {
 	pub fn get_type(&self) -> u64 {
 		match &self {
 			BaseMessage::Unknown { .. } | BaseMessage::Error { .. } => request_types::ERROR,
-			BaseMessage::RegisterModuleRequest { .. } => request_types::MODULE_REGISTRATION,
-			BaseMessage::RegisterModuleResponse { .. } => 2,
+			BaseMessage::RegisterModuleRequest { .. } => request_types::REGISTER_MODULE_REQUEST,
+			BaseMessage::RegisterModuleResponse { .. } => request_types::REGISTER_MODULE_RESPONSE,
 			BaseMessage::FunctionCallRequest { .. } => 3,
 			BaseMessage::FunctionCallResponse { .. } => 4,
 			BaseMessage::RegisterHookRequest { .. } => 5,
-			BaseMessage::ListenHookResponse { .. } => 6,
+			BaseMessage::RegisterHookResponse { .. } => 6,
 			BaseMessage::TriggerHookRequest { .. } => 7,
 			BaseMessage::TriggerHookResponse { .. } => 8,
 			BaseMessage::DeclareFunctionRequest { .. } => 9,
@@ -77,7 +77,7 @@ impl BaseMessage {
 			BaseMessage::FunctionCallRequest { request_id, .. } => request_id,
 			BaseMessage::FunctionCallResponse { request_id, .. } => request_id,
 			BaseMessage::RegisterHookRequest { request_id, .. } => request_id,
-			BaseMessage::ListenHookResponse { request_id, .. } => request_id,
+			BaseMessage::RegisterHookResponse { request_id, .. } => request_id,
 			BaseMessage::TriggerHookRequest { request_id, .. } => request_id,
 			BaseMessage::TriggerHookResponse { request_id, .. } => request_id,
 			BaseMessage::DeclareFunctionRequest { request_id, .. } => request_id,

src/protocol/json_protocol.rs

@@ -34,15 +34,15 @@ pub fn encode(protocol: &BaseProtocol, req: BaseMessage) -> Buffer {
 					dependencies,
 				} => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::MODULE_REGISTRATION,
+					request_keys::TYPE: request_types::REGISTER_MODULE_REQUEST,
 					request_keys::MODULE_ID: module_id,
 					request_keys::VERSION: version,
 					request_keys::DEPENDENCIES: dependencies,
 				}),
 
 				BaseMessage::RegisterModuleResponse { request_id } => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::MODULE_REGISTERED,
+					request_keys::TYPE: request_types::REGISTER_MODULE_RESPONSE,
 				}),
 
 				BaseMessage::FunctionCallRequest {
@@ -51,7 +51,7 @@ pub fn encode(protocol: &BaseProtocol, req: BaseMessage) -> Buffer {
 					arguments,
 				} => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::FUNCTION_CALL,
+					request_keys::TYPE: request_types::FUNCTION_CALL_REQUEST,
 					request_keys::FUNCTION: function,
 					request_keys::ARGUMENTS: generic_hashmap_to_json_map(arguments),
 				}),
@@ -60,39 +60,39 @@ pub fn encode(protocol: &BaseProtocol, req: BaseMessage) -> Buffer {
 					let json_data: Value = data.into();
 					json!({
 						request_keys::REQUEST_ID: request_id,
-						request_keys::TYPE: request_types::FUNCTION_RESPONSE,
+						request_keys::TYPE: request_types::FUNCTION_CALL_RESPONSE,
 						request_keys::DATA: json_data,
 					})
 				}
 
 				BaseMessage::RegisterHookRequest { request_id, hook } => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::REGISTER_HOOK,
+					request_keys::TYPE: request_types::REGISTER_HOOK_REQUEST,
 					request_keys::HOOK: hook,
 				}),
 
-				BaseMessage::ListenHookResponse { request_id } => json!({
+				BaseMessage::RegisterHookResponse { request_id } => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::HOOK_REGISTERED,
+					request_keys::TYPE: request_types::REGISTER_HOOK_RESPONSE,
 				}),
 
 				BaseMessage::TriggerHookRequest { request_id, hook } => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::TRIGGER_HOOK,
+					request_keys::TYPE: request_types::TRIGGER_HOOK_REQUEST,
 					request_keys::HOOK: hook,
 				}),
 
 				BaseMessage::TriggerHookResponse { request_id } => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::HOOK_TRIGGERED,
+					request_keys::TYPE: request_types::TRIGGER_HOOK_RESPONSE,
 				}),
 
 				BaseMessage::DeclareFunctionRequest {
 					request_id,
 					function,
 				} => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::DECLARE_FUNCTION,
+					request_keys::TYPE: request_types::DECLARE_FUNCTION_REQUEST,
 					request_keys::FUNCTION: function,
 				}),
 
@@ -101,7 +101,7 @@ pub fn encode(protocol: &BaseProtocol, req: BaseMessage) -> Buffer {
 					function,
 				} => json!({
 					request_keys::REQUEST_ID: request_id,
-					request_keys::TYPE: request_types::FUNCTION_DECLARED,
+					request_keys::TYPE: request_types::DECLARE_FUNCTION_RESPONSE,
 					request_keys::FUNCTION: function,
 				}),
 
@@ -202,7 +202,7 @@ fn decode_internal(data: &[u8]) -> Option<BaseMessage> {
 	} else if r#type == 6 {
 		let request_id = result[request_keys::REQUEST_ID].as_str()?.to_string();
 
-		Some(BaseMessage::ListenHookResponse { request_id })
+		Some(BaseMessage::RegisterHookResponse { request_id })
 	} else if r#type == 7 {
 		let request_id = result[request_keys::REQUEST_ID].as_str()?.to_string();
 		let hook = result[request_keys::HOOK].as_str()?.to_string();

src/utils/constants.rs

@@ -27,18 +27,18 @@ pub mod errors {
 pub mod request_types {
 	pub const ERROR: u64 = 0;
 
-	pub const MODULE_REGISTRATION: u64 = 1;
-	pub const MODULE_REGISTERED: u64 = 2;
+	pub const REGISTER_MODULE_REQUEST: u64 = 1;
+	pub const REGISTER_MODULE_RESPONSE: u64 = 2;
 
-	pub const FUNCTION_CALL: u64 = 3;
-	pub const FUNCTION_RESPONSE: u64 = 4;
+	pub const FUNCTION_CALL_REQUEST: u64 = 3;
+	pub const FUNCTION_CALL_RESPONSE: u64 = 4;
 
-	pub const REGISTER_HOOK: u64 = 5;
-	pub const HOOK_REGISTERED: u64 = 6;
+	pub const REGISTER_HOOK_REQUEST: u64 = 5;
+	pub const REGISTER_HOOK_RESPONSE: u64 = 6;
 
-	pub const TRIGGER_HOOK: u64 = 7;
-	pub const HOOK_TRIGGERED: u64 = 8;
+	pub const TRIGGER_HOOK_REQUEST: u64 = 7;
+	pub const TRIGGER_HOOK_RESPONSE: u64 = 8;
 
-	pub const DECLARE_FUNCTION: u64 = 9;
-	pub const FUNCTION_DECLARED: u64 = 10;
+	pub const DECLARE_FUNCTION_REQUEST: u64 = 9;
+	pub const DECLARE_FUNCTION_RESPONSE: u64 = 10;
 }

tests/models/messages.rs

@@ -26,7 +26,7 @@ fn check_types_are_storing_values() {
 			request_id: String::from("request_id"),
 			hook: String::from("hook"),
 		},
-		BaseMessage::ListenHookResponse {
+		BaseMessage::RegisterHookResponse {
 			request_id: String::from("request_id"),
 		},
 		BaseMessage::TriggerHookRequest {
@@ -86,7 +86,7 @@ fn check_types_are_storing_values() {
 				assert_eq!(request_id, &String::from("request_id"));
 				assert_eq!(hook, &String::from("hook"));
 			}
-			BaseMessage::ListenHookResponse { request_id } => {
+			BaseMessage::RegisterHookResponse { request_id } => {
 				assert_eq!(request_id, &String::from("request_id"));
 			}
 			BaseMessage::TriggerHookRequest { request_id, hook } => {