Align importing timestamps method with msf_ prefix

Author: sjanusz-r7

lib/msf/core/db_manager/import.rb

@@ -481,57 +481,57 @@ def import_filetype_detect(data)
   end
 
   def msf_import_service(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_service(normalised_import_timestamp_opts)
   end
 
   def msf_import_vuln(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_vuln(normalised_import_timestamp_opts)
   end
 
   def msf_import_note(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_note(normalised_import_timestamp_opts)
   end
 
   def msf_import_host(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_host(normalised_import_timestamp_opts)
   end
 
   def msf_import_task(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_task(normalised_import_timestamp_opts)
   end
 
   def msf_import_user(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_user(normalised_import_timestamp_opts)
   end
 
   def msf_import_loot(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_loot(normalised_import_timestamp_opts)
   end
 
   def msf_import_web_site(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_web_site(normalised_import_timestamp_opts)
   end
 
   def msf_import_web_page(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_web_page(normalised_import_timestamp_opts)
   end
 
   def msf_import_web_vuln(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_web_vuln(normalised_import_timestamp_opts)
   end
 
   def msf_import_artifact(opts)
-    normalised_import_timestamp_opts = normalise_import_timestamps(opts)
+    normalised_import_timestamp_opts = msf_normalise_import_timestamps(opts)
     report_artifact(normalised_import_timestamp_opts)
   end
 
@@ -544,7 +544,7 @@ def msf_assign_timestamps(opts,obj)
   end
 
   # Handles timestamps from Metasploit Express/Pro imports.
-  def normalise_import_timestamps(opts)
+  def msf_normalise_import_timestamps(opts)
     opts[:created_at] ||= (opts["created_at"] || ::Time.now.utc)
     opts[:updated_at] ||= (opts["updated_at"] || opts[:created_at])
     opts

spec/support/shared/examples/msf/db_manager/import.rb

@@ -10,7 +10,7 @@
   it { is_expected.to respond_to :import_file }
   it { is_expected.to respond_to :import_filetype_detect }
   it { is_expected.to respond_to :msf_assign_timestamps }
-  it { is_expected.to respond_to :normalise_import_timestamps }
+  it { is_expected.to respond_to :msf_normalise_import_timestamps }
   it { is_expected.to respond_to :report_import_note }
   it { is_expected.to respond_to :rexmlify }
   it { is_expected.to respond_to :validate_import_file }