2 files changed, 26 insertions, 49 deletions

diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index dddf5e030..f9135c28e 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -77,7 +77,7 @@ struct GNUNET_ESCROW_Anchor
   /**
    * The name of the ego that was put in escrow.
    */
-  char *egoName;
+  const char *egoName;
 
   /**
    * The size of the anchor data.
@@ -370,33 +370,48 @@ GNUNET_ESCROW_get_status (
  * Deserialize an escrow anchor string (e.g. from command line) into a
  * GNUNET_ESCROW_Anchor struct
  * 
- * @param h the handle for the escrow component
  * @param anchorString the encoded escrow anchor string
- * @param method the escrow method to use
  * 
  * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
  *         NULL if we failed to parse the string
  */
 struct GNUNET_ESCROW_Anchor *
 GNUNET_ESCROW_anchor_string_to_data (
-  struct GNUNET_ESCROW_Handle *h,
-  char *anchorString,
-  enum GNUNET_ESCROW_Key_Escrow_Method method);
+  const char *anchorString);
 
 
 /**
  * Serialize an escrow anchor (struct GNUNET_ESCROW_Anchor) into a string
  * 
- * @param h the handle for the escrow component
  * @param escrowAnchor the escrow anchor struct
- * @param method the escrow method to use
  * 
  * @return the encoded escrow anchor string
  */
 char *
-GNUNET_ESCROW_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
-                                     struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                                     enum GNUNET_ESCROW_Key_Escrow_Method method);
+GNUNET_ESCROW_anchor_data_to_string (
+  const struct GNUNET_ESCROW_Anchor *escrowAnchor);
+
+
+/**
+ * Convert a method name string to the respective enum number
+ * 
+ * @param methodString the method name string
+ * 
+ * @return the enum number
+ */
+enum GNUNET_ESCROW_Key_Escrow_Method
+GNUNET_ESCROW_method_string_to_number (const char *methodString);
+
+
+/**
+ * Convert a method enum number to the respective method string
+ * 
+ * @param method the method enum number
+ * 
+ * @return the method string
+ */
+const char *
+GNUNET_ESCROW_method_number_to_string (enum GNUNET_ESCROW_Key_Escrow_Method method);
 
 
 /**
diff --git a/src/include/gnunet_escrow_plugin.h b/src/include/gnunet_escrow_plugin.h
index b8b88ff3f..dbdf6dce6 100644
--- a/src/include/gnunet_escrow_plugin.h
+++ b/src/include/gnunet_escrow_plugin.h
@@ -114,34 +114,6 @@ typedef struct GNUNET_ESCROW_Status *(*GNUNET_ESCROW_GetEscrowStatusFunction) (
 
 
 /**
- * Function called to deserialize an escrow anchor string into a
- * GNUNET_ESCROW_Anchor struct
- * 
- * @param h the handle for the escrow component
- * @param anchorString the encoded escrow anchor string
- * 
- * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
- *         NULL if we failed to parse the string
- */
-typedef struct GNUNET_ESCROW_Anchor *(*GNUNET_ESCROW_AnchorStringToDataFunction) (
-  struct GNUNET_ESCROW_Handle *h,
-  char *anchorString);
-
-
-/**
- * Function called to serialize an escrow anchor struct into a string
- * 
- * @param h the handle for the escrow component
- * @param escrowAnchor the escrow anchor struct
- * 
- * @return the encoded escrow anchor string
- */
-typedef char *(*GNUNET_ESCROW_AnchorDataToStringFunction) (
-  struct GNUNET_ESCROW_Handle *h,
-  struct GNUNET_ESCROW_Anchor *escrowAnchor);
-
-
-/**
  * Function called to cancel a plugin operation
  * 
  * @param plugin_op_wrap plugin operation wrapper containing the plugin operation
@@ -182,16 +154,6 @@ struct GNUNET_ESCROW_KeyPluginFunctions
   GNUNET_ESCROW_GetEscrowStatusFunction get_status;
 
   /**
-   * Deserialize anchor string to data
-   */
-  GNUNET_ESCROW_AnchorStringToDataFunction anchor_string_to_data;
-
-  /**
-   * Serialize anchor data to string
-   */
-  GNUNET_ESCROW_AnchorDataToStringFunction anchor_data_to_string;
-
-  /**
    * Cancel plugin operation
    */
   GNUNET_ESCROW_CancelPluginOperationFunction cancel_plugin_operation;