refactor: move timeout context used for transfer to handler

Ario2mahb · Sep 16, 2021 · 2b2beba · 2b2beba
1 parent ff28ddd
commit 2b2beba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/server/limiter.go b/internal/server/limiter.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"context"
 	"fmt"
 	"net"
 	"net/http"
@@ -50,10 +49,7 @@ func (l *Limiter) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.Ha
 	l.cache.SetWithTTL(clintIP, true, l.ttl)
 	l.mutex.Unlock()
 
-	ctx, cancel := context.WithTimeout(r.Context(), 3*time.Second)
-	defer cancel()
-
-	next.ServeHTTP(w, r.WithContext(ctx))
+	next.ServeHTTP(w, r)
 	if w.(negroni.ResponseWriter).Status() != http.StatusOK {
 		l.cache.Remove(address)
 		l.cache.Remove(clintIP)

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -103,7 +103,9 @@ func (s *Server) handleClaim() http.HandlerFunc {
 			return
 		}
 
-		txHash, err := s.Transfer(r.Context(), address, s.cfg.payout)
+		ctx, cancel := context.WithTimeout(r.Context(), 3*time.Second)
+		defer cancel()
+		txHash, err := s.Transfer(ctx, address, s.cfg.payout)
 		s.sem.Release(1)
 		if err != nil {
 			log.WithError(err).Error("Failed to send transaction")