From aeac190c947ec45133f06fc6586553c488c6eae7 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 7 Mar 2024 18:09:14 +0100 Subject: [PATCH] Minor fixes. --- api/client.go | 14 +++++++------- cmd/thalos/server.go | 7 +++---- cmd/tools/bench.go | 2 +- cmd/tools/redis-acl.go | 2 +- cmd/tools/validate.go | 2 +- internal/server/ship_processor.go | 8 ++++---- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/api/client.go b/api/client.go index ad9a3d5..9157af0 100644 --- a/api/client.go +++ b/api/client.go @@ -109,19 +109,19 @@ func (c *Client) hbHandler(payload []byte) { } func (c *Client) sub(channel Channel) error { - var handler handler + var h handler switch channel.Type() { case RollbackChannel.Type(): - handler = c.rollbackHandler + h = c.rollbackHandler case TransactionChannel.Type(): - handler = c.transactionHandler + h = c.transactionHandler case HeartbeatChannel.Type(): - handler = c.hbHandler + h = c.hbHandler case ActionChannel{}.Channel().Type(): - handler = c.actHandler + h = c.actHandler case TableDeltaChannel{}.Channel().Type(): - handler = c.tableDeltaHandler + h = c.tableDeltaHandler default: return fmt.Errorf("invalid channel type. %s", channel.Type()) } @@ -130,7 +130,7 @@ func (c *Client) sub(channel Channel) error { c.wg.Add(1) go func() { defer c.wg.Done() - c.worker(channel, handler) + c.worker(channel, h) }() return nil diff --git a/cmd/thalos/server.go b/cmd/thalos/server.go index 683bbe5..712cc45 100644 --- a/cmd/thalos/server.go +++ b/cmd/thalos/server.go @@ -23,7 +23,6 @@ import ( api_redis "github.com/eosswedenorg/thalos/api/redis" "github.com/eosswedenorg/thalos/internal/abi" "github.com/eosswedenorg/thalos/internal/cache" - . "github.com/eosswedenorg/thalos/internal/cache" "github.com/eosswedenorg/thalos/internal/config" driver "github.com/eosswedenorg/thalos/internal/driver/redis" . "github.com/eosswedenorg/thalos/internal/log" @@ -157,7 +156,7 @@ func LogLevels() []string { } func initAbiManager(api *eos.API, store cache.Store, chain_id string) *abi.AbiManager { - cache := NewCache("thalos::cache::abi::"+chain_id, store) + cache := cache.NewCache("thalos::cache::abi::"+chain_id, store) return abi.NewAbiManager(cache, api) } @@ -373,14 +372,14 @@ func serverCmd(cmd *cobra.Command, args []string) { } // Setup cache storage - cacheStore := NewRedisStore(&redis_cache.Options{ + cacheStore := cache.NewRedisStore(&redis_cache.Options{ Redis: rdb, // Cache 10k keys for 10 minutes. LocalCache: redis_cache.NewTinyLFU(10000, 10*time.Minute), }) // Setup general cache - cache := NewCache("thalos::cache::instance::"+conf.Name, cacheStore) + cache := cache.NewCache("thalos::cache::instance::"+conf.Name, cacheStore) eosClient := eos.New(conf.Api) diff --git a/cmd/tools/bench.go b/cmd/tools/bench.go index 31af016..cb96c8d 100644 --- a/cmd/tools/bench.go +++ b/cmd/tools/bench.go @@ -22,7 +22,7 @@ var benchCmd = &cobra.Command{ Use: "bench", Short: "Run a benchmark against a thalos node", Run: func(cmd *cobra.Command, args []string) { - var counter int = 0 + counter := 0 interval, _ := cmd.Flags().GetDuration("interval") url, _ := cmd.Flags().GetString("redis-url") diff --git a/cmd/tools/redis-acl.go b/cmd/tools/redis-acl.go index 25307b1..c1c5857 100644 --- a/cmd/tools/redis-acl.go +++ b/cmd/tools/redis-acl.go @@ -96,7 +96,7 @@ var RedisACLCmd = &cobra.Command{ Short: "create a users.acl file", Run: func(cmd *cobra.Command, args []string) { var err error - var out *os.File = os.Stdout + out := os.Stdout rnd = rand.New(rand.NewSource(time.Now().UnixNano())) diff --git a/cmd/tools/validate.go b/cmd/tools/validate.go index a0de15d..5c040b6 100644 --- a/cmd/tools/validate.go +++ b/cmd/tools/validate.go @@ -81,7 +81,7 @@ var validateCmd = &cobra.Command{ log.WithError(msg).Error("Error when reading stream") case message.ActionTrace: if block_num > 0 { - var diff int32 = int32(msg.BlockNum - block_num) + diff := int32(msg.BlockNum - block_num) if diff < 0 || diff > 1 { log.WithFields(log.Fields{ "current_block": block_num, diff --git a/internal/server/ship_processor.go b/internal/server/ship_processor.go index c15c4ae..49470a6 100644 --- a/internal/server/ship_processor.go +++ b/internal/server/ship_processor.go @@ -120,7 +120,7 @@ func (processor *ShipProcessor) updateAbiFromAction(act *ship.Action) error { Abi string Account eos.AccountName }{} - if err := decode(ABI, act, &set_abi); err != nil { + if err = decode(ABI, act, &set_abi); err != nil { return err } @@ -184,7 +184,7 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { transaction := message.TransactionTrace{ ID: trace.ID.String(), BlockNum: block.Block.BlockNumber(), - Timestamp: block.Block.Timestamp.Time.UTC(), + Timestamp: block.Block.Timestamp.UTC(), Status: trace.Status.String(), CPUUsageUS: trace.CPUUsageUS, NetUsage: trace.NetUsage, @@ -230,7 +230,7 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { act := message.ActionTrace{ TxID: trace.ID.String(), BlockNum: block.Block.BlockNumber(), - Timestamp: block.Block.Timestamp.Time.UTC(), + Timestamp: block.Block.Timestamp.UTC(), Name: act_trace.Act.Name.String(), Contract: act_trace.Act.Account.String(), Receiver: act_trace.Receiver.String(), @@ -331,7 +331,7 @@ func (processor *ShipProcessor) processBlock(block *ship.GetBlocksResultV0) { message := message.TableDelta{ BlockNum: block.Block.BlockNumber(), - Timestamp: block.Block.Timestamp.Time.UTC(), + Timestamp: block.Block.Timestamp.UTC(), Name: delta.Name, Rows: rows, }