feat(server): search transactions by lock hash

nervosnetwork · May 31, 2019 · 6b54db0 · 6b54db0
1 parent 5ab9804
commit 6b54db0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/app/controllers/api/v1/address_transactions_controller.rb b/server/app/controllers/api/v1/address_transactions_controller.rb
@@ -5,7 +5,7 @@ class AddressTransactionsController < ApplicationController
       before_action :validate_pagination_params, :pagination_params
 
       def show
-        address = Address.find_by!(address_hash: params[:id])
+        address = Address.find_address!(params[:id])
         ckb_transactions = address.ckb_transactions.available.recent.distinct.page(@page).per(@page_size)
         options = FastJsonapi::PaginationMetaGenerator.new(request: request, records: ckb_transactions, page: @page, page_size: @page_size).call
 

diff --git a/server/app/controllers/validations/address_transaction.rb b/server/app/controllers/validations/address_transaction.rb
@@ -25,9 +25,9 @@ def error_object
     attr_accessor :query_key
 
     def query_key_format_must_be_correct
-      CkbUtils.parse_address(query_key)
-    rescue
-      errors.add(:query_key, "query key is invalid")
+      return if QueryKeyUtils.valid_hex?(query_key)
+
+      errors.add(:query_key, "query key is invalid") unless QueryKeyUtils.valid_address?(query_key)
     end
   end
 end