From a53f743fb91a07f23125552fcd8f6e32a1077d2b Mon Sep 17 00:00:00 2001
From: Joey Hines <joey@ahines.net>
Date: Sat, 1 Jun 2024 15:06:29 -0600
Subject: [PATCH] Merge request and command types

---
 Cargo.lock    | 2 +-
 Cargo.toml    | 2 +-
 src/cmd.proto | 5 +----
 src/lib.rs    | 8 +++-----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 242634e..b6045b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,7 +295,7 @@ dependencies = [
 
 [[package]]
 name = "raas_types"
-version = "0.0.4"
+version = "0.0.5"
 dependencies = [
  "bytes",
  "prost",
diff --git a/Cargo.toml b/Cargo.toml
index d4e0468..81318b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "raas_types"
-version = "0.0.4"
+version = "0.0.5"
 edition = "2021"
 description = "Protobuf definitions for RaaS"
 authors = ["Joey Hines joey@ahines.net"]
diff --git a/src/cmd.proto b/src/cmd.proto
index b9ed511..b65154c 100644
--- a/src/cmd.proto
+++ b/src/cmd.proto
@@ -6,10 +6,7 @@ package raas.cmd;
 
 message Command {
   uint32 id = 1;
-  uint64 timestamp = 2;
-  oneof cmd {
-    raas.bot.roll.RollCmd roll_cmd = 3;
-  }
+  Request request = 2;
 }
 
 message Request {
diff --git a/src/lib.rs b/src/lib.rs
index 750b4a3..6b56655 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -126,18 +126,16 @@ mod test {
     use tokio::io::BufReader;
 
     #[test]
-    fn create_cmd() {
-        let cmd = raas::cmd::Command {
-            id: 0,
+    fn create_request() {
+        let cmd = raas::cmd::Request {
             timestamp: 0,
-            cmd: Some(raas::cmd::command::Cmd::RollCmd(raas::bot::roll::RollCmd {
+            cmd: Some(raas::cmd::request::Cmd::RollCmd(raas::bot::roll::RollCmd {
                 cmd: Some(raas::bot::roll::roll_cmd::Cmd::Roll(
                     raas::bot::roll::Roll { rotations: 1 },
                 )),
             })),
         };
 
-        assert_eq!(cmd.id, 0);
         assert_eq!(cmd.timestamp, 0);
         assert!(cmd.cmd.is_some());
     }