-remove currency-based provider selection

5 files changed, 19 insertions, 70 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index fdd16d2..75bce03 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -64,7 +64,6 @@ pkgdata_DATA = \
   redux.sk.json \
   redux.us.json \
   redux.xx.json \
-  redux.xy.json \
   redux.countries.json \
   provider-list.json
 
diff --git a/contrib/provider-list.json b/contrib/provider-list.json
index 78b020d..b5ae514 100644
--- a/contrib/provider-list.json
+++ b/contrib/provider-list.json
@@ -3,28 +3,26 @@
     "SPDX-License-Identifier": "GPL3.0-or-later",
     "anastasis_provider": [
         {
-            "url" : "https://anastasis.demo.taler.net/",
-            "currency" : "KUDOS"
+            "url" : "https://v1.anastasis.taler.net/"
         },
         {
-            "url" : "https://kudos.demo.anastasis.lu/",
-            "currency" : "KUDOS"
+            "url" : "https://v1.anastasis.lu/"
         },
 	{
             "url" : "http://localhost:8086/",
-            "currency" : "TESTKUDOS"
+            "restricted" : "xx"
 	},
 	{
             "url" : "http://localhost:8087/",
-            "currency" : "TESTKUDOS"
+            "restricted" : "xx"
 	},
 	{
             "url" : "http://localhost:8088/",
-            "currency" : "TESTKUDOS"
+            "restricted" : "xx"
 	},
 	{
             "url" : "http://localhost:8089/",
-            "currency" : "TESTKUDOS"
+            "restricted" : "xx"
 	}
     ]
 }
diff --git a/contrib/redux.countries.json b/contrib/redux.countries.json
index 61dec37..0d824fc 100644
--- a/contrib/redux.countries.json
+++ b/contrib/redux.countries.json
@@ -10,7 +10,6 @@
 		        "de_DE": "Albanien",
 		        "en_UK": "Albania"
 		},
-	        "currency": "ALL",
 	        "call_code" : "+355"
 	},
 	{
@@ -21,7 +20,6 @@
 		        "de_DE": "Belgien",
 		        "en_UK": "Belgium"
 		},
-	        "currency": "EUR",
 	        "call_code" : "+32"
 	},
 	{
@@ -34,7 +32,6 @@
 			"fr_FR": "Suisse",
 			"en_UK": "Swiss"
 		},
-	        "currency": "CHF",
 	        "call_code" : "+41"
 	},
 	{
@@ -44,7 +41,6 @@
 		"name_i18n" : {
 		        "en_UK": "Czech Republic"
 		},
-	        "currency": "CZK",
 	        "call_code" : "+420"
 	},
 	{
@@ -58,7 +54,6 @@
 		        "fr_FR": "Allemagne",
 		        "en_UK": "Germany"
                 },
-	        "currency": "EUR",
 	        "call_code" : "+49"
 	},
 	{
@@ -69,7 +64,6 @@
 	        "name_i18n" : {
 		        "en_UK": "Denmark"
                 },
-	        "currency": "DKK",
 	        "call_code" : "+45"
 	},
 	{
@@ -80,7 +74,6 @@
 	        "name_i18n" : {
 		        "es_ES": "España"
                 },
-	        "currency": "EUR",
 	        "call_code" : "+44"
 	},
 	{
@@ -91,7 +84,6 @@
 		        "de_DE": "Frankreich",
 		        "fr_FR": "La France"
 		},
-	        "currency": "EUR",
 	        "call_code" : "+33"
 	},
 	{
@@ -105,7 +97,6 @@
 		        "fr_FR": "l'Inde",
 		        "en_UK": "India"
                 },
-	        "currency": "INR",
 	        "call_code" : "+91"
 	},
 	{
@@ -116,7 +107,6 @@
 		        "de_DE": "Italien",
 		        "en_UK": "Italy"
 		},
-	        "currency": "EUR",
 	        "call_code" : "+39"
 	},
 	{
@@ -129,7 +119,6 @@
 			"de_CH": "Japan",
 		        "en_UK": "Japan"
                 },
-	        "currency": "JPY",
 	    	"call_code" : "+81"
 	},
 	{
@@ -141,7 +130,6 @@
                         "nl_NL": "Nederland",
 		        "en_UK": "Netherlands"
 		},
-	        "currency": "EUR",
 	        "call_code" : "+31"
 	},
 	{
@@ -151,7 +139,6 @@
 		"name_i18n" : {
 		        "en_UK": "Slovakia"
 		},
-	        "currency": "EUR",
 	        "call_code" : "+421"
 	},
 	{
@@ -165,36 +152,19 @@
 			"fr_FR": "États-Unis d'Amérique (USA)",
 		        "en_UK": "United States of America (USA)"
                 },
-	        "currency": "USD",
 	        "call_code" : "+1"
 	},
 	{
 		"code" : "xx",
 		"name" : "Testland",
-		"continent" : "Testcontinent",
-		"continent_i18n" : { "de_DE" : "Testkontinent" },
+		"continent" : "Demoworld",
  	        "name_i18n" : {
                         "de_DE": "Testlandt",
 			"de_CH": "Testlandi",
 			"fr_FR": "Testpais",
 		        "en_UK": "Testland"
                 },
-	        "currency": "TESTKUDOS",
 	        "call_code" : "+00"
-	},
-	{
-		"code" : "xy",
-		"name" : "Demoland",
-		"continent" : "Testcontinent",
-		"continent_i18n" : { "de_DE" : "Testkontinent" },
-  	        "name_i18n" : {
-                        "de_DE":"Demolandt",
-			"de_CH":"Demolandi",
-			"fr_FR": "Demopais",
-		        "en_UK": "Demoland"
-                },
-  	        "currency": "KUDOS",
-	        "call_code" : "+01"
 	}
     ]
 }
diff --git a/contrib/redux.xx.json b/contrib/redux.xx.json
index b28af81..8e0fa72 100644
--- a/contrib/redux.xx.json
+++ b/contrib/redux.xx.json
@@ -1,6 +1,7 @@
 {
     "license": "GPLv3+",
     "SPDX-License-Identifier": "GPL3.0-or-later",
+    "restricted" : "xx",
     "required_attributes": [
 	{
 	    "type": "string",
@@ -18,12 +19,22 @@
 	},
 	{
 	    "type": "string",
+	    "name": "prime_number",
+	    "label": "Prime number",
+	    "widget": "anastasis_gtk_xx_prime",
+            "uuid" : "39190a95-cacb-4412-8bae-1f7da3f980b4",
+	    "validation-regex": "^[0-9]+$",
+	    "validation-logic": "XY_PRIME_check"
+	},
+	{
+	    "type": "string",
 	    "name": "sq_number",
 	    "label": "Square number",
 	    "widget": "anastasis_gtk_xx_square",
             "uuid" : "ed790bca-89bf-11eb-96f2-233996cf644e",
 	    "validation-regex": "^[0-9]+$",
-	    "validation-logic": "XX_SQUARE_check"
+	    "validation-logic": "XX_SQUARE_check",
+            "optional" : true
 	}
     ]
 }
diff --git a/contrib/redux.xy.json b/contrib/redux.xy.json
deleted file mode 100644
index 2091d9a..0000000
--- a/contrib/redux.xy.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "license": "GPLv3+",
-    "SPDX-License-Identifier": "GPL3.0-or-later",
-    "required_attributes": [
-	{
-	    "type": "string",
-	    "name": "full_name",
-	    "label": "Full name",
-	    "widget": "anastasis_gtk_ia_full_name",
-            "uuid" : "9e8f463f-575f-42cb-85f3-759559997331"
-	},
-	{
-	    "type": "date",
-	    "name": "birthdate",
-	    "label": "Birthdate",
-	    "widget": "anastasis_gtk_ia_birthdate",
-            "uuid" : "83d655c7-bdb6-484d-904e-80c1058c8854"
-	},
-	{
-	    "type": "string",
-	    "name": "prime_number",
-	    "label": "Prime number",
-	    "widget": "anastasis_gtk_xx_prime",
-            "uuid" : "39190a95-cacb-4412-8bae-1f7da3f980b4",
-	    "validation-regex": "^[0-9]+$",
-	    "validation-logic": "XY_PRIME_check"
-	}
-    ]
-}