Merge commit '5fa11394a3853a475500095b85949f6673603568' into tests

.env

@@ -3,3 +3,4 @@ FIRST_CHAIN_MAINTAINER=YOUR_NAME
 CONTRACTS_LIMIT=2
 SIGNATURES_LIMIT=5
 REDIS_URL=redis://redis:6379
+ENV_MACHINE=docker

app/controllers/api/v1/block_confirmations_controller.rb

@@ -11,15 +11,15 @@ def confirm_block
     assign_contract
   end
 
-  def transactions_to_mine
-    return unauthorized_response unless find_user_by_header
-    ticket = Ticket.find_by(user_id: @user.id)
-    return ticket_not_found_response unless ticket.present?
-    transactions_ids = ticket.transaction_id_list
-    transactions = Transaction.where(id: transactions_ids)
-    transactions_json = transactions.to_json
-    render json: transactions_json, status: :ok
-  end
+  # def transactions_to_mine
+  #   return unauthorized_response unless find_user_by_header
+  #   ticket = Ticket.find_by(user_id: @user.id)
+  #   return ticket_not_found_response unless ticket.present?
+  #   transactions_ids = ticket.transaction_id_list
+  #   transactions = Transaction.where(id: transactions_ids)
+  #   transactions_json = transactions.to_json
+  #   render json: transactions_json, status: :ok
+  # end
 
   def info_to_mine
     return unauthorized_response unless find_user_by_header
@@ -31,11 +31,11 @@ def info_to_mine
 
   private
     def find_user_by_header
-      return unless request.headers["X-Api-Key"].present?
-      api_key = request.headers["X-Api-Key"]
+      return unless request.headers["X-API-KEY"].present?
+      api_key = request.headers["X-API-KEY"]
       @user = User.find_by(api_key: api_key)
       return unless @user.present?
-      @user.api_secret == request.headers["X-Api-Secret"]
+      @user.api_secret == request.headers["X-API-SECRET"]
     end
 
     def unauthorized_response

app/controllers/contracts_controller.rb

@@ -17,9 +17,4 @@ def show
     def set_contract
       @contract = Contract.find(params[:id])
     end
-
-    # Only allow a list of trusted parameters through.
-    def contract_params
-      params.require(:contract).permit(:first_sig, :second_sig, :third_sig, :fourth_sig, :status, :transaction_id)
-    end
 end

app/controllers/pools_controller.rb

@@ -13,61 +13,9 @@ def index
   def show
   end
 
-  # GET /pools/new
-  def new
-    @pool = Pool.new
-  end
-
-  # GET /pools/1/edit
-  def edit
-  end
-
-  # POST /pools or /pools.json
-  def create
-    @pool = Pool.new(pool_params)
-
-    respond_to do |format|
-      if @pool.save
-        format.html { redirect_to pool_url(@pool), notice: "Pool was successfully created." }
-        format.json { render :show, status: :created, location: @pool }
-      else
-        format.html { render :new, status: :unprocessable_entity }
-        format.json { render json: @pool.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /pools/1 or /pools/1.json
-  def update
-    respond_to do |format|
-      if @pool.update(pool_params)
-        format.html { redirect_to pool_url(@pool), notice: "Pool was successfully updated." }
-        format.json { render :show, status: :ok, location: @pool }
-      else
-        format.html { render :edit, status: :unprocessable_entity }
-        format.json { render json: @pool.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /pools/1 or /pools/1.json
-  def destroy
-    @pool.destroy
-
-    respond_to do |format|
-      format.html { redirect_to pools_url, notice: "Pool was successfully destroyed." }
-      format.json { head :no_content }
-    end
-  end
-
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_pool
       @pool = Pool.find(params[:id])
     end
-
-    # Only allow a list of trusted parameters through.
-    def pool_params
-      params.require(:pool).permit(:block_id, :users_count, :signatures_count, :amount, :stage)
-    end
 end

app/controllers/signatures_controller.rb

@@ -17,9 +17,4 @@ def show
     def set_signature
       @signature = Signature.find(params[:id])
     end
-
-    # Only allow a list of trusted parameters through.
-    def signature_params
-      params.require(:signature).permit(:signature, :time_ref, :contract_id, :common_word, :symbol_sequence, :number_sequence, :verify_sig, :block_hash, :signature_hash)
-    end
 end

app/controllers/tickets_controller.rb

@@ -18,40 +18,13 @@ def new
     @ticket = Ticket.new
   end
 
-  # GET /tickets/1/edit
-  def edit
-  end
-
   # POST /tickets or /tickets.json
   def create
     return no_transactions_response if block_transactions.empty?
     create_ticket
     redirect_to tickets_path, notice: "Processing ticket, please wait, wait a minute and refresh the page"
   end
 
-  # PATCH/PUT /tickets/1 or /tickets/1.json
-  def update
-    respond_to do |format|
-      if @ticket.update(ticket_params)
-        format.html { redirect_to ticket_url(@ticket), notice: "Ticket was successfully updated." }
-        format.json { render :show, status: :ok, location: @ticket }
-      else
-        format.html { render :edit, status: :unprocessable_entity }
-        format.json { render json: @ticket.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /tickets/1 or /tickets/1.json
-  def destroy
-    @ticket.destroy
-
-    respond_to do |format|
-      format.html { redirect_to tickets_url, notice: "Ticket was successfully destroyed." }
-      format.json { head :no_content }
-    end
-  end
-
   private
     def create_ticket
       CreateTicketWorker.perform_async(current_user.id, current_pool.id, time_ref)

app/views/transactions/_transaction.html.slim

@@ -3,9 +3,8 @@ div id="#{dom_id transaction}"
     strong Sended by:
     =< transaction.sender
   p
-    strong Receiver By:
+    strong Receiver By: 
     =< transaction.receiver
-  / only show the information below if the Show page is being rendered
   - if action_name == "show"
     p
       strong Amount:

app/views/users/registrations/new.html.erb

@@ -5,7 +5,7 @@
   <%= render "users/shared/error_messages", resource: resource %>
   <div class="field text-black">
     <%= f.label :username, class: "text-white" %><br />
-    <em class="text-white">(10 characters minimum)</em>
+    <em class="text-white">(10 characters minimum)</em><br />
     <%= f.text_field :username, autofocus: true, autocomplete: "username",class: "px-4 py-2 rounded text-black border-2 border-purple-300 focus_border-purple-900" %>
   </div>
 

config/routes/api.rb

@@ -3,7 +3,7 @@
 namespace :api do
   namespace :v1 do
     post "confirm_block", to: "block_confirmations#confirm_block"
-    get "tr_to_mine", to: "block_confirmations#transactions_to_mine"
+    # get "tr_to_mine", to: "block_confirmations#transactions_to_mine"
     get "info_to_mine", to: "block_confirmations#info_to_mine"
   end
 end

coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 70.1
+    "line": 80.9
   }
 }