Merge pull request #10 from cryptape/develop

proposals get validators from MetaData

app/controllers/api/statistics_controller.rb

@@ -30,10 +30,7 @@ def index
   #   }
   # ]
   def proposals
-    blocks = Block.select("header->>'proposer' as proposer")
-    proposers = blocks.distinct("proposers").map(&:proposer)
-
-    result = proposers.map do |proposer|
+    result = MetaData.last&.validators&.map do |proposer|
       count = Block.where("header->>'proposer' = ?", proposer).count
       {
         "validator": proposer,

db/migrate/20180816073015_add_index_to_blocks.rb

@@ -0,0 +1,6 @@
+class AddIndexToBlocks < ActiveRecord::Migration[5.2]
+  def change
+    add_index :blocks, :header, using: :gin
+    add_index :blocks, :body, using: :gin
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_08_07_073702) do
+ActiveRecord::Schema.define(version: 2018_08_16_073015) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -41,7 +41,9 @@
     t.datetime "updated_at", null: false
     t.integer "transaction_count"
     t.index ["block_number"], name: "index_blocks_on_block_number", unique: true
+    t.index ["body"], name: "index_blocks_on_body", using: :gin
     t.index ["cita_hash"], name: "index_blocks_on_cita_hash", unique: true
+    t.index ["header"], name: "index_blocks_on_header", using: :gin
   end
 
   create_table "meta_data", force: :cascade do |t|

spec/controllers/api/statistics_controller_spec.rb

@@ -22,6 +22,8 @@
     10.times.each do |i|
       create :block_one, header: block_one_header.merge(timestamp: block_zero_header[:timestamp] + (20 + i) * 1000), cita_hash: "0x#{SecureRandom.hex(32)}", block_number: (20 + i)
     end
+
+    create :meta_data, validators: [block_zero_proposer, block_one_proposer], block: Block.last
   end