eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-08-23 19:48:12 +02:00
Code Releases Activity

move channel stuffs from internal/redis to transport.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-01-13 13:38:04 +01:00
parent d0782c3c7c
commit b22118898d
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.go
View file

@ -44,7 +44,7 @@ var abi_mgr *abi.AbiManager
var publisher transport.Publisher var publisher transport.Publisher
var redisNs redis.Namespace var redisNs transport.Namespace
// Reader states // Reader states
const ( const (
@ -240,7 +240,7 @@ func main() {
// Init Abi cache // Init Abi cache
abi_mgr = abi.NewAbiManager(eosClient, conf.Redis.CacheID) abi_mgr = abi.NewAbiManager(eosClient, conf.Redis.CacheID)
redisNs = redis.Namespace{ redisNs = transport.Namespace{
Prefix: conf.Redis.Prefix, Prefix: conf.Redis.Prefix,
ChainID: chainInfo.ChainID.String(), ChainID: chainInfo.ChainID.String(),
} }

20
ship_processor.go
View file

@ -6,7 +6,7 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"eosio-ship-trace-reader/internal/redis" "eosio-ship-trace-reader/transport"
"github.com/eoscanada/eos-go" "github.com/eoscanada/eos-go"
"github.com/eoscanada/eos-go/ship" "github.com/eoscanada/eos-go/ship"
) )
@ -34,7 +34,7 @@ func encodeMessage(v interface{}) ([]byte, bool) {
return payload, true return payload, true
} }
func queueMessage(channel redis.ChannelInterface, payload []byte) bool { func queueMessage(channel transport.ChannelInterface, payload []byte) bool {
key := redisNs.NewKey(channel) key := redisNs.NewKey(channel)
err := publisher.Publish(key.String(), payload) err := publisher.Publish(key.String(), payload)
if err != nil { if err != nil {
@ -44,7 +44,7 @@ func queueMessage(channel redis.ChannelInterface, payload []byte) bool {
return true return true
} }
func encodeQueue(channel redis.ChannelInterface, v interface{}) bool { func encodeQueue(channel transport.ChannelInterface, v interface{}) bool {
if payload, ok := encodeMessage(v); ok { if payload, ok := encodeMessage(v); ok {
if queueMessage(channel, payload) { if queueMessage(channel, payload) {
return true return true
@ -65,7 +65,7 @@ func processBlock(block *ship.GetBlocksResultV0) {
HeadBlockNum: block.Head.BlockNum, HeadBlockNum: block.Head.BlockNum,
} }
encodeQueue(redis.HeartbeatChannel, hb) encodeQueue(transport.HeartbeatChannel, hb)
err := publisher.Flush() err := publisher.Flush()
if err != nil { if err != nil {
@ -77,7 +77,7 @@ func processBlock(block *ship.GetBlocksResultV0) {
func processTraces(traces []*ship.TransactionTraceV0) { func processTraces(traces []*ship.TransactionTraceV0) {
for _, trace := range traces { for _, trace := range traces {
encodeQueue(redis.TransactionChannel, trace) encodeQueue(transport.TransactionChannel, trace)
// Actions // Actions
for _, actionTraceVar := range trace.ActionTraces { for _, actionTraceVar := range trace.ActionTraces {
@ -107,11 +107,11 @@ func processTraces(traces []*ship.TransactionTraceV0) {
continue continue
} }
channels := []redis.ChannelInterface{ channels := []transport.ChannelInterface{
redis.ActionChannel{}, transport.ActionChannel{},
redis.ActionChannel{Action: string(act.Action)}, transport.ActionChannel{Action: string(act.Action)},
redis.ActionChannel{Contract: string(act.Contract)}, transport.ActionChannel{Contract: string(act.Contract)},
redis.ActionChannel{Action: string(act.Action), Contract: string(act.Contract)}, transport.ActionChannel{Action: string(act.Action), Contract: string(act.Contract)},
} }
for _, channel := range channels { for _, channel := range channels {

2
internal/redis/channel.go → transport/channel.go
View file

@ -1,4 +1,4 @@
package redis package transport
import ( import (
"strings" "strings"

2
internal/redis/channel_test.go → transport/channel_test.go
View file

@ -1,4 +1,4 @@
package redis package transport
import ( import (
"reflect" "reflect"

2
internal/redis/key.go → transport/key.go
View file

@ -1,4 +1,4 @@
package redis package transport
import ( import (
"fmt" "fmt"

2
internal/redis/key_test.go → transport/key_test.go
View file

@ -1,4 +1,4 @@
package redis package transport
import "testing" import "testing"

2
internal/redis/namespace.go → transport/namespace.go
View file

@ -1,4 +1,4 @@
package redis package transport
import ( import (
"strings" "strings"

2
internal/redis/namespace_test.go → transport/namespace_test.go
View file

@ -1,4 +1,4 @@
package redis package transport
import "testing" import "testing"