From 1d5064ccccbc44ae508e81100a1e0240dd8b6932 Mon Sep 17 00:00:00 2001
From: Nasr <larko236@outlook.com>
Date: Fri, 18 Oct 2024 10:06:16 -0400
Subject: [PATCH] grpc client

---
 crates/torii/client/src/client/mod.rs | 4 ++--
 crates/torii/grpc/src/client.rs       | 8 +++-----
 crates/torii/grpc/src/server/mod.rs   | 3 +--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/crates/torii/client/src/client/mod.rs b/crates/torii/client/src/client/mod.rs
index cff1cabda7..9f47b613f2 100644
--- a/crates/torii/client/src/client/mod.rs
+++ b/crates/torii/client/src/client/mod.rs
@@ -13,7 +13,7 @@ use tokio::sync::RwLock as AsyncRwLock;
 use torii_grpc::client::{EntityUpdateStreaming, EventUpdateStreaming, IndexerUpdateStreaming};
 use torii_grpc::proto::world::{RetrieveEntitiesResponse, RetrieveEventsResponse};
 use torii_grpc::types::schema::Entity;
-use torii_grpc::types::{EntityKeysClause, Event, EventQuery, KeysClause, Query};
+use torii_grpc::types::{EntityKeysClause, Event, EventQuery, Query};
 use torii_relay::client::EventLoop;
 use torii_relay::types::Message;
 
@@ -159,7 +159,7 @@ impl Client {
     /// A direct stream to grpc subscribe starknet events
     pub async fn on_starknet_event(
         &self,
-        keys: Option<KeysClause>,
+        keys: Vec<EntityKeysClause>,
     ) -> Result<EventUpdateStreaming, Error> {
         let mut grpc_client = self.inner.write().await;
         let stream = grpc_client.subscribe_events(keys).await?;
diff --git a/crates/torii/grpc/src/client.rs b/crates/torii/grpc/src/client.rs
index d94eb2fa7a..b3ff84737c 100644
--- a/crates/torii/grpc/src/client.rs
+++ b/crates/torii/grpc/src/client.rs
@@ -15,9 +15,7 @@ use crate::proto::world::{
     UpdateEntitiesSubscriptionRequest, WorldMetadataRequest,
 };
 use crate::types::schema::{Entity, SchemaError};
-use crate::types::{
-    EntityKeysClause, Event, EventQuery, IndexerUpdate, KeysClause, ModelKeysClause, Query,
-};
+use crate::types::{EntityKeysClause, Event, EventQuery, IndexerUpdate, ModelKeysClause, Query};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
@@ -206,9 +204,9 @@ impl WorldClient {
     /// Subscribe to the events of a World.
     pub async fn subscribe_events(
         &mut self,
-        keys: Option<KeysClause>,
+        keys: Vec<EntityKeysClause>,
     ) -> Result<EventUpdateStreaming, Error> {
-        let keys = keys.map(|c| c.into());
+        let keys = keys.into_iter().map(|c| c.into()).collect();
 
         let stream = self
             .inner
diff --git a/crates/torii/grpc/src/server/mod.rs b/crates/torii/grpc/src/server/mod.rs
index bb22375ff6..9d4e3bbd01 100644
--- a/crates/torii/grpc/src/server/mod.rs
+++ b/crates/torii/grpc/src/server/mod.rs
@@ -1190,8 +1190,7 @@ impl proto::world::world_server::World for DojoWorld {
         &self,
         request: Request<proto::world::SubscribeEventsRequest>,
     ) -> ServiceResult<Self::SubscribeEventsStream> {
-        let keys = request.into_inner().keys.unwrap_or_default();
-
+        let keys = request.into_inner().keys;
         let rx = self.subscribe_events(keys).await.map_err(|e| Status::internal(e.to_string()))?;
 
         Ok(Response::new(Box::pin(ReceiverStream::new(rx)) as Self::SubscribeEventsStream))