1 files changed, 2 insertions, 13 deletions
diff --git a/src/event.cpp b/src/event.cpp
index 6510ac6..532ba81 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -43,25 +43,14 @@ string Event::serialize()
 
     j["id"] = this->generateId(j.dump());
 
-    json jarr = json::array({ "EVENT", j });
-
-    return jarr.dump();
+    return j.dump();
 };
 
 Event Event::fromString(string jstr)
 {
     json j = json::parse(jstr);
-    Event event;
 
-    event.id = j["id"];
-    event.pubkey = j["pubkey"];
-    event.createdAt = j["created_at"];
-    event.kind = j["kind"];
-    event.tags = j["tags"];
-    event.content = j["content"];
-    event.sig = j["sig"];
-
-    return event;
+    return Event::fromJson(j);
 };
 
 Event Event::fromJson(json j)