From 2d5e41eb8149bff9bb44a5caa744861da7b83eeb Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Tue, 28 Mar 2023 06:24:28 +0000 Subject: [PATCH] chore: cleanup unecessary checksum fn --- internal/sub/handler.go | 2 +- internal/sub/js_sub.go | 6 +++--- internal/sub/util.go | 31 ------------------------------- 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 internal/sub/util.go diff --git a/internal/sub/handler.go b/internal/sub/handler.go index 5d656f6..ea487f1 100644 --- a/internal/sub/handler.go +++ b/internal/sub/handler.go @@ -23,7 +23,7 @@ func (s *Sub) handler(ctx context.Context, msg *nats.Msg) error { switch msg.Subject { case "CHAIN.gas": - if err := s.cu.PgStore.ResetGasQuota(ctx, checksum(chainEvent.To)); err != nil { + if err := s.cu.PgStore.ResetGasQuota(ctx, chainEvent.To); err != nil { return err } } diff --git a/internal/sub/js_sub.go b/internal/sub/js_sub.go index 29a45a8..095a501 100644 --- a/internal/sub/js_sub.go +++ b/internal/sub/js_sub.go @@ -83,10 +83,10 @@ func (s *Sub) Process() error { if err := s.handler(ctx, msg); err != nil { s.logg.Error("sub: handler error", "error", err) msg.Nak() - } else { - s.logg.Debug("sub: processed msg", "subject", msg.Subject) - msg.Ack() } + + s.logg.Debug("sub: processed msg", "subject", msg.Subject) + msg.Ack() cancel() } } diff --git a/internal/sub/util.go b/internal/sub/util.go deleted file mode 100644 index 1b1e625..0000000 --- a/internal/sub/util.go +++ /dev/null @@ -1,31 +0,0 @@ -package sub - -import ( - "encoding/hex" - "strconv" - "strings" - - "golang.org/x/crypto/sha3" -) - -// TODO: This should probably be used project wide -func checksum(address string) string { - address = strings.ToLower(address) - address = strings.Replace(address, "0x", "", 1) - - sha := sha3.NewLegacyKeccak256() - sha.Write([]byte(address)) - hash := sha.Sum(nil) - hashstr := hex.EncodeToString(hash) - result := []string{"0x"} - for i, v := range address { - res, _ := strconv.ParseInt(string(hashstr[i]), 16, 64) - if res > 7 { - result = append(result, strings.ToUpper(string(v))) - continue - } - result = append(result, string(v)) - } - - return strings.Join(result, "") -}