diff --git a/go.mod b/go.mod index 29390b978..4a489f8f3 100644 --- a/go.mod +++ b/go.mod @@ -39,6 +39,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require github.com/hashicorp/golang-lru/v2 v2.0.1 + require ( github.com/TrueCloudLab/frostfs-crypto v0.5.0 // indirect github.com/TrueCloudLab/rfc6979 v0.3.0 // indirect diff --git a/go.sum b/go.sum index 13f8bc7ad..1d85e41cb 100644 Binary files a/go.sum and b/go.sum differ diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index e2684bfe0..fbe416f15 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -9,7 +9,7 @@ import ( "time" "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - lru "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru/v2" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" @@ -96,7 +96,7 @@ type cache struct { nnsHash *util.Uint160 gKey *keys.PublicKey - txHeights *lru.Cache + txHeights *lru.Cache[util.Uint256, uint32] } func (c cache) nns() *util.Uint160 { diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index 7cdb2e0e1..5adc1c2fc 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -8,7 +8,7 @@ import ( "time" "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" - lru "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru/v2" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/rpcclient" @@ -185,7 +185,7 @@ func newActor(ws *rpcclient.WSClient, acc *wallet.Account, cfg cfg) (*actor.Acto } func newClientCache() cache { - c, _ := lru.New(100) // returns error only if size is negative + c, _ := lru.New[util.Uint256, uint32](100) // returns error only if size is negative return cache{ m: &sync.RWMutex{}, txHeights: c, diff --git a/pkg/morph/client/notary.go b/pkg/morph/client/notary.go index 8f20dcb81..334fcda9d 100644 --- a/pkg/morph/client/notary.go +++ b/pkg/morph/client/notary.go @@ -892,7 +892,7 @@ func (c *Client) CalculateNonceAndVUB(hash util.Uint256) (nonce uint32, vub uint func (c *Client) getTransactionHeight(h util.Uint256) (uint32, error) { if rh, ok := c.cache.txHeights.Get(h); ok { - return rh.(uint32), nil + return rh, nil } height, err := c.client.GetTransactionHeight(h) if err != nil {