commit 674c1d259488d79882c705f891db01059fa2b855 Author: Nick Mathewson nickm@torproject.org Date: Tue May 9 07:26:14 2017 -0400

Fix an implicit conversion warning --- src/test/test_channelpadding.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 5d11842..cffc8d0 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -669,8 +669,9 @@ test_channelpadding_negotiation(void *arg) val = channelpadding_get_netflow_inactive_timeout_ms(client_relay3); tt_int_op(val, OP_GE, 9000); tt_int_op(val, OP_LE, 14000); - val = channelpadding_compute_time_until_pad_for_netflow(client_relay3); - tt_int_op(val, OP_LE, 14000); + int64_t val64 = + channelpadding_compute_time_until_pad_for_netflow(client_relay3); + tt_i64_op(val64, OP_LE, 14000);

done: free_mock_network();