Fix bug in r2 client

forta-network · Mar 22, 2024 · a3e1af6 · a3e1af6
1 parent c3cb446
commit a3e1af6
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/clients/blocksdata/r2_client.go b/clients/blocksdata/r2_client.go
@@ -21,16 +21,14 @@ var (
 )
 
 type blocksDataClient struct {
-	dispatcherURL  *url.URL
-	dispatcherPath string
+	dispatcherURL *url.URL
 }
 
 func NewBlocksDataClient(dispatcherURL string) *blocksDataClient {
 	u, _ := url.Parse(dispatcherURL)
 
 	return &blocksDataClient{
-		dispatcherURL:  u,
-		dispatcherPath: u.Path,
+		dispatcherURL: u,
 	}
 }
 
@@ -41,7 +39,7 @@ type PresignedURLItem struct {
 }
 
 func (c *blocksDataClient) GetBlocksData(bucket int64) (_ *protocol.BlocksData, err error) {
-	c.dispatcherURL.Path, err = url.JoinPath(c.dispatcherPath, fmt.Sprintf("%d", bucket))
+	dispatcherUrl, err := url.JoinPath(c.dispatcherURL.String(), fmt.Sprintf("%d", bucket))
 	if err != nil {
 		return nil, err
 	}
@@ -53,7 +51,7 @@ func (c *blocksDataClient) GetBlocksData(bucket int64) (_ *protocol.BlocksData,
 	var item PresignedURLItem
 
 	err = backoff.Retry(func() error {
-		resp, err := httpclient.Default.Get(c.dispatcherURL.String())
+		resp, err := httpclient.Default.Get(dispatcherUrl)
 		if err != nil {
 			return err
 		}