finishing style migration, and deleting unused code.demo-2019-12-03-01

1 files changed, 11 insertions, 23 deletions

diff --git a/talerbank/app/schemas.py b/talerbank/app/schemas.py
index 6b529b3..26bda90 100644
--- a/talerbank/app/schemas.py
+++ b/talerbank/app/schemas.py
@@ -267,28 +267,16 @@ class WithdrawHeadless(BankValidator):
         reserve_pub = forms.CharField(required=True)
         exchange_wire_details = PaytoField(required=False)
 
-class WithdrawHeadlessUri(forms.Form):
-    amount = forms.CharField(
-        validators=[
-            RegexValidator(
-                AMOUNT_REGEX, message="Format CURRENCY:X[.Y] not respected"
-            )
-        ]
-    )
+class WithdrawHeadlessUri(BankValidator):
 
+    def __init__(self, data):
+        super(WithdrawHeadlessUri, self).__init__(self.InnerValidator, data)
 
-class SenderWireDetails(forms.Form):
-    # FIXME: must be changed to 'payto' format.
-    type = forms.CharField()
-    bank_url = forms.URLField()
-    account_number = forms.IntegerField(min_value=1)
-
-
-class SenderWireDetailsField(forms.Field):
-    def to_python(self, value):
-        return value
-
-    def validate(self, value):
-        swd = SenderWireDetails(value)
-        if not swd.is_valid():
-            raise ValidationError(json.dumps(swd.errors.as_json()))
+    class InnerValidator(forms.Form):
+        amount = forms.CharField(
+            validators=[
+                RegexValidator(
+                    AMOUNT_REGEX, message="Format CURRENCY:X[.Y] not respected"
+                )
+            ]
+        )