refactor: add EtherToWei function

internal/chain/address.go → internal/chain/util.go

@@ -1,6 +1,8 @@
 package chain
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -10,3 +12,8 @@ func IsValidAddress(address string, checksummed bool) bool {
 	}
 	return !checksummed || common.HexToAddress(address).Hex() == address
 }
+
+func EtherToWei(amount int64) *big.Int {
+	ether := new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)
+	return new(big.Int).Mul(big.NewInt(amount), ether)
+}

internal/chain/address_test.go → internal/chain/util_test.go

@@ -1,6 +1,10 @@
 package chain
 
-import "testing"
+import (
+	"math/big"
+	"reflect"
+	"testing"
+)
 
 func TestIsValidAddress(t *testing.T) {
 	type args struct {
@@ -27,3 +31,20 @@ func TestIsValidAddress(t *testing.T) {
 		})
 	}
 }
+
+func TestEtherToWei(t *testing.T) {
+	tests := []struct {
+		name   string
+		amount int64
+		want   *big.Int
+	}{
+		{name: "1ether", amount: 1, want: new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := EtherToWei(tt.amount); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("EtherToWei() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/server/config.go

@@ -1,26 +1,20 @@
 package server
 
-import (
-	"math/big"
-	"time"
-)
-
 type Config struct {
 	chainName  string
 	httpPort   int
-	interval   time.Duration
-	payout     *big.Int
+	interval   int
+	payout     int
 	proxyCount int
 	queueCap   int
 }
 
 func NewConfig(chainName string, httpPort, interval, payout, proxyCount, queueCap int) *Config {
-	ether := new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)
 	return &Config{
 		chainName:  chainName,
 		httpPort:   httpPort,
-		interval:   time.Duration(interval),
-		payout:     new(big.Int).Mul(big.NewInt(int64(payout)), ether),
+		interval:   interval,
+		payout:     payout,
 		proxyCount: proxyCount,
 		queueCap:   queueCap,
 	}

internal/server/server.go

@@ -36,7 +36,7 @@ func NewServer(builder chain.TxBuilder, cfg *Config) *Server {
 func (s *Server) setupRouter() *http.ServeMux {
 	router := http.NewServeMux()
 	router.Handle("/", http.FileServer(web.Dist()))
-	limiter := NewLimiter(s.cfg.proxyCount, s.cfg.interval*time.Minute)
+	limiter := NewLimiter(s.cfg.proxyCount, time.Duration(s.cfg.interval)*time.Minute)
 	router.Handle("/api/claim", negroni.New(limiter, negroni.Wrap(s.handleClaim())))
 	router.Handle("/api/info", s.handleInfo())
 
@@ -66,7 +66,7 @@ func (s *Server) consumeQueue() {
 	defer s.mutex.Unlock()
 	for len(s.queue) != 0 {
 		address := <-s.queue
-		txHash, err := s.Transfer(context.Background(), address, s.cfg.payout)
+		txHash, err := s.Transfer(context.Background(), address, chain.EtherToWei(int64(s.cfg.payout)))
 		if err != nil {
 			log.WithError(err).Error("Failed to handle transaction in the queue")
 		} else {
@@ -104,7 +104,7 @@ func (s *Server) handleClaim() http.HandlerFunc {
 
 		ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
 		defer cancel()
-		txHash, err := s.Transfer(ctx, address, s.cfg.payout)
+		txHash, err := s.Transfer(ctx, address, chain.EtherToWei(int64(s.cfg.payout)))
 		s.mutex.Unlock()
 		if err != nil {
 			log.WithError(err).Error("Failed to send transaction")
@@ -136,7 +136,7 @@ func (s *Server) handleInfo() http.HandlerFunc {
 		json.NewEncoder(w).Encode(info{
 			Account:   s.Sender().String(),
 			ChainName: s.cfg.chainName,
-			Payout:    s.cfg.payout.String(),
+			Payout:    strconv.Itoa(s.cfg.payout),
 		})
 	}
 }

web/package.json

@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@ethersproject/address": "^5.4.0",
-    "@ethersproject/units": "^5.4.0",
     "animate.css": "^4.1.1",
     "bulma": "^0.9.2",
     "bulma-toast": "^2.4.0",

web/src/Faucet.svelte

@@ -1,23 +1,20 @@
 <script>
   import { onMount } from 'svelte';
   import { getAddress } from '@ethersproject/address';
-  import { formatEther } from '@ethersproject/units';
   import { setDefaults as setToast, toast } from 'bulma-toast';
 
   let address = null;
   let faucetInfo = {
     account: '0x0000000000000000000000000000000000000000',
-    network: 'Testnet',
+    network: 'testnet',
     payout: 1,
   };
 
-  $: document.title = `ETH ${faucetInfo.network} Faucet`;
+  $: document.title = `ETH ${capitalize(faucetInfo.network)} Faucet`;
 
   onMount(async () => {
     const res = await fetch('/api/info');
     faucetInfo = await res.json();
-    faucetInfo.network = capitalize(faucetInfo.network);
-    faucetInfo.payout = parseInt(formatEther(faucetInfo.payout));
   });
 
   setToast({