+ test disable-auditor/wire/drain

src/api.ml

@@ -624,44 +624,6 @@ module GlobalFees = struct
     |> finish
 end
 
-module WireSetupMessage = struct
-  type t = {
-    payto_uri: string;
-    master_sig_wire: MasterWireDetails.t;
-    master_sig_add: MasterAddWire.t;
-    validity_start: Timestamp.t;
-    bank_label: string option;
-    priority: int option;
-  }
-
-  let jsont =
-    let make payto_uri master_sig_wire master_sig_add validity_start bank_label
-        priority =
-      {
-        payto_uri;
-        master_sig_wire;
-        master_sig_add;
-        validity_start;
-        bank_label;
-        priority;
-      }
-    in
-    let payto_uri v = v.payto_uri in
-    let master_sig_wire v = v.master_sig_wire in
-    let master_sig_add v = v.master_sig_add in
-    let validity_start v = v.validity_start in
-    let bank_label v = v.bank_label in
-    let priority v = v.priority in
-    map ~kind:"WireSetupMessage" make
-    |> mem "payto_uri" Jsont.string ~enc:payto_uri
-    |> mem "master_sig_wire" MasterWireDetails.jsont ~enc:master_sig_wire
-    |> mem "master_sig_add" MasterAddWire.jsont ~enc:master_sig_add
-    |> mem "validity_start" Timestamp.jsont ~enc:validity_start
-    |> mem "bank_label" (Jsont.option Jsont.string) ~enc:bank_label
-    |> mem "priority" (Jsont.option Jsont.int) ~enc:priority
-    |> finish
-end
-
 module WireTeardownMessage = struct
   type t = {
     payto_uri: string;
@@ -685,7 +647,7 @@ end
 
 module DrainProfitsMessage = struct
   type t = {
-    wtid: B32.t;
+    wtid: Bytes32.t;
     debit_account_section: string;
     credit_payto_uri: string;
     date: Timestamp.t;
@@ -1137,6 +1099,61 @@ module AccountRestriction = struct
     |> finish
 end
 
+module WireSetupMessage = struct
+  type t = {
+    payto_uri: string;
+    master_sig_wire: MasterWireDetails.t;
+    master_sig_add: MasterAddWire.t;
+    conversion_url: string option;
+    credit_restrictions: AccountRestriction.t list;
+    debit_restrictions: AccountRestriction.t list;
+    validity_start: Timestamp.t;
+    bank_label: string option;
+    priority: int option;
+  }
+
+  let jsont =
+    let make payto_uri master_sig_wire master_sig_add conversion_url
+        credit_restrictions debit_restrictions validity_start bank_label
+        priority =
+      {
+        payto_uri;
+        master_sig_wire;
+        master_sig_add;
+        conversion_url;
+        credit_restrictions;
+        debit_restrictions;
+        validity_start;
+        bank_label;
+        priority;
+      }
+    in
+    let payto_uri v = v.payto_uri in
+    let master_sig_wire v = v.master_sig_wire in
+    let master_sig_add v = v.master_sig_add in
+    let conversion_url v = v.conversion_url in
+    let credit_restrictions v = v.credit_restrictions in
+    let debit_restrictions v = v.debit_restrictions in
+    let validity_start v = v.validity_start in
+    let bank_label v = v.bank_label in
+    let priority v = v.priority in
+    map ~kind:"WireSetupMessage" make
+    |> mem "payto_uri" Jsont.string ~enc:payto_uri
+    |> mem "master_sig_wire" MasterWireDetails.jsont ~enc:master_sig_wire
+    |> mem "master_sig_add" MasterAddWire.jsont ~enc:master_sig_add
+    |> mem "conversion_url" (Jsont.option Jsont.string) ~enc:conversion_url
+    |> mem "credit_restrictions"
+         (Jsont.list AccountRestriction.jsont)
+         ~enc:credit_restrictions
+    |> mem "debit_restrictions"
+         (Jsont.list AccountRestriction.jsont)
+         ~enc:debit_restrictions
+    |> mem "validity_start" Timestamp.jsont ~enc:validity_start
+    |> mem "bank_label" (Jsont.option Jsont.string) ~enc:bank_label
+    |> mem "priority" (Jsont.option Jsont.int) ~enc:priority
+    |> finish
+end
+
 module ExchangeWireAccount = struct
   type t = {
     payto_uri: string;