diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-05-03 16:56:25 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-05-03 16:56:25 +0000 |
commit | eb62ee6803ca2404c04271eeddbbc7cf89ecd07d (patch) | |
tree | 1c4ed538e181e8e5b90a510410cbf5a5d39a13fa /src/social/test_social.c | |
parent | 1f79562434de77d978eb87477a9b967023bf50f6 (diff) | |
download | gnunet-eb62ee6803ca2404c04271eeddbbc7cf89ecd07d.tar.gz gnunet-eb62ee6803ca2404c04271eeddbbc7cf89ecd07d.zip |
more psycey method names in test_social.c
Diffstat (limited to 'src/social/test_social.c')
-rw-r--r-- | src/social/test_social.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/social/test_social.c b/src/social/test_social.c index e2639f4d6..d781561e5 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c | |||
@@ -568,7 +568,7 @@ guest_leave() | |||
568 | 568 | ||
569 | struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create (); | 569 | struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create (); |
570 | GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_SET, | 570 | GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_SET, |
571 | "_message", DATA2ARG ("Leaving.")); | 571 | "_notice_place_leave", DATA2ARG ("Leaving.")); |
572 | GNUNET_SOCIAL_guest_leave (gst, env, &guest_left, NULL); | 572 | GNUNET_SOCIAL_guest_leave (gst, env, &guest_left, NULL); |
573 | GNUNET_PSYC_env_destroy (env); | 573 | GNUNET_PSYC_env_destroy (env); |
574 | gst = NULL; | 574 | gst = NULL; |
@@ -943,7 +943,7 @@ guest_talk () | |||
943 | tmit.data_count = 3; | 943 | tmit.data_count = 3; |
944 | 944 | ||
945 | tmit.guest_talk | 945 | tmit.guest_talk |
946 | = GNUNET_SOCIAL_guest_talk (gst, "_message_guest", tmit.env, | 946 | = GNUNET_SOCIAL_guest_talk (gst, "_converse_guest", tmit.env, |
947 | ¬ify_data, &tmit, | 947 | ¬ify_data, &tmit, |
948 | GNUNET_SOCIAL_TALK_NONE); | 948 | GNUNET_SOCIAL_TALK_NONE); |
949 | } | 949 | } |
@@ -973,7 +973,7 @@ host_announce () | |||
973 | tmit.data_count = 4; | 973 | tmit.data_count = 4; |
974 | 974 | ||
975 | tmit.host_ann | 975 | tmit.host_ann |
976 | = GNUNET_SOCIAL_host_announce (hst, "_message_host", tmit.env, | 976 | = GNUNET_SOCIAL_host_announce (hst, "_converse_host", tmit.env, |
977 | ¬ify_data, &tmit, | 977 | ¬ify_data, &tmit, |
978 | GNUNET_SOCIAL_ANNOUNCE_NONE); | 978 | GNUNET_SOCIAL_ANNOUNCE_NONE); |
979 | } | 979 | } |
@@ -1005,7 +1005,7 @@ host_announce2 () | |||
1005 | tmit.data_count = 3; | 1005 | tmit.data_count = 3; |
1006 | 1006 | ||
1007 | tmit.host_ann | 1007 | tmit.host_ann |
1008 | = GNUNET_SOCIAL_host_announce (hst, "_message_host_two", tmit.env, | 1008 | = GNUNET_SOCIAL_host_announce (hst, "_converse_host_two", tmit.env, |
1009 | ¬ify_data, &tmit, | 1009 | ¬ify_data, &tmit, |
1010 | GNUNET_SOCIAL_ANNOUNCE_NONE); | 1010 | GNUNET_SOCIAL_ANNOUNCE_NONE); |
1011 | } | 1011 | } |
@@ -1081,7 +1081,7 @@ host_answer_door (void *cls, | |||
1081 | { | 1081 | { |
1082 | case TEST_HOST_ANSWER_DOOR_REFUSE: | 1082 | case TEST_HOST_ANSWER_DOOR_REFUSE: |
1083 | test = TEST_GUEST_RECV_ENTRY_DCSN_REFUSE; | 1083 | test = TEST_GUEST_RECV_ENTRY_DCSN_REFUSE; |
1084 | join_resp = GNUNET_PSYC_message_create ("_refuse_nym", env, | 1084 | join_resp = GNUNET_PSYC_message_create ("_notice_place_refuse", env, |
1085 | DATA2ARG ("Go away!")); | 1085 | DATA2ARG ("Go away!")); |
1086 | GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_NO, join_resp); | 1086 | GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_NO, join_resp); |
1087 | break; | 1087 | break; |
@@ -1089,7 +1089,7 @@ host_answer_door (void *cls, | |||
1089 | case TEST_HOST_ANSWER_DOOR_ADMIT: | 1089 | case TEST_HOST_ANSWER_DOOR_ADMIT: |
1090 | test = TEST_GUEST_RECV_ENTRY_DCSN_ADMIT; | 1090 | test = TEST_GUEST_RECV_ENTRY_DCSN_ADMIT; |
1091 | case TEST_GUEST_ENTER_BY_NAME: | 1091 | case TEST_GUEST_ENTER_BY_NAME: |
1092 | join_resp = GNUNET_PSYC_message_create ("_admit_nym", env, | 1092 | join_resp = GNUNET_PSYC_message_create ("_notice_place_admit", env, |
1093 | DATA2ARG ("Welcome, nym!")); | 1093 | DATA2ARG ("Welcome, nym!")); |
1094 | GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_YES, join_resp); | 1094 | GNUNET_SOCIAL_host_entry_decision (hst, nym, GNUNET_YES, join_resp); |
1095 | break; | 1095 | break; |
@@ -1139,7 +1139,7 @@ guest_enter () | |||
1139 | guest_recv_entry_decision, NULL); | 1139 | guest_recv_entry_decision, NULL); |
1140 | gst_plc = GNUNET_SOCIAL_guest_get_place (gst); | 1140 | gst_plc = GNUNET_SOCIAL_guest_get_place (gst); |
1141 | 1141 | ||
1142 | GNUNET_SOCIAL_place_msg_proc_set (gst_plc, "_message", | 1142 | GNUNET_SOCIAL_place_msg_proc_set (gst_plc, "_converse", |
1143 | GNUNET_SOCIAL_MSG_PROC_SAVE); | 1143 | GNUNET_SOCIAL_MSG_PROC_SAVE); |
1144 | } | 1144 | } |
1145 | 1145 | ||
@@ -1249,7 +1249,7 @@ host_enter () | |||
1249 | host_answer_door, host_farewell, NULL); | 1249 | host_answer_door, host_farewell, NULL); |
1250 | hst_plc = GNUNET_SOCIAL_host_get_place (hst); | 1250 | hst_plc = GNUNET_SOCIAL_host_get_place (hst); |
1251 | 1251 | ||
1252 | GNUNET_SOCIAL_place_msg_proc_set (hst_plc, "_message", | 1252 | GNUNET_SOCIAL_place_msg_proc_set (hst_plc, "_converse", |
1253 | GNUNET_SOCIAL_MSG_PROC_RELAY); | 1253 | GNUNET_SOCIAL_MSG_PROC_RELAY); |
1254 | } | 1254 | } |
1255 | 1255 | ||