Fix TESTS_ENVIRONMENT setting (allow GNUNET_PREFIX to be overriden, allow TESTS_ENVIR...

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation.h

diff --git a/src/experimentation/gnunet-daemon-experimentation.h b/src/experimentation/gnunet-daemon-experimentation.h
index 9886f5d5d5b1539a75c908ff01ef998092c4ff4f..9568cfa33ec5b3d1e13b6d5f0f689c3153516752 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation.h
+++ b/src/experimentation/gnunet-daemon-experimentation.h
@@ -89,54 +89,54 @@ struct Experiment
   /* Header */
   /* ----------------- */
   char *name;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_Absolute version;
-  
+
   /**
-   * Description 
+   * Description
    */
   char *description;
-  
+
   /**
-   * Required capabilities  
+   * Required capabilities
    */
   uint32_t required_capabilities;
-  
+
   /* Experiment timing */
   /* ----------------- */
-  
+
   /**
-   * When to start experiment 
+   * When to start experiment
    */
   struct GNUNET_TIME_Absolute start;
-  
+
   /**
-   * When to end experiment 
+   * When to end experiment
    */
   struct GNUNET_TIME_Absolute stop;
-  
+
   /**
-   * How often to run experiment 
+   * How often to run experiment
    */
   struct GNUNET_TIME_Relative frequency;
-  
+
   /**
-   * How long to run each execution  
+   * How long to run each execution
    */
   struct GNUNET_TIME_Relative duration;
-  
-  
+
+
   /* Experiment itself */
   /* ----------------- */
-  
+
   /* TBD */
 };
 
@@ -150,35 +150,35 @@ struct Node
    * Peer id
    */
   struct GNUNET_PeerIdentity id;
-  
+
   /**
    * Task for response timeout
    */
   GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-  
+
   /**
    * Core transmission handle
    */
   struct GNUNET_CORE_TransmitHandle *cth;
-  
+
   /**
    * Node capabilities
    */
   uint32_t capabilities;
-  
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_Absolute version;
-    
+
   struct NodeComCtx *e_req_head;
 
   struct NodeComCtx *e_req_tail;
 
   /**
    * Array of issuers accepted by this neighbor.
-   */ 
-  struct GNUNET_CRYPTO_EccPublicSignKey *issuer_id;
+   */
+  struct GNUNET_CRYPTO_EddsaPublicKey *issuer_id;
 
   unsigned int issuer_count;
 
@@ -192,15 +192,15 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * Used to detect experimentation capability
  *
  * This struct is followed by issuer identities:
- * (issuer_count * struct GNUNET_CRYPTO_EccPublicSignKey)
+ * (issuer_count * struct GNUNET_CRYPTO_EddsaPublicKey)
  *
  */
 struct Experimentation_Request
 {
   struct GNUNET_MessageHeader msg;
-  
+
   uint32_t capabilities GNUNET_PACKED;
-  
+
   uint32_t issuer_count GNUNET_PACKED;
 };
 
@@ -210,14 +210,14 @@ struct Experimentation_Request
  * Sent if peer is running the daemon
  *
  * This struct is followed by issuer identities:
- * (issuer_count * struct GNUNET_CRYPTO_EccPublicSignKey)
+ * (issuer_count * struct GNUNET_CRYPTO_EddsaPublicKey)
  */
 struct Experimentation_Response
 {
   struct GNUNET_MessageHeader msg;
-  
+
   uint32_t capabilities GNUNET_PACKED;
-  
+
   uint32_t issuer_count GNUNET_PACKED;
 };
 
@@ -227,13 +227,13 @@ struct Experimentation_Response
  */
 struct Issuer
 {
-  struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
+  struct GNUNET_CRYPTO_EddsaPublicKey pubkey;
 };
 
 
 /**
  * Hashmap containing valid experiment issuers
- * (the key is the hash of the respective public key, 
+ * (the key is the hash of the respective public key,
  * the values are of type `struct Issuer').
  */
 struct GNUNET_CONTAINER_MultiHashMap *valid_issuers;
@@ -246,19 +246,19 @@ struct GNUNET_CONTAINER_MultiHashMap *valid_issuers;
 struct GED_start_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -267,19 +267,19 @@ struct GED_start_message
 struct GED_start_ack_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
 
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -288,19 +288,19 @@ struct GED_start_ack_message
 struct GED_stop_message
 {
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * String length of experiment name following the struct
    */
   uint32_t len_name GNUNET_PACKED;
-  
+
   /**
-   * Experiment issuer 
+   * Experiment issuer
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey issuer;
-  
+  struct GNUNET_CRYPTO_EddsaPublicKey issuer;
+
   /**
-   * Experiment version as timestamp of creation 
+   * Experiment version as timestamp of creation
    */
   struct GNUNET_TIME_AbsoluteNBO version_nbo;
 };
@@ -379,7 +379,7 @@ GED_capabilities_stop (void);
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer_ID);
+GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer_ID);
 
 
 /*
@@ -391,18 +391,18 @@ GED_experiments_issuer_accepted (const struct GNUNET_CRYPTO_EccPublicSignKey *is
  * @return the experiment or NULL if not found
  */
 struct Experiment *
-GED_experiments_find (const struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+GED_experiments_find (const struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                      const char *name,
                      const struct GNUNET_TIME_Absolute version);
 
 
-typedef void (*GNUNET_EXPERIMENTATION_experiments_get_cb) (struct Node *n, 
+typedef void (*GNUNET_EXPERIMENTATION_experiments_get_cb) (struct Node *n,
                                                           struct Experiment *e);
 
 
 void
 GED_experiments_get (struct Node *n,
-                    struct GNUNET_CRYPTO_EccPublicSignKey *issuer,
+                    struct GNUNET_CRYPTO_EddsaPublicKey *issuer,
                     GNUNET_EXPERIMENTATION_experiments_get_cb get_cb);
 
 
@@ -461,7 +461,7 @@ GED_scheduler_handle_stop (struct Node *n, struct Experiment *e);
  */
 void
 GED_scheduler_add (struct Node *n,
-                  struct Experiment *e, 
+                  struct Experiment *e,
                   int outbound);