diff --git a/app/models/xudt_tag.rb b/app/models/xudt_tag.rb index a2d226b2e..85a69c954 100644 --- a/app/models/xudt_tag.rb +++ b/app/models/xudt_tag.rb @@ -1,7 +1,7 @@ class XudtTag < ApplicationRecord belongs_to :udt - VALID_TAGS = ["unnamed", "invalid", "suspicious", "out-of-length-range", "rgb++", "layer-1-asset", "supply-limited", "utility", "layer-2-asset", "supply-unlimited"] + VALID_TAGS = ["invalid", "suspicious", "out-of-length-range", "rgb++", "layer-1-asset", "supply-limited", "utility", "layer-2-asset", "supply-unlimited"] end # == Schema Information diff --git a/app/workers/xudt_tag_worker.rb b/app/workers/xudt_tag_worker.rb index f2e3a8cca..fe7ccd000 100644 --- a/app/workers/xudt_tag_worker.rb +++ b/app/workers/xudt_tag_worker.rb @@ -16,9 +16,7 @@ def perform end def mark_tags(udt) - if udt.symbol.blank? - ["unnamed"] - elsif invalid_char?(udt.symbol) + if invalid_char?(udt.symbol) ["invalid"] elsif invisible_char?(udt.symbol) ["suspicious"] @@ -36,15 +34,15 @@ def mark_tags(udt) end def invalid_char?(symbol) - !symbol.ascii_only? + symbol.present? && !symbol.ascii_only? end def invisible_char?(symbol) - (symbol =~ /^[\x21-\x7E]+(?:\s[\x21-\x7E]+)?$/).nil? + symbol.present? && (symbol =~ /^[\x21-\x7E]+(?:\s[\x21-\x7E]+)?$/).nil? end def out_of_length?(symbol) - symbol.length > 60 + symbol.present? && symbol.length > 60 end def rgbpp_lock?(issuer_address) diff --git a/test/workers/xudt_tag_worker_test.rb b/test/workers/xudt_tag_worker_test.rb index 7ed795dfb..54a2549ed 100644 --- a/test/workers/xudt_tag_worker_test.rb +++ b/test/workers/xudt_tag_worker_test.rb @@ -5,20 +5,12 @@ class XudtTagWorkerTest < ActiveJob::TestCase @address = create(:address, address_hash: "ckb1qz7xc452rgxs5z0ks3xun46dmdp58sepg0ljtae8ck0d7nah945nvqgqqqqqqx3l3v4") end - test "add tag to xudt compatible" do - create(:udt, :xudt_compatible, symbol: nil) - assert_changes -> { XudtTag.count }, from: 0, to: 1 do - XudtTagWorker.new.perform - end - assert_equal ["unnamed"], XudtTag.last.tags - end - test "when xudt with no symbol" do create(:udt, :xudt, symbol: nil) assert_changes -> { XudtTag.count }, from: 0, to: 1 do XudtTagWorker.new.perform end - assert_equal ["unnamed", "rgb++"], XudtTag.last.tags + assert_equal ["rgb++", "layer-2-asset", "supply-unlimited"], XudtTag.last.tags end test "insert to xudt_tags successfully" do