Merge branch 'master' into feature/tokens

2 files changed, 48 insertions, 54 deletions

diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index d8094434c..65a28d715 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -50,6 +50,54 @@
 #define TALER_CNC_KAPPA_MINUS_ONE_STR "2"
 
 
+/**
+ * Possible AML decision states.
+ */
+enum TALER_AmlDecisionState
+{
+
+  /**
+   * All AML requirements are currently satisfied.
+   */
+  TALER_AML_NORMAL = 0,
+
+  /**
+   * An AML investigation is pending.
+   */
+  TALER_AML_PENDING = 1,
+
+  /**
+   * An AML decision has concluded that the funds must be frozen.
+   */
+  TALER_AML_FROZEN = 2
+
+};
+
+
+/**
+ * Possible algorithms for confirmation code generation.
+ */
+enum TALER_MerchantConfirmationAlgorithm
+{
+
+  /**
+   * No purchase confirmation.
+   */
+  TALER_MCA_NONE = 0,
+
+  /**
+   * Purchase confirmation without payment
+   */
+  TALER_MCA_WITHOUT_PRICE = 1,
+
+  /**
+   * Purchase confirmation with payment
+   */
+  TALER_MCA_WITH_PRICE = 2
+
+};
+
+
 /* ****************** Coin crypto primitives ************* */
 
 GNUNET_NETWORK_STRUCT_BEGIN
@@ -562,54 +610,6 @@ struct TALER_AmlOfficerSignatureP
 
 
 /**
- * Possible AML decision states.
- */
-enum TALER_AmlDecisionState
-{
-
-  /**
-   * All AML requirements are currently satisfied.
-   */
-  TALER_AML_NORMAL = 0,
-
-  /**
-   * An AML investigation is pending.
-   */
-  TALER_AML_PENDING = 1,
-
-  /**
-   * An AML decision has concluded that the funds must be frozen.
-   */
-  TALER_AML_FROZEN = 2
-
-};
-
-
-/**
- * Possible algorithms for confirmation code generation.
- */
-enum TALER_MerchantConfirmationAlgorithm
-{
-
-  /**
-   * No purchase confirmation.
-   */
-  TALER_MCA_NONE = 0,
-
-  /**
-   * Purchase confirmation without payment
-   */
-  TALER_MCA_WITHOUT_PRICE = 1,
-
-  /**
-   * Purchase confirmation with payment
-   */
-  TALER_MCA_WITH_PRICE = 2
-
-};
-
-
-/**
  * Commitment value for the refresh protocol.
  * See #TALER_refresh_get_commitment().
  */
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 1ca019b99..19dc84fc0 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -242,12 +242,6 @@ struct TALER_CurrencySpecification
   unsigned int num_fractional_trailing_zero_digits;
 
   /**
-   * True to put the currency symbol before the number,
-   * false to put the currency symbol after the number.
-   */
-  bool is_currency_name_leading;
-
-  /**
    * Mapping of powers of 10 to alternative currency names or symbols.
    * Keys are the decimal powers, values the currency symbol to use.
    * Map MUST contain an entry for "0" to the default currency symbol.