Merged normal message function and send action function into one

messaging function.

This removes code duplication and allows us to easily add new message
types to the api without having to add new functions.

1 files changed, 4 insertions, 4 deletions

diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 2e1fe92a..2a813c9b 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -50,10 +50,10 @@ START_TEST(test_m_sendmesage)
     int bad_len = MAX_CRYPTO_PACKET_SIZE;
 
 
-    ck_assert(m_sendmessage(m, -1, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, REALLY_BIG_NUMBER, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, 17, (uint8_t *)message, good_len, 0) == -1);
-    ck_assert(m_sendmessage(m, friend_id_num, (uint8_t *)message, bad_len, 0) == -2);
+    ck_assert(m_send_message_generic(m, -1, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, REALLY_BIG_NUMBER, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, 17, MESSAGE_NORMAL, (uint8_t *)message, good_len, 0) == -1);
+    ck_assert(m_send_message_generic(m, friend_id_num, MESSAGE_NORMAL, (uint8_t *)message, bad_len, 0) == -2);
 }
 END_TEST