@@ -269,9 +269,9 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
269269 ar = r.get_array ();
270270 o1 = ar[0 ].get_obj ();
271271 adr = find_value (o1, " address" );
272- UniValue banned_until = find_value (o1, " banned_until" );
272+ int64_t banned_until{ find_value (o1, " banned_until" ). get_int64 ()} ;
273273 BOOST_CHECK_EQUAL (adr.get_str (), " 127.0.0.0/24" );
274- BOOST_CHECK_EQUAL (banned_until. get_int64 () , 9907731200 ); // absolute time check
274+ BOOST_CHECK_EQUAL (banned_until, 9907731200 ); // absolute time check
275275
276276 BOOST_CHECK_NO_THROW (CallRPC (std::string (" clearbanned" )));
277277
@@ -280,11 +280,16 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
280280 ar = r.get_array ();
281281 o1 = ar[0 ].get_obj ();
282282 adr = find_value (o1, " address" );
283- banned_until = find_value (o1, " banned_until" );
283+ banned_until = find_value (o1, " banned_until" ).get_int64 ();
284+ const int64_t ban_created{find_value (o1, " ban_created" ).get_int64 ()};
285+ const int64_t ban_duration{find_value (o1, " ban_duration" ).get_int64 ()};
286+ const int64_t time_remaining{find_value (o1, " time_remaining" ).get_int64 ()};
287+ const int64_t now{GetTime ()};
284288 BOOST_CHECK_EQUAL (adr.get_str (), " 127.0.0.0/24" );
285- int64_t now = GetTime ();
286- BOOST_CHECK (banned_until.get_int64 () > now);
287- BOOST_CHECK (banned_until.get_int64 ()-now <= 200 );
289+ BOOST_CHECK (banned_until > now);
290+ BOOST_CHECK (banned_until - now <= 200 );
291+ BOOST_CHECK_EQUAL (ban_duration, banned_until - ban_created);
292+ BOOST_CHECK_EQUAL (time_remaining, banned_until - now);
288293
289294 // must throw an exception because 127.0.0.1 is in already banned subnet range
290295 BOOST_CHECK_THROW (r = CallRPC (std::string (" setban 127.0.0.1 add" )), std::runtime_error);
0 commit comments