diff --git a/doc/man3/trpc.c b/doc/man3/trpc.c index c0a089146a04..6062d53f065c 100644 --- a/doc/man3/trpc.c +++ b/doc/man3/trpc.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) if (!(h = flux_open (NULL, 0))) log_err_exit ("flux_open"); - if (!(f = flux_rpcf (h, "attr.get", FLUX_NODEID_ANY, 0, - "{s:s}", "name", "rank"))) + if (!(f = flux_rpc_pack (h, "attr.get", FLUX_NODEID_ANY, 0, + "{s:s}", "name", "rank"))) log_err_exit ("flux_rpcf"); if (flux_rpc_getf (f, "{s:s}", "value", &rankstr) < 0) diff --git a/doc/man3/trpc_then.c b/doc/man3/trpc_then.c index 59b57680d246..977a50e48351 100644 --- a/doc/man3/trpc_then.c +++ b/doc/man3/trpc_then.c @@ -20,9 +20,9 @@ int main (int argc, char **argv) if (!(h = flux_open (NULL, 0))) log_err_exit ("flux_open"); - if (!(f = flux_rpcf (h, "attr.get", FLUX_NODEID_ANY, 0, - "{s:s}", "name", "rank"))) - log_err_exit ("flux_rpcf"); + if (!(f = flux_rpc_pack (h, "attr.get", FLUX_NODEID_ANY, 0, + "{s:s}", "name", "rank"))) + log_err_exit ("flux_rpc_pack"); if (flux_future_then (f, -1., continuation, NULL) < 0) log_err_exit ("flux_future_then"); diff --git a/src/broker/hello.c b/src/broker/hello.c index 906a6397367b..76710ed1a31b 100644 --- a/src/broker/hello.c +++ b/src/broker/hello.c @@ -281,11 +281,11 @@ static void r_forward (flux_reduce_t *r, int batch, void *arg) assert (batch == 0); assert (count > 0); - if (!(f = flux_rpcf (hello->h, "hello.join", FLUX_NODEID_UPSTREAM, - FLUX_RPC_NORESPONSE, "{ s:i s:i }", - "count", count, - "batch", batch))) - log_err_exit ("hello: flux_rpcf"); + if (!(f = flux_rpc_pack (hello->h, "hello.join", FLUX_NODEID_UPSTREAM, + FLUX_RPC_NORESPONSE, "{ s:i s:i }", + "count", count, + "batch", batch))) + log_err_exit ("hello: flux_rpc_pack"); flux_future_destroy (f); } diff --git a/src/cmd/builtin/heaptrace.c b/src/cmd/builtin/heaptrace.c index d58507577229..9b50f489872d 100644 --- a/src/cmd/builtin/heaptrace.c +++ b/src/cmd/builtin/heaptrace.c @@ -34,8 +34,8 @@ static int internal_heaptrace_start (optparse_t *p, int ac, char *av[]) } if (!(h = builtin_get_flux_handle (p))) log_err_exit ("flux_open"); - if (!(f = flux_rpcf (h, "heaptrace.start", FLUX_NODEID_ANY, 0, - "{ s:s }", "filename", av[ac - 1])) + if (!(f = flux_rpc_pack (h, "heaptrace.start", FLUX_NODEID_ANY, 0, + "{ s:s }", "filename", av[ac - 1])) || flux_future_get (f, NULL) < 0) log_err_exit ("heaptrace.start"); flux_future_destroy (f); @@ -73,8 +73,8 @@ static int internal_heaptrace_dump (optparse_t *p, int ac, char *av[]) } if (!(h = builtin_get_flux_handle (p))) log_err_exit ("flux_open"); - if (!(f = flux_rpcf (h, "heaptrace.dump", FLUX_NODEID_ANY, 0, - "{ s:s }", "reason", av[ac - 1])) + if (!(f = flux_rpc_pack (h, "heaptrace.dump", FLUX_NODEID_ANY, 0, + "{ s:s }", "reason", av[ac - 1])) || flux_rpc_get (f , NULL) < 0) log_err_exit ("heaptrace.dump"); flux_future_destroy (f); diff --git a/src/cmd/builtin/user.c b/src/cmd/builtin/user.c index d3deeaa8c240..1a09b7a0c7fa 100644 --- a/src/cmd/builtin/user.c +++ b/src/cmd/builtin/user.c @@ -107,8 +107,8 @@ static void delrole (flux_t *h, uint32_t userid, uint32_t rolemask) uint32_t final; char s[256]; - f = flux_rpcf (h, "userdb.delrole", FLUX_NODEID_ANY, 0, - "{s:i s:i}", "userid", userid, + f = flux_rpc_pack (h, "userdb.delrole", FLUX_NODEID_ANY, 0, + "{s:i s:i}", "userid", userid, "rolemask", rolemask); if (!f) log_err_exit ("userdb.delrole"); @@ -130,8 +130,8 @@ static void addrole (flux_t *h, uint32_t userid, uint32_t rolemask) uint32_t final; char s[256]; - f = flux_rpcf (h, "userdb.addrole", FLUX_NODEID_ANY, 0, - "{s:i s:i}", "userid", userid, + f = flux_rpc_pack (h, "userdb.addrole", FLUX_NODEID_ANY, 0, + "{s:i s:i}", "userid", userid, "rolemask", rolemask); if (!f) log_err_exit ("userdb.addrole"); @@ -230,8 +230,8 @@ static int internal_user_lookup (optparse_t *p, int ac, char *av[]) log_msg_exit ("%s: invalid userid", av[n]); if (!(h = builtin_get_flux_handle (p))) log_err_exit ("flux_open"); - f = flux_rpcf (h, "userdb.lookup", FLUX_NODEID_ANY, 0, - "{s:i}", "userid", userid); + f = flux_rpc_pack (h, "userdb.lookup", FLUX_NODEID_ANY, 0, + "{s:i}", "userid", userid); if (!f) log_err_exit ("userdb.lookup"); if (flux_rpc_getf (f, "{s:i s:i}", "userid", &userid, diff --git a/src/cmd/flux-module.c b/src/cmd/flux-module.c index eda9c6b746bc..7ecd3d6b9062 100644 --- a/src/cmd/flux-module.c +++ b/src/cmd/flux-module.c @@ -708,8 +708,8 @@ int cmd_debug (optparse_t *p, int argc, char **argv) op = "setbit"; flags = strtoul (optparse_get_str (p, "setbit", NULL), NULL, 0); } - if (!(f = flux_rpcf (h, topic, FLUX_NODEID_ANY, 0, "{s:s s:i}", - "op", op, "flags", flags))) + if (!(f = flux_rpc_pack (h, topic, FLUX_NODEID_ANY, 0, "{s:s s:i}", + "op", op, "flags", flags))) log_err_exit ("%s", topic); if (flux_rpc_getf (f, "{s:i}", "flags", &flags) < 0) log_err_exit ("%s", topic); diff --git a/src/common/libflux/attr.c b/src/common/libflux/attr.c index 1d885bea2677..6660738cfe66 100644 --- a/src/common/libflux/attr.c +++ b/src/common/libflux/attr.c @@ -101,8 +101,8 @@ static int attr_get_rpc (attr_ctx_t *ctx, const char *name, attr_t **attrp) attr_t *attr; int rc = -1; - if (!(f = flux_rpcf (ctx->h, "attr.get", FLUX_NODEID_ANY, 0, - "{s:s}", "name", name))) + if (!(f = flux_rpc_pack (ctx->h, "attr.get", FLUX_NODEID_ANY, 0, + "{s:s}", "name", name))) goto done; if (flux_rpc_getf (f, "{s:s, s:i}", "value", &val, "flags", &flags) < 0) goto done; @@ -125,12 +125,12 @@ static int attr_set_rpc (attr_ctx_t *ctx, const char *name, const char *val) #if JANSSON_VERSION_HEX >= 0x020800 /* $? format specifier was introduced in jansson 2.8 */ - f = flux_rpcf (ctx->h, "attr.set", FLUX_NODEID_ANY, 0, - "{s:s, s:s?}", "name", name, "value", val); + f = flux_rpc_pack (ctx->h, "attr.set", FLUX_NODEID_ANY, 0, + "{s:s, s:s?}", "name", name, "value", val); #else - f = flux_rpcf (ctx->h, "attr.set", FLUX_NODEID_ANY, 0, - val ? "{s:s, s:s}" : "{s:s, s:n}", - "name", name, "value", val); + f = flux_rpc_pack (ctx->h, "attr.set", FLUX_NODEID_ANY, 0, + val ? "{s:s, s:s}" : "{s:s, s:n}", + "name", name, "value", val); #endif if (!f) goto done; diff --git a/src/common/libflux/barrier.c b/src/common/libflux/barrier.c index d4c57f740393..52b2040d17a3 100644 --- a/src/common/libflux/barrier.c +++ b/src/common/libflux/barrier.c @@ -91,8 +91,8 @@ flux_future_t *flux_barrier (flux_t *h, const char *name, int nprocs) if (!name && !(name = generate_unique_name (h))) return NULL; - return flux_rpcf (h, "barrier.enter", FLUX_NODEID_ANY, 0, - "{s:s s:i s:i s:b}", + return flux_rpc_pack (h, "barrier.enter", FLUX_NODEID_ANY, 0, + "{s:s s:i s:i s:b}", "name", name, "count", 1, "nprocs", nprocs, diff --git a/src/common/libflux/flog.c b/src/common/libflux/flog.c index e180b1e3ae33..c9195e13e893 100644 --- a/src/common/libflux/flog.c +++ b/src/common/libflux/flog.c @@ -216,8 +216,8 @@ static int dmesg_clear (flux_t *h, int seq) flux_future_t *f; int rc = -1; - if (!(f = flux_rpcf (h, "log.clear", FLUX_NODEID_ANY, 0, - "{s:i}", "seq", seq))) + if (!(f = flux_rpc_pack (h, "log.clear", FLUX_NODEID_ANY, 0, + "{s:i}", "seq", seq))) goto done; if (flux_future_get (f, NULL) < 0) goto done; @@ -229,8 +229,8 @@ static int dmesg_clear (flux_t *h, int seq) static flux_future_t *dmesg_rpc (flux_t *h, int seq, bool follow) { - return flux_rpcf (h, "log.dmesg", FLUX_NODEID_ANY, 0, - "{s:i s:b}", "seq", seq, "follow", follow); + return flux_rpc_pack (h, "log.dmesg", FLUX_NODEID_ANY, 0, + "{s:i s:b}", "seq", seq, "follow", follow); } static int dmesg_rpc_get (flux_future_t *f, int *seq, flux_log_f fun, void *arg) diff --git a/src/common/libflux/panic.c b/src/common/libflux/panic.c index 5d109b0bc59e..b896c473567d 100644 --- a/src/common/libflux/panic.c +++ b/src/common/libflux/panic.c @@ -42,8 +42,8 @@ int flux_panic (flux_t *h, int rank, const char *msg) flux_future_t *f = NULL; int rc = -1; - f = flux_rpcf (h, "cmb.panic", nodeid, FLUX_RPC_NORESPONSE, - "{s:s}", "msg", msg ? msg : ""); + f = flux_rpc_pack (h, "cmb.panic", nodeid, FLUX_RPC_NORESPONSE, + "{s:s}", "msg", msg ? msg : ""); if (!f) goto done; /* No reply */ diff --git a/src/common/libflux/rpc.c b/src/common/libflux/rpc.c index 8329cdece4b0..8e8857f20503 100644 --- a/src/common/libflux/rpc.c +++ b/src/common/libflux/rpc.c @@ -284,11 +284,11 @@ flux_future_t *flux_rpc_raw (flux_t *h, return f; } -static flux_future_t *flux_vrpcf (flux_t *h, - const char *topic, - uint32_t nodeid, - int flags, - const char *fmt, va_list ap) +static flux_future_t *flux_rpc_vpack (flux_t *h, + const char *topic, + uint32_t nodeid, + int flags, + const char *fmt, va_list ap) { flux_msg_t *msg; flux_future_t *f = NULL; @@ -303,14 +303,14 @@ static flux_future_t *flux_vrpcf (flux_t *h, return f; } -flux_future_t *flux_rpcf (flux_t *h, const char *topic, uint32_t nodeid, - int flags, const char *fmt, ...) +flux_future_t *flux_rpc_pack (flux_t *h, const char *topic, uint32_t nodeid, + int flags, const char *fmt, ...) { va_list ap; flux_future_t *f; va_start (ap, fmt); - f = flux_vrpcf (h, topic, nodeid, flags, fmt, ap); + f = flux_rpc_vpack (h, topic, nodeid, flags, fmt, ap); va_end (ap); return f; } diff --git a/src/common/libflux/rpc.h b/src/common/libflux/rpc.h index 57de458fc7e1..3d04531908d8 100644 --- a/src/common/libflux/rpc.h +++ b/src/common/libflux/rpc.h @@ -14,8 +14,8 @@ enum { flux_future_t *flux_rpc (flux_t *h, const char *topic, const char *json_str, uint32_t nodeid, int flags); -flux_future_t *flux_rpcf (flux_t *h, const char *topic, uint32_t nodeid, - int flags, const char *fmt, ...); +flux_future_t *flux_rpc_pack (flux_t *h, const char *topic, uint32_t nodeid, + int flags, const char *fmt, ...); flux_future_t *flux_rpc_raw (flux_t *h, const char *topic, const void *data, int len, diff --git a/src/common/libkvs/kvs.c b/src/common/libkvs/kvs.c index ffbc1ab8824c..0be8f9019a16 100644 --- a/src/common/libkvs/kvs.c +++ b/src/common/libkvs/kvs.c @@ -397,8 +397,8 @@ int kvs_wait_version (flux_t *h, int version) flux_future_t *f; int ret = -1; - if (!(f = flux_rpcf (h, "kvs.sync", FLUX_NODEID_ANY, 0, "{ s:i }", - "rootseq", version))) + if (!(f = flux_rpc_pack (h, "kvs.sync", FLUX_NODEID_ANY, 0, "{ s:i }", + "rootseq", version))) goto done; /* N.B. response contains (rootseq, rootdir) but we don't need it. */ diff --git a/src/common/libkvs/kvs_lookup.c b/src/common/libkvs/kvs_lookup.c index 803be6a24482..a61ecf01c582 100644 --- a/src/common/libkvs/kvs_lookup.c +++ b/src/common/libkvs/kvs_lookup.c @@ -36,9 +36,9 @@ flux_future_t *flux_kvs_lookup (flux_t *h, int flags, const char *key) { - return flux_rpcf (h, "kvs.get", FLUX_NODEID_ANY, 0, "{s:s s:i}", - "key", key, - "flags", flags); + return flux_rpc_pack (h, "kvs.get", FLUX_NODEID_ANY, 0, "{s:s s:i}", + "key", key, + "flags", flags); } flux_future_t *flux_kvs_lookupat (flux_t *h, int flags, const char *key, @@ -55,10 +55,10 @@ flux_future_t *flux_kvs_lookupat (flux_t *h, int flags, const char *key, errno = EINVAL; return NULL; } - f = flux_rpcf (h, "kvs.get", FLUX_NODEID_ANY, 0, "{s:s s:i s:O}", - "key", key, - "flags", flags, - "rootdir", obj); + f = flux_rpc_pack (h, "kvs.get", FLUX_NODEID_ANY, 0, "{s:s s:i s:O}", + "key", key, + "flags", flags, + "rootdir", obj); } json_decref (obj); return f; diff --git a/src/connectors/local/local.c b/src/connectors/local/local.c index 9ba5456108b8..a4f47d24b503 100644 --- a/src/connectors/local/local.c +++ b/src/connectors/local/local.c @@ -157,8 +157,8 @@ static int op_event (void *impl, const char *topic, const char *msg_topic) assert (c->magic == CTX_MAGIC); - if (!(f = flux_rpcf (c->h, msg_topic, FLUX_NODEID_ANY, 0, - "{s:s}", "topic", topic))) + if (!(f = flux_rpc_pack (c->h, msg_topic, FLUX_NODEID_ANY, 0, + "{s:s}", "topic", topic))) goto done; if (flux_future_get (f, NULL) < 0) goto done; diff --git a/src/connectors/shmem/shmem.c b/src/connectors/shmem/shmem.c index be0651497d48..6563116a8f35 100644 --- a/src/connectors/shmem/shmem.c +++ b/src/connectors/shmem/shmem.c @@ -139,8 +139,8 @@ static int op_event_subscribe (void *impl, const char *topic) flux_future_t *f; int rc = -1; - if (!(f = flux_rpcf (ctx->h, "cmb.sub", FLUX_NODEID_ANY, 0, - "{ s:s }", "topic", topic))) + if (!(f = flux_rpc_pack (ctx->h, "cmb.sub", FLUX_NODEID_ANY, 0, + "{ s:s }", "topic", topic))) goto done; if (flux_future_get (f, NULL) < 0) goto done; @@ -157,8 +157,8 @@ static int op_event_unsubscribe (void *impl, const char *topic) flux_future_t *f = NULL; int rc = -1; - if (!(f = flux_rpcf (ctx->h, "cmb.unsub", FLUX_NODEID_ANY, 0, - "{ s:s }", "topic", topic))) + if (!(f = flux_rpc_pack (ctx->h, "cmb.unsub", FLUX_NODEID_ANY, 0, + "{ s:s }", "topic", topic))) goto done; if (flux_future_get (f, NULL) < 0) goto done; diff --git a/src/connectors/ssh/ssh.c b/src/connectors/ssh/ssh.c index bae1a480c7f0..ac34493e85da 100644 --- a/src/connectors/ssh/ssh.c +++ b/src/connectors/ssh/ssh.c @@ -138,8 +138,8 @@ static int op_event_subscribe (void *impl, const char *topic) flux_future_t *f; int rc = 0; - if (!(f = flux_rpcf (c->h, "local.sub", FLUX_NODEID_ANY, 0, - "{ s:s }", "topic", topic))) + if (!(f = flux_rpc_pack (c->h, "local.sub", FLUX_NODEID_ANY, 0, + "{ s:s }", "topic", topic))) goto done; if (flux_future_get (f, NULL) < 0) goto done; @@ -156,8 +156,8 @@ static int op_event_unsubscribe (void *impl, const char *topic) flux_future_t *f; int rc = 0; - if (!(f = flux_rpcf (c->h, "local.unsub", FLUX_NODEID_ANY, 0, - "{ s:s }", "topic", topic))) + if (!(f = flux_rpc_pack (c->h, "local.unsub", FLUX_NODEID_ANY, 0, + "{ s:s }", "topic", topic))) goto done; if (flux_future_get (f, NULL) < 0) goto done; diff --git a/src/modules/barrier/barrier.c b/src/modules/barrier/barrier.c index d964e81d9bf3..53becaf4e972 100644 --- a/src/modules/barrier/barrier.c +++ b/src/modules/barrier/barrier.c @@ -168,12 +168,12 @@ static void send_enter_request (barrier_ctx_t *ctx, barrier_t *b) { flux_future_t *f; - if (!(f = flux_rpcf (ctx->h, "barrier.enter", FLUX_NODEID_UPSTREAM, - FLUX_RPC_NORESPONSE, "{s:s s:i s:i s:b}", - "name", b->name, - "count", b->count, - "nprocs", b->nprocs, - "internal", true))) { + if (!(f = flux_rpc_pack (ctx->h, "barrier.enter", FLUX_NODEID_UPSTREAM, + FLUX_RPC_NORESPONSE, "{s:s s:i s:i s:b}", + "name", b->name, + "count", b->count, + "nprocs", b->nprocs, + "internal", true))) { flux_log_error (ctx->h, "sending barrier.enter request"); goto done; } diff --git a/src/modules/connector-local/local.c b/src/modules/connector-local/local.c index 4ecb17c45cb0..09c19a5cd83a 100644 --- a/src/modules/connector-local/local.c +++ b/src/modules/connector-local/local.c @@ -166,8 +166,8 @@ static int lookup_userdb (flux_t *h, uint32_t userid, uint32_t *rolemask) flux_future_t *f; int rc = -1; - if (!(f = flux_rpcf (h, "userdb.lookup", FLUX_NODEID_ANY, 0, - "{s:i}", "userid", userid))) + if (!(f = flux_rpc_pack (h, "userdb.lookup", FLUX_NODEID_ANY, 0, + "{s:i}", "userid", userid))) goto done; if (flux_rpc_getf (f, "{s:i}", "rolemask", rolemask) < 0) goto done; diff --git a/src/modules/content-sqlite/content-sqlite.c b/src/modules/content-sqlite/content-sqlite.c index 8812baaed770..f87221aa0ee2 100644 --- a/src/modules/content-sqlite/content-sqlite.c +++ b/src/modules/content-sqlite/content-sqlite.c @@ -393,10 +393,10 @@ int register_backing_store (flux_t *h, bool value, const char *name) int saved_errno = 0; int rc = -1; - if (!(f = flux_rpcf (h, "content.backing", FLUX_NODEID_ANY, 0, - "{ s:b s:s }", - "backing", value, - "name", name))) + if (!(f = flux_rpc_pack (h, "content.backing", FLUX_NODEID_ANY, 0, + "{ s:b s:s }", + "backing", value, + "name", name))) goto done; if (flux_future_get (f, NULL) < 0) goto done; diff --git a/src/modules/cron/cron.c b/src/modules/cron/cron.c index 311c58cd61fc..57c68e6f114b 100644 --- a/src/modules/cron/cron.c +++ b/src/modules/cron/cron.c @@ -343,13 +343,13 @@ static int64_t next_cronid (flux_t *h) int64_t ret = (int64_t) -1; flux_future_t *f; - if (!(f = flux_rpcf (h, "seq.fetch", 0, 0, - "{ s:s s:i s:i s:b }", - "name", "cron", - "preincrement", 1, - "postincrement", 0, - "create", true))) { - flux_log_error (h, "flux_rpcf"); + if (!(f = flux_rpc_pack (h, "seq.fetch", 0, 0, + "{ s:s s:i s:i s:b }", + "name", "cron", + "preincrement", 1, + "postincrement", 0, + "create", true))) { + flux_log_error (h, "flux_rpc_pack"); goto out; } diff --git a/src/modules/wreck/job.c b/src/modules/wreck/job.c index 4b3ad06b47f7..424661e8a11d 100644 --- a/src/modules/wreck/job.c +++ b/src/modules/wreck/job.c @@ -157,11 +157,11 @@ static int64_t next_jobid (flux_t *h) int64_t ret = (int64_t) -1; flux_future_t *f; - f = flux_rpcf (h, "seq.fetch", 0, 0, "{s:s,s:i,s:i,s:b}", - "name", "lwj", - "preincrement", 1, - "postincrement", 0, - "create", true); + f = flux_rpc_pack (h, "seq.fetch", 0, 0, "{s:s,s:i,s:i,s:b}", + "name", "lwj", + "preincrement", 1, + "postincrement", 0, + "create", true); if (f == NULL) { flux_log_error (h, "next_jobid: flux_rpc"); goto out; @@ -252,7 +252,7 @@ static bool ping_sched (flux_t *h) { bool retval = false; flux_future_t *f; - if (!(f = flux_rpcf (h, "sched.ping", 0, 0, "{s:i}", "seq", 0))) { + if (!(f = flux_rpc_pack (h, "sched.ping", 0, 0, "{s:i}", "seq", 0))) { flux_log_error (h, "ping_sched"); goto out; } diff --git a/t/rpc/rpc.c b/t/rpc/rpc.c index 20c9227c9727..0b02b75e6f1d 100644 --- a/t/rpc/rpc.c +++ b/t/rpc/rpc.c @@ -275,9 +275,9 @@ void test_encoding (flux_t *h) /* use newish pack/unpack payload interfaces */ int i = 0; - ok ((r = flux_rpcf (h, "rpctest.incr", FLUX_NODEID_ANY, 0, - "{s:i}", "n", 107)) != NULL, - "flux_rpcf works"); + ok ((r = flux_rpc_pack (h, "rpctest.incr", FLUX_NODEID_ANY, 0, + "{s:i}", "n", 107)) != NULL, + "flux_rpc_pack works"); ok (flux_rpc_getf (r, NULL) < 0 && errno == EINVAL, "flux_rpc_getf fails with EINVAL"); @@ -288,9 +288,9 @@ void test_encoding (flux_t *h) flux_future_destroy (r); /* cause remote EPROTO (unexpected payload) - will be picked up in _getf() */ - ok ((r = flux_rpcf (h, "rpcftest.hello", FLUX_NODEID_ANY, 0, - "{ s:i }", "foo", 42)) != NULL, - "flux_rpcf with payload when none is expected works, at first"); + ok ((r = flux_rpc_pack (h, "rpcftest.hello", FLUX_NODEID_ANY, 0, + "{ s:i }", "foo", 42)) != NULL, + "flux_rpc_pack with payload when none is expected works, at first"); errno = 0; ok (flux_rpc_getf (r, "{}") < 0 && errno == EPROTO, @@ -298,8 +298,8 @@ void test_encoding (flux_t *h) flux_future_destroy (r); /* cause local EPROTO (user incorrectly expects payload) */ - ok ((r = flux_rpcf (h, "rpcftest.hello", FLUX_NODEID_ANY, 0, "{}")) != NULL, - "flux_rpcf with empty payload works"); + ok ((r = flux_rpc_pack (h, "rpcftest.hello", FLUX_NODEID_ANY, 0, "{}")) != NULL, + "flux_rpc_pack with empty payload works"); errno = 0; ok (flux_rpc_getf (r, "{ s:i }", "foo", &i) < 0 && errno == EPROTO, @@ -308,8 +308,8 @@ void test_encoding (flux_t *h) /* cause local EPROTO (user incorrectly expects empty payload) */ errno = 0; - ok ((r = flux_rpcf (h, "rpctest.echo", FLUX_NODEID_ANY, 0, "{ s:i }", "foo", 42)) != NULL, - "flux_rpcf with payload works"); + ok ((r = flux_rpc_pack (h, "rpctest.echo", FLUX_NODEID_ANY, 0, "{ s:i }", "foo", 42)) != NULL, + "flux_rpc_pack with payload works"); errno = 0; ok (flux_rpc_getf (r, "{ ! }") < 0 && errno == EPROTO,