Updates

Author: sanket1729

src/client/src/bin/http_server.rs

@@ -11,7 +11,7 @@ use options_rpc::data_structures::{
 async fn info(item: web::Json<ContractId>, args: Data<ClientArgs>) -> HttpResponse {
     let db = args.read_options_db();
     let e_cli = args.elements_cli();
-    let contract = db.get(&item.id).unwrap();
+    let contract = db.get(&item.contract_id).unwrap();
     let info = InfoResponse::from_contract(&contract, &e_cli);
     HttpResponse::Ok().json(info) // <- send response
 }
@@ -109,6 +109,7 @@ async fn main() -> std::io::Result<()> {
             .service(web::resource("/init").route(web::post().to(init)))
             .service(web::resource("/fund").route(web::post().to(fund)))
             .service(web::resource("/cancel").route(web::post().to(cancel)))
+            .service(web::resource("/expire").route(web::post().to(expiry)))
             .service(web::resource("/expiry").route(web::post().to(expiry)))
             .service(web::resource("/exercise").route(web::post().to(exercise)))
             .service(web::resource("/settle").route(web::post().to(settle)))

src/client/src/data_structures.rs

@@ -19,7 +19,7 @@ use crate::utils;
 #[derive(Args, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct ContractId {
     /// Contract Id
-    pub id: sha256::Hash,
+    pub contract_id: sha256::Hash,
 }
 
 #[derive(Debug, Clone, Args, Serialize, Deserialize)]
@@ -72,7 +72,7 @@ pub struct QueryResponse {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct InfoResponse {
-    pub id: sha256::Hash,
+    pub contract_id: sha256::Hash,
     pub coll_asset: AssetId,
     pub settle_asset: AssetId,
     pub contract_size: u64,
@@ -87,7 +87,7 @@ pub struct InfoResponse {
 impl InfoResponse {
     pub fn from_contract(contract: &OptionsContract, e_cli: &Client) -> Self {
         InfoResponse {
-            id: contract.id(),
+            contract_id: contract.id(),
             coll_asset: contract.params().coll_asset,
             settle_asset: contract.params().settle_asset,
             contract_size: contract.params().contract_size,