From e387ab88a9b46dca1ffd207ddb26ed6359ec4aac Mon Sep 17 00:00:00 2001 From: swrup Date: Wed, 18 Feb 2026 18:16:31 +0100 Subject: [PATCH] + rename --- src/devices.ml | 4 +-- src/http_information.ml | 4 +-- src/http_management.ml | 64 ++++++++++++++++++++--------------------- src/mte.ml | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/devices.ml b/src/devices.ml index c37d5f76..1d3c702b 100644 --- a/src/devices.ml +++ b/src/devices.ml @@ -18,9 +18,9 @@ let db_connection : (env, Caqti_miou.connection) Vif.Device.device = Logs.info (fun m -> m "database connection initialized"); conn) -let secmod = +let keys = let finally _key = () in - Vif.Device.v ~name:"secmod" ~finally [ Vif.Device.value db_connection ] + Vif.Device.v ~name:"keys" ~finally [ Vif.Device.value db_connection ] @@ fun (module Conn : Pg.CONN) (_env : env) -> let sm : (module Keys.S) = (module Keys.Make (Conn)) in sm diff --git a/src/http_information.ml b/src/http_information.ml index 8d480d3a..6c4068d9 100644 --- a/src/http_information.ml +++ b/src/http_information.ml @@ -235,7 +235,7 @@ let jsont = ExchangeKeysResponse.jsont let keys req server _env = Logs.info (fun m -> m "GET /keys"); let db_conn = Vif.Server.device Devices.db_connection server in - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* last_issue_date = match Vif.Queries.get req "last_issue_date" with @@ -247,7 +247,7 @@ let keys req server _env = "invalid `?last_issue_date` query param, int_of_string failure" | Some n -> Ok (Some (Time.Timestamp.of_s (Int64.of_int n)))) in - let* v = mk_keys ~db_conn sm ~last_issue_date in + let* v = mk_keys ~db_conn keys ~last_issue_date in let s = Api.encode_exn jsont v in Ok s in diff --git a/src/http_management.ml b/src/http_management.ml index 54ea2557..be19ac91 100644 --- a/src/http_management.ml +++ b/src/http_management.ml @@ -22,9 +22,9 @@ module Keys_get = struct let f req server _env = Logs.info (fun m -> m "GET /management/keys/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = - let v = mk_future_keys_response sm in + let v = mk_future_keys_response keys in let s = Api.encode_exn jsont v in Ok s in @@ -76,9 +76,9 @@ module Keys_post = struct in verify_f ~f:Keys.verify_with_master_key master_sig r - let verify sm MasterSignatures.{ denom_sigs; signkey_sigs } = - let* () = list_iter (verify_denom_signature sm) denom_sigs in - let* () = list_iter (verify_signkey_signature sm) signkey_sigs in + let verify keys MasterSignatures.{ denom_sigs; signkey_sigs } = + let* () = list_iter (verify_denom_signature keys) denom_sigs in + let* () = list_iter (verify_signkey_signature keys) signkey_sigs in Ok () let do_ ~db_conn:_ (module Keys : Keys.S) @@ -103,11 +103,11 @@ module Keys_post = struct let f req server _env = Logs.info (fun m -> m "POST /management/keys/"); let db_conn = Vif.Server.device Devices.db_connection server in - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in - let* () = do_ ~db_conn sm v in + let* () = verify keys v in + let* () = do_ ~db_conn keys v in Ok "" in Respond.result res req @@ -128,12 +128,12 @@ module Denom_revoke = struct let f req h_denom_pub server _env = Logs.info (fun m -> m "POST /management/denominations/$H_DENOM_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* h_denom_pub = DenominationHash.of_b32 h_denom_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm h_denom_pub v in - let* () = do_ sm h_denom_pub v in + let* () = verify keys h_denom_pub v in + let* () = do_ keys h_denom_pub v in Ok "" in Respond.result res req @@ -154,12 +154,12 @@ module Signkey_revoke = struct let f req exchange_pub server _env = Logs.info (fun m -> m "POST /management/signkeys/$EXCHANGE_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let res = let* exchange_pub = Crypto.EddsaPublicKey.of_b32 exchange_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm exchange_pub v in - let* () = do_ sm exchange_pub v in + let* () = verify keys exchange_pub v in + let* () = do_ keys exchange_pub v in Ok "" in Respond.result res req @@ -208,11 +208,11 @@ module Auditors = struct let f req server _env = Logs.info (fun m -> m "POST /management/auditors/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -248,12 +248,12 @@ module Auditors_disable = struct let f req auditor_pub server _env = Logs.info (fun m -> m "POST /management/auditors/$AUDITOR_PUB/revoke/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* auditor_pub = Crypto.EddsaPublicKey.of_b32 auditor_pub in let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm auditor_pub v in + let* () = verify keys auditor_pub v in let* () = do_ ~db_conn auditor_pub v in Ok "" in @@ -308,11 +308,11 @@ module Wire_fee = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire-fee/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -379,11 +379,11 @@ module Global_fees = struct and once set for a timeframe, it should not change. *) let f req server _env = Logs.info (fun m -> m "POST /management/global-fees/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -458,11 +458,11 @@ module Wire = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -493,11 +493,11 @@ module Wire_disable = struct let f req server _env = Logs.info (fun m -> m "POST /management/wire/disable/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -533,11 +533,11 @@ module Drain = struct let f req server _env = Logs.info (fun m -> m "POST /management/drain/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -573,11 +573,11 @@ module AmlOfficer = struct let f req server _env = Logs.info (fun m -> m "POST /management/aml-officers/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in @@ -615,11 +615,11 @@ module Partners = struct let f req server _env = Logs.info (fun m -> m "POST /management/partners/"); - let sm = Vif.Server.device Devices.secmod server in + let keys = Vif.Server.device Devices.keys server in let db_conn = Vif.Server.device Devices.db_connection server in let res = let* v = Vif.Request.of_json req |> unwrap_err_msg in - let* () = verify sm v in + let* () = verify keys v in let* () = do_ ~db_conn v in Ok "" in diff --git a/src/mte.ml b/src/mte.ml index 5dcf79a3..77f07de8 100644 --- a/src/mte.ml +++ b/src/mte.ml @@ -76,7 +76,7 @@ let () = let env : Devices.env = { caqti_switch; db_uri= Config.Exchangedb_postgres.config } in - let devices = Vif.Devices.[ Devices.db_connection; Devices.secmod ] in + let devices = Vif.Devices.[ Devices.db_connection; Devices.keys ] in let middlewares = Vif.Middlewares.[] in Logs.info (fun m -> m ~tags:(Util.Log_reporter.detail "...") "Starting MTE server");