@@ -848,7 +848,7 @@ def test_alive_call(self):
848848 """Tests the alive function uses the correct call"""
849849 self .xrpl_collector .alive ()
850850 self .mocked_connection .return_value .cached_json_rpc_post .assert_called_once_with (
851- self .xrpl_collector .ledger_closed_payload )
851+ self .xrpl_collector .ledger_closed_payload , non_rpc_response = True )
852852
853853 def test_alive_false (self ):
854854 """Tests the alive function returns false when post returns None"""
@@ -860,19 +860,19 @@ def test_block_height(self):
860860 """Tests the block_height function uses the correct call to get block height"""
861861 self .xrpl_collector .block_height ()
862862 self .mocked_connection .return_value .cached_json_rpc_post .assert_called_once_with (
863- self .xrpl_collector .ledger_closed_payload )
863+ self .xrpl_collector .ledger_closed_payload , non_rpc_response = True )
864864
865865 def test_block_height_get_ledger_index (self ):
866866 """Tests that the block height is returned with the ledger_index key"""
867867 self .mocked_connection .return_value .cached_json_rpc_post .return_value = {
868- "ledger_index" : 96217031 }
868+ "result" : { " ledger_index" : 96217031 } }
869869 result = self .xrpl_collector .block_height ()
870870 self .assertEqual (96217031 , result )
871871
872872 def test_block_height_key_error_returns_none (self ):
873873 """Tests that the block height returns None on KeyError"""
874874 self .mocked_connection .return_value .cached_json_rpc_post .return_value = {
875- "dummy_key" : 5 }
875+ "result" : { " dummy_key" : 5 } }
876876 result = self .xrpl_collector .block_height ()
877877 self .assertEqual (None , result )
878878
@@ -886,19 +886,26 @@ def test_client_version(self):
886886 """Tests the client_version function uses the correct call to get client version"""
887887 self .xrpl_collector .client_version ()
888888 self .mocked_connection .return_value .cached_json_rpc_post .assert_called_once_with (
889- self .xrpl_collector .server_info_payload )
889+ self .xrpl_collector .server_info_payload , non_rpc_response = True )
890890
891891 def test_client_version_get_build_version (self ):
892892 """Tests that the client version is returned with the build_version key"""
893893 self .mocked_connection .return_value .cached_json_rpc_post .return_value = {
894- "info" : {"build_version" : "2.4.0" }}
894+ "result" : {"info" : {"build_version" : "2.4.0" }}}
895+ result = self .xrpl_collector .client_version ()
896+ self .assertEqual ({"client_version" : "2.4.0" }, result )
897+
898+ def test_client_version_get_libxrpl_version (self ):
899+ """Tests that the client version is returned with the libxrpl_version key if build_version is not present"""
900+ self .mocked_connection .return_value .cached_json_rpc_post .return_value = {
901+ "result" : {"info" : {"libxrpl_version" : "2.4.0" }}}
895902 result = self .xrpl_collector .client_version ()
896903 self .assertEqual ({"client_version" : "2.4.0" }, result )
897904
898905 def test_client_version_key_error_returns_none (self ):
899906 """Tests that the client_version returns None on KeyError"""
900907 self .mocked_connection .return_value .cached_json_rpc_post .return_value = {
901- "info" : {"dummy_key" : "value" }}
908+ "result" : { " info" : {"dummy_key" : "value" } }}
902909 result = self .xrpl_collector .client_version ()
903910 self .assertEqual (None , result )
904911
0 commit comments