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

jsontime: use struct tags instead of setting default format.

Browse source 
Some other package (antelope-go in this case) also sets the default
format and therefore it clashes with our code.
This commit is contained in:
Henrik Hautakoski 2024-06-22 16:19:48 +02:00
parent a2f8c3dc7c
commit 5b02dfa53f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/message/json/codec.go
View file

@ -18,7 +18,8 @@ func createCodec() message.Codec {
func init() { func init() {
// Set timeformat used by SHIP api // Set timeformat used by SHIP api
jsontime.SetDefaultTimeFormat("2006-01-02T15:04:05.000", time.UTC) jsontime.AddTimeFormatAlias("ship", "2006-01-02T15:04:05.000")
jsontime.AddLocaleAlias("ship", time.UTC)
// Register the json codec. // Register the json codec.
message.RegisterCodec("json", createCodec()) message.RegisterCodec("json", createCodec())

6
api/message/types.go
View file

@ -24,7 +24,7 @@ type AccountAuthSequence struct {
type TransactionTrace struct { type TransactionTrace struct {
ID string `json:"id" msgpack:"id"` ID string `json:"id" msgpack:"id"`
BlockNum uint32 `json:"blocknum" msgpack:"blocknum"` BlockNum uint32 `json:"blocknum" msgpack:"blocknum"`
Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp"` Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp" time_format:"ship" time_location:"ship"`
Status string `json:"status" msgpack:"status"` Status string `json:"status" msgpack:"status"`
CPUUsageUS uint32 `json:"cpu_usage_us" msgpack:"cpu_usage_us"` CPUUsageUS uint32 `json:"cpu_usage_us" msgpack:"cpu_usage_us"`
NetUsageWords uint32 `json:"net_usage_words" msgpack:"net_usage_words"` NetUsageWords uint32 `json:"net_usage_words" msgpack:"net_usage_words"`
@ -54,7 +54,7 @@ type ActionTrace struct {
BlockNum uint32 `json:"blocknum" msgpack:"blocknum"` BlockNum uint32 `json:"blocknum" msgpack:"blocknum"`
Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp"` Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp" time_format:"ship" time_location:"ship"`
Receipt *ActionReceipt `json:"receipt,omitempty" msgpack:"receipt"` Receipt *ActionReceipt `json:"receipt,omitempty" msgpack:"receipt"`
@ -96,7 +96,7 @@ type TableDeltaRow struct {
type TableDelta struct { type TableDelta struct {
BlockNum uint32 `json:"blocknum" msgpack:"blocknum"` BlockNum uint32 `json:"blocknum" msgpack:"blocknum"`
Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp"` Timestamp time.Time `json:"blocktimestamp" msgpack:"blocktimestamp" time_format:"ship" time_location:"ship"`
Name string `json:"name" msgpack:"name"` Name string `json:"name" msgpack:"name"`
Rows []TableDeltaRow `json:"rows" msgpack:"rows"` Rows []TableDeltaRow `json:"rows" msgpack:"rows"`
} }