From 0fcdf0411d05c2ef5babd65588a05dd5c4b70574 Mon Sep 17 00:00:00 2001 From: ice-myles <96409608+ice-myles@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:47:15 +0300 Subject: [PATCH] Rebase fixes. --- model/model.go | 3 +++ tokenomics/users.go | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/model/model.go b/model/model.go index d6ca3839..6289cfa8 100644 --- a/model/model.go +++ b/model/model.go @@ -7,6 +7,9 @@ import ( "context" "fmt" "strconv" + stdlibtime "time" + + "github.com/pkg/errors" "github.com/ice-blockchain/eskimo/users" "github.com/ice-blockchain/wintr/log" diff --git a/tokenomics/users.go b/tokenomics/users.go index e72b6eda..f087c33e 100644 --- a/tokenomics/users.go +++ b/tokenomics/users.go @@ -176,7 +176,6 @@ func (s *usersTableSource) replaceUser(ctx context.Context, usr *users.User) err model.IDT0Field model.IDTMinus1Field model.HideRankingField - model.BalanceForTMinus1Field } ) dbUser, err := storage.Get[user](ctx, s.db, model.SerializedUsersKey(internalID))