From 81efe25ba2edc3a28013af376e27dca2751acd84 Mon Sep 17 00:00:00 2001 From: harsh-98 Date: Sun, 3 Mar 2024 09:46:04 +0400 Subject: [PATCH] feat: log for messages --- models/pool/pool_v3/get_details.go | 1 - services/trace_service/tenderly_fetcher.go | 24 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/models/pool/pool_v3/get_details.go b/models/pool/pool_v3/get_details.go index 4e4cf980..654eb2f8 100644 --- a/models/pool/pool_v3/get_details.go +++ b/models/pool/pool_v3/get_details.go @@ -81,7 +81,6 @@ func (mdl *Poolv3) setZapper() { // TODO ? why is eth address not set in tokens // ETHAddr = syms.Tokens["ETH"] ETHAddr = common.HexToAddress("0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") - log.Info(ETHAddr) } // out = farmedUSDCv3, dUSDCv3 diff --git a/services/trace_service/tenderly_fetcher.go b/services/trace_service/tenderly_fetcher.go index ebfc043b..625afac4 100644 --- a/services/trace_service/tenderly_fetcher.go +++ b/services/trace_service/tenderly_fetcher.go @@ -1,9 +1,10 @@ package trace_service import ( + "bytes" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "strings" "time" @@ -44,6 +45,15 @@ type TenderlyTrace struct { BlockNumber int64 `json:"block_number"` } +func readAndGetReader(a io.Reader) ([]byte, error) { + b := bytes.NewBuffer(nil) + _, err := b.ReadFrom(a) + if err != nil { + return nil, err + } + str := b.Bytes() + return str, nil +} func (ep *TenderlyFetcher) getData(txHash string) (*TenderlyTrace, error) { link := fmt.Sprintf("https://api.tenderly.co/api/v1/public-contract/%d/trace/%s", ep.ChainId, txHash) req, _ := http.NewRequest(http.MethodGet, link, nil) @@ -51,14 +61,14 @@ func (ep *TenderlyFetcher) getData(txHash string) (*TenderlyTrace, error) { if err != nil { log.Fatal(err) } - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Fatal(err) - } + msg, err := readAndGetReader(resp.Body) + log.CheckFatal(err) trace := &TenderlyTrace{} - err = json.Unmarshal(body, trace) + + err = json.Unmarshal(msg, trace) if err != nil { - log.Fatal(err, " for ", txHash) + log.Info(string(msg)) + log.Fatal(err, " for ", link) return nil, err } return trace, nil