diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 64a565b..5c07b87 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -1,7 +1,6 @@ services: nats: image: nats:2 - restart: unless-stopped command: -js -sd /tmp/nats/data -m 8222 ports: - 127.0.0.1:4222:4222 diff --git a/internal/handler/faucet_give.go b/internal/handler/faucet_give.go index 7e301ff..e04371f 100644 --- a/internal/handler/faucet_give.go +++ b/internal/handler/faucet_give.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/index_add.go b/internal/handler/index_add.go index 6dc83c7..139e905 100644 --- a/internal/handler/index_add.go +++ b/internal/handler/index_add.go @@ -5,8 +5,8 @@ import ( "github.com/celo-org/celo-blockchain/common" "github.com/grassrootseconomics/celo-tracker/internal/cache" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/index_remove.go b/internal/handler/index_remove.go index 9c7b37e..090e5e6 100644 --- a/internal/handler/index_remove.go +++ b/internal/handler/index_remove.go @@ -5,8 +5,8 @@ import ( "github.com/celo-org/celo-blockchain/common" "github.com/grassrootseconomics/celo-tracker/internal/cache" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/ownership.go b/internal/handler/ownership.go index 4710466..2e23b46 100644 --- a/internal/handler/ownership.go +++ b/internal/handler/ownership.go @@ -4,8 +4,8 @@ import ( "context" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/pool_deposit.go b/internal/handler/pool_deposit.go index 5acea19..b66302a 100644 --- a/internal/handler/pool_deposit.go +++ b/internal/handler/pool_deposit.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/pool_swap.go b/internal/handler/pool_swap.go index e3247f1..87cae07 100644 --- a/internal/handler/pool_swap.go +++ b/internal/handler/pool_swap.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/quoter_price.go b/internal/handler/quoter_price.go index a03c859..4385ce0 100644 --- a/internal/handler/quoter_price.go +++ b/internal/handler/quoter_price.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/seal.go b/internal/handler/seal.go index 3a98e38..b94d5a4 100644 --- a/internal/handler/seal.go +++ b/internal/handler/seal.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/token_burn.go b/internal/handler/token_burn.go index da0330e..d5fa847 100644 --- a/internal/handler/token_burn.go +++ b/internal/handler/token_burn.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/token_mint.go b/internal/handler/token_mint.go index 1572447..0f9b62f 100644 --- a/internal/handler/token_mint.go +++ b/internal/handler/token_mint.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/handler/token_transfer.go b/internal/handler/token_transfer.go index 7372105..f3e7a03 100644 --- a/internal/handler/token_transfer.go +++ b/internal/handler/token_transfer.go @@ -5,8 +5,8 @@ import ( "math/big" "github.com/celo-org/celo-blockchain/common" - "github.com/grassrootseconomics/celo-tracker/internal/event" "github.com/grassrootseconomics/celo-tracker/internal/pub" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/grassrootseconomics/w3-celo" ) diff --git a/internal/pub/console.go b/internal/pub/console.go index 31f4806..c7638ff 100644 --- a/internal/pub/console.go +++ b/internal/pub/console.go @@ -4,7 +4,7 @@ import ( "context" "log/slog" - "github.com/grassrootseconomics/celo-tracker/internal/event" + "github.com/grassrootseconomics/celo-tracker/pkg/event" ) type ( diff --git a/internal/pub/jetstream.go b/internal/pub/jetstream.go index 4b610c2..757e9d4 100644 --- a/internal/pub/jetstream.go +++ b/internal/pub/jetstream.go @@ -7,7 +7,7 @@ import ( "log/slog" "time" - "github.com/grassrootseconomics/celo-tracker/internal/event" + "github.com/grassrootseconomics/celo-tracker/pkg/event" "github.com/nats-io/nats.go" ) diff --git a/internal/pub/pub.go b/internal/pub/pub.go index 5ad9c51..cd3b03f 100644 --- a/internal/pub/pub.go +++ b/internal/pub/pub.go @@ -3,7 +3,7 @@ package pub import ( "context" - "github.com/grassrootseconomics/celo-tracker/internal/event" + "github.com/grassrootseconomics/celo-tracker/pkg/event" ) type ( diff --git a/internal/event/event.go b/pkg/event/event.go similarity index 76% rename from internal/event/event.go rename to pkg/event/event.go index f62dd27..b7f6d4a 100644 --- a/internal/event/event.go +++ b/pkg/event/event.go @@ -22,3 +22,15 @@ func (e Event) Serialize() ([]byte, error) { return jsonData, err } + +func Deserialize(jsonData []byte) (Event, error) { + var ( + event Event + ) + + if err := json.Unmarshal(jsonData, &event); err != nil { + return event, err + } + + return event, nil +}