Merge pull request #86 from amazingdatamachine/avichalp/object-head

Replace Proxy with Object API

Cargo.toml

@@ -168,7 +168,11 @@ tokio-tungstenite = { version = "0.18.0", features = ["native-tls"] }
 toml = "0.8"
 tower-http = { version = "0.4.0", features = ["cors"] }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "registry"] }
+tracing-subscriber = { version = "0.3", features = [
+    "env-filter",
+    "json",
+    "registry",
+] }
 tracing-appender = "0.2.3"
 url = { version = "2.4.1", features = ["serde"] }
 zeroize = "1.6"

fendermint/app/config/default.toml

@@ -150,10 +150,10 @@ allowed_methods = []
 # Suggested headers if allowing origins: "Accept", "Authorization", "Content-Type", "Origin"
 allowed_headers = []
 
-# Proxy API facade
-[proxy]
+# Object API facade
+[objects]
 
-[proxy.listen]
+[objects.listen]
 # Only accept local connections by default.
 host = "127.0.0.1"
 port = 8001

fendermint/app/options/src/lib.rs

@@ -12,7 +12,7 @@ use tracing_subscriber::EnvFilter;
 
 use self::{
     eth::EthArgs, genesis::GenesisArgs, key::KeyArgs, materializer::MaterializerArgs,
-    proxy::ProxyArgs, rpc::RpcArgs, run::RunArgs,
+    objects::ObjectsArgs, rpc::RpcArgs, run::RunArgs,
 };
 
 pub mod config;
@@ -21,7 +21,7 @@ pub mod eth;
 pub mod genesis;
 pub mod key;
 pub mod materializer;
-pub mod proxy;
+pub mod objects;
 pub mod rpc;
 pub mod run;
 
@@ -199,8 +199,8 @@ pub enum Commands {
     /// Subcommands related to the Testnet Materializer.
     #[clap(aliases  = &["mat", "matr", "mate"])]
     Materializer(MaterializerArgs),
-    /// Proxy for data repos
-    Proxy(ProxyArgs),
+    /// Object API for data repos
+    Objects(ObjectsArgs),
 }
 
 #[cfg(test)]

fendermint/app/options/src/proxy.rs → fendermint/app/options/src/objects.rs

@@ -6,13 +6,13 @@ use clap::{Args, Subcommand};
 use tendermint_rpc::Url;
 
 #[derive(Args, Debug)]
-pub struct ProxyArgs {
+pub struct ObjectsArgs {
     #[command(subcommand)]
-    pub command: ProxyCommands,
+    pub command: ObjectsCommands,
 }
 
 #[derive(Subcommand, Debug, Clone)]
-pub enum ProxyCommands {
+pub enum ObjectsCommands {
     Run {
         /// The URL of the Tendermint node's RPC endpoint.
         #[arg(

fendermint/app/settings/src/lib.rs

@@ -21,13 +21,13 @@ use fendermint_vm_topdown::BlockHeight;
 
 use self::eth::EthSettings;
 use self::fvm::FvmSettings;
-use self::proxy::ProxySettings;
+use self::objects::ObjectsSettings;
 use self::resolver::ResolverSettings;
 use ipc_provider::config::deserialize::deserialize_eth_address_from_str;
 
 pub mod eth;
 pub mod fvm;
-pub mod proxy;
+pub mod objects;
 pub mod resolver;
 pub mod testing;
 pub mod utils;
@@ -288,7 +288,7 @@ pub struct Settings {
     pub broadcast: BroadcastSettings,
     pub ipc: IpcSettings,
     pub testing: Option<TestingSettings>,
-    pub proxy: ProxySettings,
+    pub objects: ObjectsSettings,
 }
 
 impl Settings {

fendermint/app/settings/src/proxy.rs → fendermint/app/settings/src/objects.rs

@@ -7,9 +7,9 @@ use serde_with::serde_as;
 
 use crate::SocketAddress;
 
-/// Proxy API facade settings.
+/// Object API facade settings.
 #[serde_as]
 #[derive(Debug, Deserialize, Clone)]
-pub struct ProxySettings {
+pub struct ObjectsSettings {
     pub listen: SocketAddress,
 }

fendermint/app/src/cmd/mod.rs

@@ -16,7 +16,7 @@ pub mod eth;
 pub mod genesis;
 pub mod key;
 pub mod materializer;
-pub mod proxy;
+pub mod objects;
 pub mod rpc;
 pub mod run;
 
@@ -71,7 +71,7 @@ pub async fn exec(opts: &Options) -> anyhow::Result<()> {
         Commands::Rpc(args) => args.exec(()).await,
         Commands::Eth(args) => args.exec(settings(opts)?.eth).await,
         Commands::Materializer(args) => args.exec(()).await,
-        Commands::Proxy(args) => args.exec(settings(opts)?.proxy).await,
+        Commands::Objects(args) => args.exec(settings(opts)?.objects).await,
     }
 }