Merge pull request #721 from nervosnetwork/shaojunda-fix-ckb-transactions-table-record-count

Author: shaojunda

app/models/ckb_sync/node_data_processor.rb

@@ -57,7 +57,8 @@ def increase_records_count(ckb_transactions)
       block_counter = TableRecordCount.find_by(table_name: "blocks")
       block_counter.increment!(:count)
       ckb_transaction_counter = TableRecordCount.find_by(table_name: "ckb_transactions")
-      ckb_transaction_counter.increment!(:count, ckb_transactions.count)
+      normal_transactions = ckb_transactions.reject { |tx| tx.is_cellbase }
+      ckb_transaction_counter.increment!(:count, normal_transactions.count) if normal_transactions.present?
     end
 
     def update_udt_info(udt_infos)
@@ -225,7 +226,8 @@ def decrease_records_count(local_tip_block)
       block_counter = TableRecordCount.find_by(table_name: "blocks")
       block_counter.decrement!(:count)
       ckb_transaction_counter = TableRecordCount.find_by(table_name: "ckb_transactions")
-      ckb_transaction_counter.decrement!(:count, local_tip_block.ckb_transactions.count)
+      normal_transactions = local_tip_block.ckb_transactions.normal
+      ckb_transaction_counter.decrement!(:count, normal_transactions.count) if normal_transactions.present?
     end
 
     def recalculate_dao_contract_transactions_count(local_tip_block)

test/models/ckb_sync/node_data_processor_test.rb

@@ -41,7 +41,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}") do
         node_block = CkbSync::Api.instance.get_block_by_number(DEFAULT_NODE_BLOCK_NUMBER)
         create(:block, :with_block_hash, number: node_block.header.number - 1)
-        assert_difference -> { ckb_transaction_counter.reload.count }, node_block.transactions.count do
+        assert_difference -> { ckb_transaction_counter.reload.count }, node_block.transactions[1..-1].count do
           node_data_processor.process_block(node_block)
         end
       end
@@ -1368,7 +1368,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       local_block.update(block_hash: "0x419c632366c8eb9635acbb39ea085f7552ae62e1fdd480893375334a0f37d1bx")
 
       VCR.use_cassette("blocks/13") do
-        assert_difference -> { ckb_transactions_counter.reload.count }, -local_block.ckb_transactions.count do
+        assert_difference -> { ckb_transactions_counter.reload.count }, -local_block.ckb_transactions.normal.count do
           node_data_processor.call
         end
       end