Skip to content

refactor: use reflect.TypeFor #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
box4wangjing wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: use reflect.TypeFor #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9023db3
refactor: use reflect.TypeFor
box4wangjing May 11, 2026
2033c84
Merge branch 'master' into master
semyon-dev May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions escrow/free_call_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ type FreeCallUserStorage struct {
func NewFreeCallUserStorage(atomicStorage storage.AtomicStorage) *FreeCallUserStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/free-call-user/storage")
storage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializeFreeCallKey, reflect.TypeOf(FreeCallUserKey{}), serialize, deserialize,
reflect.TypeOf(FreeCallUserData{}),
prefixedStorage, serializeFreeCallKey, reflect.TypeFor[FreeCallUserKey](), serialize, deserialize,
reflect.TypeFor[FreeCallUserData](),
)
return &FreeCallUserStorage{delegate: storage}
/* return &FreeCallUserStorage{
Expand Down
4 changes: 2 additions & 2 deletions escrow/payment_channel_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ type PaymentChannelStorage struct {
func NewPaymentChannelStorage(atomicStorage storage.AtomicStorage) *PaymentChannelStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/payment-channel/storage")
storage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializeKey, reflect.TypeOf(PaymentChannelKey{}), serialize, deserialize,
reflect.TypeOf(PaymentChannelData{}),
prefixedStorage, serializeKey, reflect.TypeFor[PaymentChannelKey](), serialize, deserialize,
reflect.TypeFor[PaymentChannelData](),
)
return &PaymentChannelStorage{delegate: storage}

Expand Down
4 changes: 2 additions & 2 deletions escrow/payment_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ type PaymentStorage struct {
func NewPaymentStorage(atomicStorage storage.AtomicStorage) *PaymentStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/payment/storage")
storage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializeKey, reflect.TypeOf(""), serialize, deserialize,
reflect.TypeOf(Payment{}),
prefixedStorage, serializeKey, reflect.TypeFor[string](), serialize, deserialize,
reflect.TypeFor[Payment](),
)
return &PaymentStorage{delegate: storage}
}
Expand Down
4 changes: 2 additions & 2 deletions escrow/prepaid_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ func serializePrePaidKey(key any) (serialized string, err error) {
func NewPrepaidStorage(atomicStorage storage.AtomicStorage) storage.TypedAtomicStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/PrePaid/storage")
storage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializePrePaidKey, reflect.TypeOf(PrePaidDataKey{}), serialize, deserialize,
reflect.TypeOf(PrePaidData{}),
prefixedStorage, serializePrePaidKey, reflect.TypeFor[PrePaidDataKey](), serialize, deserialize,
reflect.TypeFor[PrePaidData](),
)
return storage
}
8 changes: 4 additions & 4 deletions license_server/license_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,10 @@ func NewLicenseDetailsStorage(atomicStorage storage.AtomicStorage) storage.Typed
return storage.NewTypedAtomicStorageImpl(
storage.NewPrefixedAtomicStorage(atomicStorage, "LicenseDetails/storage"),
serializeLicenseDetailsKey,
reflect.TypeOf(LicenseDetailsKey{}),
reflect.TypeFor[LicenseDetailsKey](),
serializeLicenseDetailsData,
deserializeLicenseDetailsData,
reflect.TypeOf(LicenseDetailsData{}))
reflect.TypeFor[LicenseDetailsData]())
}

func serializeLicenseDetailsData(value any) (slice string, err error) {
Expand Down Expand Up @@ -396,9 +396,9 @@ func NewLicenseUsageTrackerStorage(atomicStorage storage.AtomicStorage) storage.
return storage.NewTypedAtomicStorageImpl(
storage.NewPrefixedAtomicStorage(atomicStorage, "LicenseUsageTracker/storage"),
serializeLicenseUsageTrackerKey,
reflect.TypeOf(LicenseUsageTrackerKey{}),
reflect.TypeFor[LicenseUsageTrackerKey](),
serializeLicenseTrackerData,
deserializeLicenseTrackerData,
reflect.TypeOf(LicenseUsageTrackerData{}),
reflect.TypeFor[LicenseUsageTrackerData](),
)
}
2 changes: 1 addition & 1 deletion metrics/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func TestGetEpochTime(t *testing.T) {
currentEpoch := getEpochTime()
assert.NotNil(t, currentEpoch, "Epoch must not be empty")
assert.NotEqual(t, currentEpoch, 0, "epoch msut not be zero")
assert.IsType(t, reflect.TypeOf(types.Int64), reflect.TypeOf(currentEpoch), "Epoch must be an integer")
assert.IsType(t, reflect.TypeFor[types.BasicKind](), reflect.TypeFor[int64](), "Epoch must be an integer")

// two epochs must not be equal
time.Sleep(1 * time.Second)
Expand Down
16 changes: 8 additions & 8 deletions training/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,35 +37,35 @@ type PublicModelStorage struct {
func NewUserModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *ModelUserStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/userModelStorage")
userModelStorage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializeModelUserKey, reflect.TypeOf(ModelUserKey{}), utils.Serialize, utils.Deserialize,
reflect.TypeOf(ModelUserData{}),
prefixedStorage, serializeModelUserKey, reflect.TypeFor[ModelUserKey](), utils.Serialize, utils.Deserialize,
reflect.TypeFor[ModelUserData](),
)
return &ModelUserStorage{delegate: userModelStorage, organizationMetaData: orgMetadata}
}

func NewModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *ModelStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/modelStorage")
modelStorage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializeModelKey, reflect.TypeOf(ModelKey{}), utils.Serialize, utils.Deserialize,
reflect.TypeOf(ModelData{}),
prefixedStorage, serializeModelKey, reflect.TypeFor[ModelKey](), utils.Serialize, utils.Deserialize,
reflect.TypeFor[ModelData](),
)
return &ModelStorage{delegate: modelStorage, organizationMetaData: orgMetadata}
}

func NewPendingModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *PendingModelStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/pendingModelStorage")
pendingModelStorage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializePendingModelKey, reflect.TypeOf(PendingModelKey{}), utils.Serialize, utils.Deserialize,
reflect.TypeOf(PendingModelData{}),
prefixedStorage, serializePendingModelKey, reflect.TypeFor[PendingModelKey](), utils.Serialize, utils.Deserialize,
reflect.TypeFor[PendingModelData](),
)
return &PendingModelStorage{delegate: pendingModelStorage, organizationMetaData: orgMetadata}
}

func NewPublicModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *PublicModelStorage {
prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/publicModelStorage")
publicModelStorage := storage.NewTypedAtomicStorageImpl(
prefixedStorage, serializePublicModelKey, reflect.TypeOf(PublicModelKey{}), utils.Serialize, utils.Deserialize,
reflect.TypeOf(PublicModelData{}),
prefixedStorage, serializePublicModelKey, reflect.TypeFor[PublicModelKey](), utils.Serialize, utils.Deserialize,
reflect.TypeFor[PublicModelData](),
)
return &PublicModelStorage{delegate: publicModelStorage, organizationMetaData: orgMetadata}
}
Expand Down
Loading