Merge pull request #1 from archway-network/fix-faucet-limits-implemen…

…tation fix(faucet): Faucet should not transfer funds after throwing quota errors
archway-network · Dec 9, 2022 · 99683b5 · 99683b5
2 parents 58481da + 17c3c69
commit 99683b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/faucet/cosmosfaucet.go b/pkg/faucet/cosmosfaucet.go
@@ -50,7 +50,7 @@ func (f Faucet) ValidateRequest(req TransferRequest) error {
 	for _, coin := range req.Coins {
 		if _, ok := f.MaxCoinsPerAccount[coin.Denom]; ok {
 			if coin.Amount.GT(f.MaxCoinsPerRequest[coin.Denom]) {
-				return fmt.Errorf("%s is greater than max allowed per request of %s%s", coin.String(), f.MaxCoinsPerRequest[coin.Denom].String(), coin.Amount.String())
+				return fmt.Errorf("%s is greater than max allowed per request of %s%s", coin.String(), coin.Denom, f.MaxCoinsPerRequest[coin.Denom].String())
 			}
 		} else {
 			return fmt.Errorf("Faucet not allowed to distribute %s", coin.Denom)

diff --git a/pkg/faucet/server.go b/pkg/faucet/server.go
@@ -64,6 +64,7 @@ func (f Faucet) faucetHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		responseError(w, http.StatusInternalServerError, err)
+		return
 	}
 
 	// try performing the transfer
-Original file line number
+Diff line change
@@ Expand Up @@
     			return
     		}
     		responseError(w, http.StatusInternalServerError, err)
+    		return
     	}
     	// try performing the transfer
@@ Expand Down @@