keypair err mgt + shorturl random improve

endtoend_test.go

@@ -58,15 +58,25 @@ func TestEndToEnd(t *testing.T) {
 		var ReceivedContact meowlib.ContactCard
 
 		// Friend simulated invitation
-		FirstFriendContactKp := meowlib.NewKeyPair()
-		FirstFriendEncryptionKp := meowlib.NewKeyPair()
-		FirstFriendLookupKp := meowlib.NewKeyPair()
+		FirstFriendContactKp, err := meowlib.NewKeyPair()
+		if err != nil {
+			t.Fatal(err)
+		}
+		FirstFriendEncryptionKp, err := meowlib.NewKeyPair()
+		if err != nil {
+			t.Fatal(err)
+		}
+		FirstFriendLookupKp, err := meowlib.NewKeyPair()
+		if err != nil {
+			t.Fatal(err)
+		}
 		ReceivedContact.Name = "I'm the friend"
 		ReceivedContact.ContactPublicKey = FirstFriendContactKp.Public
 		ReceivedContact.EncryptionPublicKey = FirstFriendEncryptionKp.Public
 		ReceivedContact.LookupPublicKey = FirstFriendLookupKp.Public
 		ReceivedContact.InvitationId = peer.GetMyContact().InvitationId
-		FriendServer1KP := meowlib.NewKeyPair()
+		FriendServer1KP, err := meowlib.NewKeyPair()
+
 		FriendServer1 := meowlib.ServerCard{Name: "FriendServer1", Url: "http://myfriend.org/meow/", PublicKey: FriendServer1KP.Public, Description: "Fancy description"}
 		ReceivedContact.PullServers = append(ReceivedContact.PullServers, &FriendServer1)
 
@@ -76,9 +86,8 @@ func TestEndToEnd(t *testing.T) {
 		Me.FinalizeInvitation(&ReceivedContact)
 		err = Me.Save()
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
-
 		a, _ = json.Marshal(Me)
 		os.WriteFile("id.json", a, 0644)
 		fmt.Println(string(a))
@@ -91,16 +100,16 @@ func TestEndToEnd(t *testing.T) {
 		// Creating User message
 		usermessage, err := MyFirstFriend.BuildSimpleUserMessage([]byte(textmessage))
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		serializedMessage, err := MyFirstFriend.SerializeUserMessage(usermessage)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Encrypting it
 		enc, err := MyFirstFriend.AsymEncryptMessage(serializedMessage)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 
 		// Packing it
@@ -108,22 +117,22 @@ func TestEndToEnd(t *testing.T) {
 
 		intS1, err := Me.MessageServers.LoadServer("http://127.0.0.1/meow/")
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Creating Server message for transporting the user message
 		toServerMessage, err := intS1.BuildMessageSendingMessage(packedMsg)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Encrypting it
 		encToServer, err := intS1.AsymEncryptMessage(toServerMessage)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Packing it
 		protoPackedServerMsg, err := intS1.PackServerMessage(encToServer.Data, encToServer.Signature)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		///////////////////////
 		// Sending to server //
@@ -143,34 +152,34 @@ func TestEndToEnd(t *testing.T) {
 		// Unpack
 		srv_from, srv_encmsg, srv_signature, err := server1.UnpackReceived(protoPackedServerMsg)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Decrypt
 		srv_clear, err := server1.AsymDecryptMessage(srv_from, srv_encmsg, srv_signature)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Decode msg
 		srv_msg, err := server1.DeserializeToServerMessage(srv_clear)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		// Response : Ack received message
 		srv_fromServerMessage, err := server1.BuildSimpleAckResponseMessage(srv_msg.Uuid)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		encoded_srv_fromServerMessage, err := server1.SerializeFromServerMessage(srv_fromServerMessage)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		srv_resp, err := server1.AsymEncryptMessage(srv_from, encoded_srv_fromServerMessage)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		resp, err := server1.PackForSending(srv_resp.Data, srv_resp.Signature)
 		if err != nil {
-			fmt.Println(err.Error())
+			t.Fatal(err)
 		}
 		print(resp)
 		//////////////////////////////////////////////