Fix: handle DAMode

Author: aopoltorzhicky

pkg/data/da_mode.go

@@ -0,0 +1,11 @@
+package data
+
+// swagger:enum DAMode
+/*
+	ENUM(
+		L1,
+		L2
+	)
+*/
+//go:generate go-enum --marshal --sql --values
+type DAMode string

pkg/data/da_mode_enum.go

@@ -0,0 +1,59 @@
+package data
+
+import (
+	"testing"
+
+	"github.com/goccy/go-json"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDAMode_UnmarshalJSON(t *testing.T) {
+	tests := []struct {
+		name    string
+		want    DAMode
+		text    []byte
+		wantErr bool
+	}{
+		{
+			name: "test 1",
+			want: DAModeL1,
+			text: []byte(`{"mode":0}`),
+		}, {
+			name: "test 2",
+			want: DAModeL2,
+			text: []byte(`{"mode":1}`),
+		}, {
+			name: "test 3",
+			want: DAModeL1,
+			text: []byte(`{"mode":"L1"}`),
+		}, {
+			name: "test 4",
+			want: DAModeL2,
+			text: []byte(`{"mode":"L2"}`),
+		}, {
+			name:    "test 5",
+			text:    []byte(`{"mode":10}`),
+			wantErr: true,
+		}, {
+			name:    "test 6",
+			text:    []byte(`{"mode":"10"}`),
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			type buf struct {
+				Mode DAMode `json:"mode"`
+			}
+			var x buf
+			err := json.Unmarshal(tt.text, &x)
+
+			if tt.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tt.want, x.Mode)
+			}
+		})
+	}
+}

pkg/data/da_mode_enum_test.go

@@ -13,8 +13,8 @@ type Invoke struct {
 	EntrypointSelector        Felt            `json:"entry_point_selector"`
 	SenderAddress             Felt            `json:"sender_address"`
 	ChainId                   Felt            `json:"chain_id"`
-	FeeDataAvailabilityMode   uint64          `json:"fee_data_availability_mode"`
-	NonceDataAvailabilityMode uint64          `json:"nonce_data_availability_mode"`
+	FeeDataAvailabilityMode   DAMode          `json:"fee_data_availability_mode"`
+	NonceDataAvailabilityMode DAMode          `json:"nonce_data_availability_mode"`
 	ResourceBounds            *ResourceBounds `json:"resource_bounds,omitempty"`
 	Tip                       Felt            `json:"tip"`
 	Signature                 []string        `json:"signature"`
@@ -71,8 +71,8 @@ type Declare struct {
 	CompiledClassHash         Felt     `json:"compiled_class_hash,omitempty"`
 	AccountDeploymentData     []Felt   `json:"account_deployment_data"`
 	ChainId                   Felt     `json:"chain_id"`
-	FeeDataAvailabilityMode   uint64   `json:"fee_data_availability_mode"`
-	NonceDataAvailabilityMode uint64   `json:"nonce_data_availability_mode"`
+	FeeDataAvailabilityMode   DAMode   `json:"fee_data_availability_mode"`
+	NonceDataAvailabilityMode DAMode   `json:"nonce_data_availability_mode"`
 	PayMasterData             []Felt   `json:"paymaster_data"`
 	Tip                       Felt     `json:"tip"`
 }
@@ -132,8 +132,8 @@ type DeployAccount struct {
 	ConstructorCalldata       []string `json:"constructor_calldata"`
 	Signature                 []string `json:"signature"`
 	ChainId                   Felt     `json:"chain_id"`
-	FeeDataAvailabilityMode   uint64   `json:"fee_data_availability_mode"`
-	NonceDataAvailabilityMode uint64   `json:"nonce_data_availability_mode"`
+	FeeDataAvailabilityMode   DAMode   `json:"fee_data_availability_mode"`
+	NonceDataAvailabilityMode DAMode   `json:"nonce_data_availability_mode"`
 	PayMasterData             []Felt   `json:"paymaster_data"`
 	Tip                       Felt     `json:"tip"`
 }