Remove faucet config from mantis conf

Author: Łukasz Gąsior

src/main/resources/application.conf

@@ -547,45 +547,6 @@ mantis {
       port = 8888
     }
   }
-
-  faucet {
-    # Wallet address used to send transactions from
-    wallet-address = "0x00"
-
-    # Password to unlock faucet wallet
-    wallet-password = ""
-
-    # Path to directory where wallet key is stored
-    keystore-dir = "~/.mantis-faucet-keystore"
-
-    # Transaction gas price
-    tx-gas-price = 20000000000
-
-    # Transaction gas limit
-    tx-gas-limit = 90000
-
-    # Transaction value
-    tx-value = 1000000000000000000
-
-    # Faucet listen interface
-    listen-interface = "127.0.0.1"
-
-    # Faucet listen port
-    listen-port = 8099
-
-    # Faucet cors config
-    cors-allowed-origins = "*"
-
-    # Address of Ethereum node used to send the transaction
-    rpc-address = "http://127.0.0.1:8546/"
-
-    # How often can a single IP address send a request
-    min-request-interval = 1.minute
-
-    # How many ip addr -> timestamp entries to store
-    latest-timestamp-cache-size = 1024
-  }
-
 }
 
 akka {

src/main/scala/io/iohk/ethereum/faucet/Faucet.scala

@@ -5,17 +5,18 @@ import java.security.SecureRandom
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.stream.ActorMaterializer
+import com.typesafe.config.ConfigFactory
 import io.iohk.ethereum.keystore.KeyStoreImpl
 import io.iohk.ethereum.mallet.service.RpcClient
-import io.iohk.ethereum.utils.{Config, Logger}
-import scala.concurrent.ExecutionContext.Implicits.global
+import io.iohk.ethereum.utils.Logger
 
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.{Failure, Success}
 
 object Faucet extends Logger {
 
   def main(args: Array[String]): Unit = {
-    val config = FaucetConfig(Config.config)
+    val config = FaucetConfig(ConfigFactory.load())
 
     val rpcClient = new RpcClient(config.rpcAddress)
     val keyStore = new KeyStoreImpl(config.keyStoreDir, new SecureRandom())

src/main/scala/io/iohk/ethereum/faucet/FaucetConfig.scala

@@ -22,8 +22,8 @@ case class FaucetConfig(
     latestTimestampCacheSize: Int)
 
 object FaucetConfig {
-  def apply(mantisConfig: TypesafeConfig): FaucetConfig = {
-    val faucetConfig = mantisConfig.getConfig("faucet")
+  def apply(typesafeConfig: TypesafeConfig): FaucetConfig = {
+    val faucetConfig = typesafeConfig.getConfig("faucet")
 
     val corsAllowedOrigins = ConfigUtils.parseCorsAllowedOrigins(faucetConfig, "cors-allowed-origins")
 

src/universal/bin/faucet-server

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-./bin/mantis-app -Dconfig.file=./conf/mantis.conf -Dlogback.configurationFile=./conf/logback.xml -J-Xss10M faucet "$@"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR/..
+./bin/mantis -Dconfig.file=./conf/faucet.conf -- faucet "$@"

src/universal/conf/faucet.conf

@@ -1,4 +1,4 @@
-mantis.faucet {
+faucet {
   # Wallet address used to send transactions from
   wallet-address = "0x00"