Skip to content

Commit 8b0195e

Browse files
qubicmioqubicmio
committed
Adapt to index changes
* Rename type to logType. * Remove emitting contract index. * Remove contract index burned for.
1 parent 9f8e74e commit 8b0195e

File tree

12 files changed

+72
-85
lines changed

12 files changed

+72
-85
lines changed

‎v2/api/archive-query-service/v2/messages.pb.go‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/api/archive-query-service/v2/messages.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ message AssetPossessionChangeData {
251251
message BurningData {
252252
string source = 1;
253253
uint64 amount = 2;
254-
uint64 contract_index_burned_for = 3;
254+
uint64 contract_index = 3;
255255
}
256256

257257
// ContractReserveDeductionData contains fields specific to contract reserve deduction events (type 13).
@@ -262,7 +262,7 @@ message ContractReserveDeductionData {
262262
}
263263

264264
message SmartContractMessageData {
265-
uint64 emitting_contract_index = 1;
265+
uint64 contract_index = 1;
266266
uint64 contract_message_type = 2;
267267
}
268268

‎v2/api/archive-query-service/v2/query_services.openapi.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ components:
375375
type: string
376376
amount:
377377
type: string
378-
contractIndexBurnedFor:
378+
contractIndex:
379379
type: string
380380
description: BurningData contains fields specific to burning events (type 8).
381381
ComputorList:
@@ -773,7 +773,7 @@ components:
773773
SmartContractMessageData:
774774
type: object
775775
properties:
776-
emittingContractIndex:
776+
contractIndex:
777777
type: string
778778
contractMessageType:
779779
type: string

‎v2/domain/repository/elastic/events.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type event struct {
2929
TransactionHash *string `json:"transactionHash"` // not all events belong to a transaction
3030
LogID uint64 `json:"logId"`
3131
LogDigest string `json:"logDigest"`
32-
Type uint32 `json:"type"`
32+
LogType uint32 `json:"logType"`
3333
Categories []int32 `json:"categories"` // not all events have categories
3434
Source string `json:"source"`
3535
Destination string `json:"destination"`
@@ -43,13 +43,11 @@ type event struct {
4343
DeductedAmount uint64 `json:"deductedAmount"`
4444
RemainingAmount int64 `json:"remainingAmount"`
4545
ContractIndex uint64 `json:"contractIndex"`
46-
ContractIndexBurnedFor uint64 `json:"contractIndexBurnedFor"`
4746
Possessor string `json:"possessor"`
4847
Owner string `json:"owner"`
4948
SourceContractIndex uint64 `json:"sourceContractIndex"`
5049
DestinationContractIndex uint64 `json:"destinationContractIndex"`
5150
CustomMessage uint64 `json:"customMessage"`
52-
EmittingContractIndex uint64 `json:"emittingContractIndex"`
5351
ContractMessageType uint64 `json:"contractMessageType"`
5452
RawPayload []byte `json:"rawPayload"` // not all events have raw payload
5553
}

‎v2/domain/repository/elastic/events_integration_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var testEvent1 = event{
2828
TransactionHash: test.ToStringPointer("txhash1"),
2929
LogID: 1,
3030
LogDigest: "digest1",
31-
Type: 0,
31+
LogType: 0,
3232
Source: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFXIB",
3333
Destination: "BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARMID",
3434
Amount: 1000,
@@ -41,7 +41,7 @@ var testEvent2 = event{
4141
TransactionHash: test.ToStringPointer("txhash2"),
4242
LogID: 2,
4343
LogDigest: "digest2",
44-
Type: 1,
44+
LogType: 1,
4545
Categories: []int32{1},
4646
Source: "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
4747
Destination: "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD",
@@ -55,7 +55,7 @@ var testEvent3 = event{
5555
TransactionHash: test.ToStringPointer("txhash1"),
5656
LogID: 3,
5757
LogDigest: "digest3",
58-
Type: 2,
58+
LogType: 2,
5959
AssetName: "QX",
6060
AssetIssuer: "ISSUER",
6161
NumberOfShares: 500,
@@ -68,7 +68,7 @@ var testEvent4 = event{
6868
TransactionHash: test.ToStringPointer("txhash3"),
6969
LogID: 4,
7070
LogDigest: "digest4",
71-
Type: 3,
71+
LogType: 3,
7272
Source: "BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARMID",
7373
Destination: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFXIB",
7474
NumberOfShares: 666,
@@ -80,7 +80,7 @@ var testEvent5 = event{
8080
Timestamp: 1700000005,
8181
TransactionHash: test.ToStringPointer("txhash4"),
8282
LogID: 5,
83-
Type: 8,
83+
LogType: 8,
8484
}
8585

8686
var testEvent6 = event{
@@ -89,7 +89,7 @@ var testEvent6 = event{
8989
Timestamp: 1700000006,
9090
TransactionHash: test.ToStringPointer("txhash5"),
9191
LogID: 6,
92-
Type: 13,
92+
LogType: 13,
9393
}
9494

9595
type eventsSuite struct {

‎v2/domain/repository/elastic/events_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func Test_createEventsQuery_withTickNumber(t *testing.T) {
8787
assert.Equal(t, "42", termFilter["tickNumber"])
8888
}
8989

90-
func Test_createEventsQuery_withEventType(t *testing.T) {
90+
func Test_createEventsQuery_withLogType(t *testing.T) {
9191
filters := map[string][]string{
9292
"logType": {"1"},
9393
}
@@ -106,9 +106,8 @@ func Test_createEventsQuery_withEventType(t *testing.T) {
106106
filterArr := boolQuery["filter"].([]any)
107107
require.Len(t, filterArr, 1)
108108

109-
// eventType should map to ES field "type"
110109
termFilter := filterArr[0].(map[string]any)["term"].(map[string]any)
111-
assert.Equal(t, "1", termFilter["type"])
110+
assert.Equal(t, "1", termFilter["logType"])
112111
}
113112

114113
func Test_createEventsQuery_withMultipleFilters(t *testing.T) {

‎v2/domain/repository/elastic/filter_helpers.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ func getFilterStrings(filters map[string][]string) []string {
1515
filterStrings := make([]string, 0, len(filters))
1616
for _, k := range keys {
1717
esField := k
18-
if k == "logType" {
19-
esField = "type"
20-
}
2118
if len(filters[k]) > 1 {
2219
filterStrings = append(filterStrings, fmt.Sprintf(`{"terms":{"%s":["%s"]}}`, esField, strings.Join(filters[k], `","`)))
2320
} else if len(filters[k]) == 1 {
@@ -32,9 +29,6 @@ func getRangeFilterStrings(ranges map[string][]entities.Range) ([]string, error)
3229
keys := getSortedKeys(ranges) // sort for a deterministic filter order
3330
for _, k := range keys {
3431
esField := k
35-
if k == "logType" {
36-
esField = "type"
37-
}
3832
rangeString, err := createRangeFilter(esField, ranges[k])
3933
if err != nil {
4034
log.Printf("error computing range filter [%s]: %v", k, ranges[k])

‎v2/domain/repository/elastic/transform.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ func eventToAPIEvent(e event) *api.Event {
6969
TransactionHash: e.TransactionHash,
7070
LogId: e.LogID,
7171
LogDigest: e.LogDigest,
72-
LogType: e.Type,
72+
LogType: e.LogType,
7373
Categories: e.Categories,
7474
}
75-
switch e.Type {
75+
switch e.LogType {
7676
case 0:
7777
ev.EventData = &api.Event_QuTransfer{QuTransfer: &api.QuTransferData{
7878
Source: e.Source, Destination: e.Destination, Amount: e.Amount,
@@ -96,12 +96,12 @@ func eventToAPIEvent(e event) *api.Event {
9696
case 4, 5, 6, 7:
9797
ev.RawPayload = e.RawPayload
9898
ev.EventData = &api.Event_SmartContractMessage{SmartContractMessage: &api.SmartContractMessageData{
99-
EmittingContractIndex: e.EmittingContractIndex,
100-
ContractMessageType: e.ContractMessageType,
99+
ContractIndex: e.ContractIndex,
100+
ContractMessageType: e.ContractMessageType,
101101
}}
102102
case 8:
103103
ev.EventData = &api.Event_Burning{Burning: &api.BurningData{
104-
Source: e.Source, Amount: e.Amount, ContractIndexBurnedFor: e.ContractIndexBurnedFor,
104+
Source: e.Source, Amount: e.Amount, ContractIndex: e.ContractIndex,
105105
}}
106106
case 9, 10, 11, 12:
107107
ev.RawPayload = e.RawPayload

‎v2/domain/repository/elastic/transform_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func Test_eventToAPIEvent_BasicFields(t *testing.T) {
1616
TransactionHash: &txHash,
1717
LogID: 123,
1818
LogDigest: "digest",
19-
Type: 0,
19+
LogType: 0,
2020
Categories: []int32{},
2121
}
2222

@@ -28,7 +28,7 @@ func Test_eventToAPIEvent_BasicFields(t *testing.T) {
2828
assert.Equal(t, *e.TransactionHash, apiEv.GetTransactionHash())
2929
assert.Equal(t, e.LogID, apiEv.LogId)
3030
assert.Equal(t, e.LogDigest, apiEv.LogDigest)
31-
assert.Equal(t, e.Type, apiEv.LogType)
31+
assert.Equal(t, e.LogType, apiEv.LogType)
3232
assert.Equal(t, e.Categories, apiEv.Categories)
3333
}
3434

@@ -47,21 +47,21 @@ func Test_eventToAPIEvent_SmartContractMessage(t *testing.T) {
4747
for _, tt := range tests {
4848
t.Run(tt.name, func(t *testing.T) {
4949
e := event{
50-
TransactionHash: &txHash,
51-
Type: tt.logType,
52-
EmittingContractIndex: 10,
53-
ContractMessageType: 20,
54-
RawPayload: []byte{0x01, 0x02, 0x03},
50+
TransactionHash: &txHash,
51+
LogType: tt.logType,
52+
ContractIndex: 10,
53+
ContractMessageType: 20,
54+
RawPayload: []byte{0x01, 0x02, 0x03},
5555
}
5656

5757
apiEv := eventToAPIEvent(e)
5858

5959
assert.Equal(t, *e.TransactionHash, apiEv.GetTransactionHash())
60-
assert.Equal(t, e.Type, apiEv.LogType)
60+
assert.Equal(t, e.LogType, apiEv.LogType)
6161

6262
scMsg := apiEv.GetSmartContractMessage()
6363
assert.NotNil(t, scMsg)
64-
assert.Equal(t, e.EmittingContractIndex, scMsg.EmittingContractIndex)
64+
assert.Equal(t, e.ContractIndex, scMsg.ContractIndex)
6565
assert.Equal(t, e.ContractMessageType, scMsg.ContractMessageType)
6666
assert.Equal(t, e.RawPayload, apiEv.RawPayload) // set for smart contract messages
6767
})
@@ -70,13 +70,13 @@ func Test_eventToAPIEvent_SmartContractMessage(t *testing.T) {
7070

7171
func Test_eventToAPIEvent_CustomMessage(t *testing.T) {
7272
e := event{
73-
Type: 255,
73+
LogType: 255,
7474
CustomMessage: 6217575821008262227,
7575
}
7676

7777
apiEv := eventToAPIEvent(e)
7878

79-
assert.Equal(t, e.Type, apiEv.LogType)
79+
assert.Equal(t, e.LogType, apiEv.LogType)
8080

8181
customMsg := apiEv.GetCustomMessage()
8282
require.NotNil(t, customMsg)
@@ -97,13 +97,13 @@ func Test_eventToAPIEvent_RawTypes(t *testing.T) {
9797
for _, tt := range tests {
9898
t.Run(tt.name, func(t *testing.T) {
9999
e := event{
100-
Type: tt.logType,
100+
LogType: tt.logType,
101101
RawPayload: []byte{0x01, 0x02, 0x03, 0x04},
102102
}
103103

104104
apiEv := eventToAPIEvent(e)
105105

106-
assert.Equal(t, e.Type, apiEv.LogType)
106+
assert.Equal(t, e.LogType, apiEv.LogType)
107107
assert.Equal(t, e.RawPayload, apiEv.RawPayload)
108108
assert.Nil(t, apiEv.EventData) // no specific event data for these types
109109
})

‎v2/test/http_server_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func (s *HTTPServerTestSuite) TestHTTP_GetEvents_Type8_Burning() {
225225
Epoch: 101, TickNumber: 16001, LogType: 8,
226226
TransactionHash: ToStringPointer("txhash5"), LogId: 5, LogDigest: "digest5",
227227
EventData: &api.Event_Burning{Burning: &api.BurningData{
228-
Source: "BURNER", Amount: 9999, ContractIndexBurnedFor: 7,
228+
Source: "BURNER", Amount: 9999, ContractIndex: 7,
229229
}},
230230
}},
231231
}, nil)
@@ -243,7 +243,7 @@ func (s *HTTPServerTestSuite) TestHTTP_GetEvents_Type8_Burning() {
243243
"logId": "5", "logDigest": "digest5", "logType": float64(8),
244244
"categories": []any{},
245245
"burning": map[string]interface{}{
246-
"source": "BURNER", "amount": "9999", "contractIndexBurnedFor": "7",
246+
"source": "BURNER", "amount": "9999", "contractIndex": "7",
247247
},
248248
}
249249
if diff := cmp.Diff(expected, ev); diff != "" {
@@ -303,7 +303,7 @@ func (s *HTTPServerTestSuite) TestHTTP_GetEvents_MixedTypes() {
303303
Epoch: 100, TickNumber: 15001, LogType: 8,
304304
TransactionHash: ToStringPointer("tx2"), LogId: 2, LogDigest: "d2",
305305
EventData: &api.Event_Burning{Burning: &api.BurningData{
306-
Source: "C", Amount: 200, ContractIndexBurnedFor: 1,
306+
Source: "C", Amount: 200, ContractIndex: 1,
307307
}},
308308
},
309309
{
@@ -345,7 +345,7 @@ func (s *HTTPServerTestSuite) TestHTTP_GetEvents_MixedTypes() {
345345
"logId": "2", "logDigest": "d2", "logType": float64(8),
346346
"categories": []any{},
347347
"burning": map[string]interface{}{
348-
"source": "C", "amount": "200", "contractIndexBurnedFor": "1",
348+
"source": "C", "amount": "200", "contractIndex": "1",
349349
},
350350
}
351351
if diff := cmp.Diff(expected1, ev1); diff != "" {

0 commit comments

Comments
 (0)