From 5ce005c133edbfad38938dba127838ab98e23db9 Mon Sep 17 00:00:00 2001
From: Matt Farnsworth <matt@perfectline.co>
Date: Wed, 25 Nov 2015 14:35:10 +0200
Subject: [PATCH] Story #108848454 - remove incorrect defaults, requires prior
 commit 88973c5241d2f9303c9feb900dcbd5451deb88dd

---
 lib/tasks/import.rake | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index 6e6e0664e..31cacdaf5 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -382,8 +382,6 @@ namespace :import do
       protocol
       alg
       public_key
-      ds_alg
-      ds_digest_type
       creator_str
       updator_str
       legacy_domain_id
@@ -490,8 +488,6 @@ namespace :import do
             key.protocol,
             key.alg,
             key.key,
-            3, # ds_alg
-            1, # ds_digest_type /SHA1)
             x.object_registry.try(:registrar).try(:name),
             x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
             x.id,
@@ -582,10 +578,10 @@ namespace :import do
 
     puts '-----> Generating dnskey digests...'
 
-    Dnskey.all.each do |x|
-      x.generate_digest
-      x.generate_ds_key_tag
-      x.save(validate: false)
+    Dnskey.all.each do |ds|
+      ds.generate_digest
+      ds.generate_ds_key_tag
+      ds.save(validate: false)
     end
 
     puts "-----> Imported #{count} new domains in #{(Time.zone.now.to_f - start).round(2)} seconds"