PEERSTORE api overhaul

1 files changed, 10 insertions, 25 deletions

diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 0acc3ec4b..29e2ed866 100644
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -40,48 +40,33 @@ struct StoreRequestMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Peer Identity
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
    * Size of the sub_system string
    * Allocated at position 0 after this struct
    */
   size_t sub_system_size;
 
   /**
-   * Size of value blob
-   * Allocated at position 1 after this struct
+   * Peer Identity
    */
-  size_t value_size;
+  struct GNUNET_PeerIdentity peer;
 
   /**
-   * Lifetime of entry
+   * Size of the key string
+   * Allocated at position 1 after this struct
    */
-  struct GNUNET_TIME_Relative lifetime;
+  size_t key_size;
 
-};
-
-/**
- * Message carrying a PEERSTORE store response
- */
-struct StoreResponseMessage
-{
   /**
-   * GNUnet message header
+   * Size of value blob
+   * Allocated at position 2 after this struct
    */
-  struct GNUNET_MessageHeader header;
+  size_t value_size;
 
   /**
-   * Was the store operation successful (#GNUNET_YES / #GNUNET_NO)
+   * Lifetime of entry
    */
-  uint16_t success GNUNET_PACKED;
+  struct GNUNET_TIME_Relative lifetime;
 
-  /**
-   * Size of the following error message (0 if no error)
-   */
-  size_t emsg_size GNUNET_PACKED;
 };
 
 GNUNET_NETWORK_STRUCT_END