src/pg.ml

@@ -348,6 +348,50 @@ module Caqti_type = struct
           })
       Caqti_type.(t6 eddsa_pub master_sig string bool bool time)
 
+  let exchange_partner_setup =
+    let master_sig = Bin_sig.PartnerConfiguration.caqti in
+    Caqti_type.custom
+      ~encode:(fun
+          ExchangePartnerSetupRequest.
+            {
+              partner_pub;
+              start_date;
+              end_date;
+              wad_frequency;
+              wad_fee;
+              master_sig;
+              partner_base_url;
+            }
+        ->
+        Ok
+          ( partner_pub,
+            start_date,
+            end_date,
+            wad_frequency,
+            wad_fee,
+            master_sig,
+            partner_base_url ))
+      ~decode:(fun
+          ( partner_pub,
+            start_date,
+            end_date,
+            wad_frequency,
+            wad_fee,
+            master_sig,
+            partner_base_url )
+        ->
+        Ok
+          {
+            partner_base_url;
+            partner_pub;
+            wad_frequency;
+            master_sig;
+            start_date;
+            end_date;
+            wad_fee;
+          })
+      Caqti_type.(t7 eddsa_pub time time time_span amount master_sig string)
+
   include Caqti_request.Infix
 end
 
@@ -598,33 +642,12 @@ let insert_aml_officer =
 
 let insert_partner =
   let insert_partner =
-    let master_sig = Bin_sig.PartnerConfiguration.caqti in
+    Caqti_type.(exchange_partner_setup ->. unit)
-    Caqti_type.(
-      t7 eddsa_pub time time time_span amount master_sig string ->. unit)
       "INSERT INTO partners (partner_master_pub, start_date, end_date, \
        wad_frequency, wad_fee, master_sig, partner_base_url) VALUES ($1, $2, \
        $3, $4, ($5,$6), $7, $8) ON CONFLICT DO NOTHING"
   in
-  fun (module Conn : CONN)
+  fun (module Conn : CONN) v -> Conn.exec insert_partner v
-    ExchangePartnerSetupRequest.
-      {
-        partner_base_url;
-        partner_pub;
-        wad_frequency;
-        master_sig;
-        start_date;
-        end_date;
-        wad_fee;
-      }
-  ->
-    Conn.exec insert_partner
-      ( partner_pub,
-        start_date,
-        end_date,
-        wad_frequency,
-        wad_fee,
-        master_sig,
-        partner_base_url )
 
 let get_wire_accouts =
   let get_wire_accounts =