Merge pull request #17 from alpenlabs/feature/new-model-rpcs

refactor: remove irrelevant RPCs

Author: delbonis

crates/rpc/api/src/traits.rs

@@ -35,69 +35,19 @@ pub trait MosaicRpc {
     // ==== Protocol flow.
 
     /// Creates an instance of a tableset game.
-    #[method(name = "mosaic_createTablesetGame")]
-    fn create_tableset_instance(&self, config: RpcTablesetConfig) -> RpcResult<TablesetId>;
+    #[method(name = "mosaic_createGame")]
+    fn create_game_instance(&self, config: RpcGameInstanceConfig) -> RpcResult<TablesetId>;
 
     /// Gets current info about about a game.
     #[method(name = "mosaic_getGameInfo")]
     fn get_game_info(&self, tsid: TablesetId) -> RpcResult<GameInfo>;
 
-    /// Starts generating the garbler side's commitments.
-    #[method(name = "mosaic_startGenGarbCommitments")]
-    fn start_generate_game_tableset(&self, tsid: TablesetId) -> RpcResult<JobId>;
-
-    /// Gets the garbler commitments to send to the verifier.
-    #[method(name = "mosaic_getGarbCommitments")]
-    fn get_garb_commitments(&self, tsid: TablesetId) -> RpcResult<TablesetCommitments>;
-
-    /// Provides the tableset commitments from the garbler.  Returns the table
-    /// ID's we're choosing to open.
-    #[method(name = "mosaic_provideGarbTablesetCommitments")]
-    fn provide_garb_commitments(
-        &self,
-        tsid: TablesetId,
-        commitments: TablesetCommitments,
-    ) -> RpcResult<CacChoices>;
-
-    /// Provides the CaC choices from the evaluator.
-    #[method(name = "mosaic_provideEvalCacChoices")]
-    fn provide_eval_cac_choices(&self, tsid: TablesetId, choices: CacChoices) -> RpcResult<()>;
-
-    /// Gets the tableset seeds for each table according to the previously-
-    /// provided CaC choices.
-    #[method(name = "mosaic_getCacSeeds")]
-    fn get_cac_seeds(&self, tsid: TablesetId) -> RpcResult<CacSeeds>;
-
-    /// Provides the evaluator with the garbler's seeds for each table that we
-    /// can verify.
-    #[method(name = "mosaic_startVerifyGarbCacSeeds")]
-    fn start_verify_garb_cac_seeds(&self, tsid: TablesetId, seeds: CacSeeds) -> RpcResult<JobId>;
-
-    /// Checks if the we've successfully verified the seeds for the tables we
-    /// opened from the garbler.  This means the other tables in the tableset
-    /// are probably okay.
-    #[method(name = "mosaic_checkVerifyGarbCacSeeds")]
-    fn check_verify_cac_commitments(&self, tsid: TablesetId) -> RpcResult<bool>;
-
-    /// Starts exporting the unopened tables so that we can provide them to the
-    /// evaluator.
-    #[method(name = "mosaic_startExportUnopenedTables")]
-    fn start_export_unopened_tables(&self, tsid: TablesetId) -> RpcResult<JobId>;
-
     /// Gets the data for exchanging exported tables.
     #[method(name = "mosaic_getTableExportData")]
     fn get_export_data(&self, tsid: TablesetId) -> RpcResult<TableExportMeta>;
 
     // TODO more methods for dealing with exports here?
 
-    /// Starts downloading exported tables from the provided metadata.
-    #[method(name = "mosaic_startDownloadTableExport")]
-    fn start_download_table_export(
-        &self,
-        tsid: TablesetId,
-        export_meta: TableExportMeta,
-    ) -> RpcResult<JobId>;
-
     /// Starts evaluating the tables in the set using the provided inputs.
     #[method(name = "mosaic_startEvalTableset")]
     fn start_eval_tableset(&self, tsid: TablesetId, inputs: TableEvalInputs) -> RpcResult<JobId>;
@@ -106,4 +56,8 @@ pub trait MosaicRpc {
     /// provided inputs.
     #[method(name = "mosaic_getEvalOutputs")]
     fn get_eval_outputs(&self, tsid: TablesetId) -> RpcResult<TableEvalOutputs>;
+
+    /// Cleans up a completed game, regardless of its state.
+    #[method(name = "mosaic_cleanupGame")]
+    fn cleanup_game(&self, tsid: TablesetId) -> RpcResult<()>;
 }

crates/rpc/server/src/server.rs

@@ -34,67 +34,27 @@ impl<P: RpcContextProvider> MosaicRpcServer for RpcServerImpl<P> {
         todo!()
     }
 
-    fn create_tableset_instance(&self, config: RpcTablesetConfig) -> RpcResult<TablesetId> {
+    fn create_game_instance(&self, config: RpcGameInstanceConfig) -> RpcResult<TablesetId> {
         todo!()
     }
 
     fn get_game_info(&self, tsid: TablesetId) -> RpcResult<GameInfo> {
         todo!()
     }
 
-    fn start_generate_game_tableset(&self, tsid: TablesetId) -> RpcResult<JobId> {
-        todo!()
-    }
-
-    fn get_garb_commitments(&self, tsid: TablesetId) -> RpcResult<TablesetCommitments> {
-        todo!()
-    }
-
-    fn provide_garb_commitments(
-        &self,
-        tsid: TablesetId,
-        commitments: TablesetCommitments,
-    ) -> RpcResult<CacChoices> {
-        todo!()
-    }
-
-    fn provide_eval_cac_choices(&self, tsid: TablesetId, choices: CacChoices) -> RpcResult<()> {
-        todo!()
-    }
-
-    fn get_cac_seeds(&self, tsid: TablesetId) -> RpcResult<CacSeeds> {
-        todo!()
-    }
-
-    fn start_verify_garb_cac_seeds(&self, tsid: TablesetId, seeds: CacSeeds) -> RpcResult<JobId> {
-        todo!()
-    }
-
-    fn check_verify_cac_commitments(&self, tsid: TablesetId) -> RpcResult<bool> {
-        todo!()
-    }
-
-    fn start_export_unopened_tables(&self, tsid: TablesetId) -> RpcResult<JobId> {
-        todo!()
-    }
-
     fn get_export_data(&self, tsid: TablesetId) -> RpcResult<TableExportMeta> {
         todo!()
     }
 
-    fn start_download_table_export(
-        &self,
-        tsid: TablesetId,
-        export_meta: TableExportMeta,
-    ) -> RpcResult<JobId> {
+    fn start_eval_tableset(&self, tsid: TablesetId, inputs: TableEvalInputs) -> RpcResult<JobId> {
         todo!()
     }
 
-    fn start_eval_tableset(&self, tsid: TablesetId, inputs: TableEvalInputs) -> RpcResult<JobId> {
+    fn get_eval_outputs(&self, tsid: TablesetId) -> RpcResult<TableEvalOutputs> {
         todo!()
     }
 
-    fn get_eval_outputs(&self, tsid: TablesetId) -> RpcResult<TableEvalOutputs> {
+    fn cleanup_game(&self, tsid: TablesetId) -> RpcResult<()> {
         todo!()
     }
 }

crates/rpc/types/src/tableset.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 /// Configuration provided as part of setting up a game instance.
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct RpcTablesetConfig {
+pub struct RpcGameInstanceConfig {
     /// The name of the circuit we'll use.
     ///
     /// This matches the client configuration for where to find this circuit information.
@@ -14,4 +14,14 @@ pub struct RpcTablesetConfig {
 
     /// CaC game configuration.
     cac_config: CacConfig,
+
+    /// Peer connection information.
+    peer_info: GamePeerInfo,
+}
+
+/// Describes information about the peer we're interacting with so we can
+/// connect to them and authenticate messages.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct GamePeerInfo {
+    // TODO
 }