remove *_attempt

4 files changed, 4 insertions, 58 deletions

diff --git a/talerbank/app/captcha.py b/talerbank/app/captcha.py
index b68c1cf..09bb68b 100644
--- a/talerbank/app/captcha.py
+++ b/talerbank/app/captcha.py
@@ -36,7 +36,7 @@ class Pin(forms.Form):
 
 
 @is_logged
-def pin_tan_question_attempt(request):
+def pin_tan_question(request):
     if request.method != 'GET':
         raise errors.WrongMethod('GET')
     for param in ["amount_value",
@@ -73,38 +73,7 @@ def pin_tan_question_attempt(request):
 
 
 @is_logged
-def pin_tan_question(request):
-    try:
-        return pin_tan_question_attempt(request)
-    except errors.MissingGetParameter as e:
-        return JsonResponse({'reason': e.par + " missing in query parameters"}, status=400)
-    except (errors.BadAmount, errors.BadGetParameter):
-        return JsonResponse({'reason': "bad amount given"}, status=400)
-    except errors.WrongMethod as e:
-        return JsonResponse({'reason': 'only GET method allowed'}, status=405)
-    except errors.BadWireDetails:
-        return JsonResponse({'reason': "bad wiredetails given"}, status=400)
-    except ValueError:
-        return JsonResponse({'reason': "garbage in query string"}, status=400)
-    except errors.NoWireMethodMatch:
-        return JsonResponse({'reason': "incompatible wire methods"}, status=400)
-    except errors.NoBankMatch:
-        return JsonResponse({'reason': "bank given in wiredetails is not this one"}, status=400)
-        
-
-@is_logged
 def pin_tan_verify(request):
-    try:
-        return pin_tan_verify_attempt(request)
-    except errors.WrongMethod as e:
-        return errors.wrong_method_handler(request, e)
-    except errors.UserNotLogged:
-        return errors.user_not_logged_handler(request)
-    except errors.BadPostValue:
-        return errors.bad_post_value_handler(request)
-
-
-def pin_tan_verify_attempt(request):
     if request.method != 'POST':
         raise errors.WrongMethod("POST")
     try:
diff --git a/talerbank/app/funds_mgmt.py b/talerbank/app/funds_mgmt.py
index 2bf33b4..f50bc09 100644
--- a/talerbank/app/funds_mgmt.py
+++ b/talerbank/app/funds_mgmt.py
@@ -49,29 +49,6 @@ class Reserve:
 # Those tokens are normally hidden fields in Django-generated HTML forms.
 
 @csrf_exempt
-def add_incoming_attempt(request):
-    try:
-        return add_incoming(request)
-    except ValueError:
-        return JsonResponse({'reason': 'malformed json'}, status=400)
-    except WrongMethod:
-        return HttpResponse("Only POST allowed, and not from browsers", status=405)
-    except BadIncomingRequest:
-        return JsonResponse({'reason': 'malformed json, validation failed'}, status=400)
-    except TypeError:
-        return JsonResponse({'reason': 'mispelled fieldname in JSON or unknown data sent..'}, status=400)
-    except BankAccount.DoesNotExist:
-        return JsonResponse({'reason': 'credit or debit account does not exist'}, status=404)
-    except BankAccount.MultipleObjectsReturned:
-        return JsonResponse({'reason': 'internal error (collision in db)'}, status=500)
-    except OperationalError:
-        return JsonResponse({'reason': 'internal error (bank has no db)'}, status=500)
-    except CurrencyMismatch:
-        return JsonResponse({'reason': 'currency mismatch between credit/debit account and amount'},
-                            status=500)
-
-
-@csrf_exempt
 def add_incoming(request):
     if request.method != 'POST':
         raise WrongMethod('GET')
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index c0b8587..f616c9e 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -29,7 +29,7 @@ urlpatterns = [
     url(r'^public-accounts$', views.public_accounts_process),
     url(r'^pin/question$', views.pin_tan_question),
     url(r'^pin/verify$', views.pin_tan_verify),
-    url(r'^admin/add/incoming$', views.add_incoming_attempt),
+    url(r'^admin/add/incoming$', views.add_incoming),
     url(r'^profile$', views.profile_process),
     url(r'^history$', views.history_process)
     ]
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index a1b7754..4668d82 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -15,8 +15,8 @@
 #  @author Marcello Stanisci
 
 from .user_mgmt import register_process, login_process, view_public_accno_process, logout_process
-from .captcha import pin_tan_question_attempt, pin_tan_question, pin_tan_verify
-from .funds_mgmt import withdraw_process, add_incoming_attempt
+from .captcha import pin_tan_question, pin_tan_verify
+from .funds_mgmt import withdraw_process
 from .history import history_process, public_accounts_process
 from .util import home_page, profile_process
 from django.http import HttpResponse