From 73fd242c7f928da37df0dc776cc9fb8a97de2820 Mon Sep 17 00:00:00 2001 From: constwz Date: Fri, 29 Mar 2024 17:31:41 +0800 Subject: [PATCH] fix: gnark-crypto version --- base/gfspclient/metadata.go | 2 +- go.mod | 2 +- go.sum | 5 +-- modular/gater/object_handler_test.go | 2 +- .../metadata/metadata_object_service_test.go | 20 +++++------ .../metadata/metadata_sp_exit_service_test.go | 34 +++++++++---------- store/bsdb/block_test.go | 8 ++--- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/base/gfspclient/metadata.go b/base/gfspclient/metadata.go index e48dfc7eb..0d5dd5cf1 100644 --- a/base/gfspclient/metadata.go +++ b/base/gfspclient/metadata.go @@ -51,7 +51,7 @@ func (s *GfSpClient) ListDeletedObjectsByBlockNumberRange(ctx context.Context, s log.CtxErrorw(ctx, "failed to list deleted objects by block number range", "error", err) return nil, uint64(0), ErrRPCUnknownWithDetail("failed to list deleted objects by block number range, error: ", err) } - return resp.GetObjects(), uint64(resp.GetEndBlockNumber()), nil + return resp.GetObjects(), resp.GetEndBlockNumber(), nil } func (s *GfSpClient) GetUserBuckets(ctx context.Context, account string, includeRemoved bool, opts ...grpc.DialOption) ([]*types.VGFInfoBucket, error) { diff --git a/go.mod b/go.mod index 969ce4e4e..5c9d251ff 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/bnb-chain/greenfield-common/go v0.0.0-20240228080631-2683b0ee669a github.com/bytedance/gopkg v0.0.0-20221122125632-68358b8ecec6 github.com/cometbft/cometbft v0.37.2 - github.com/consensys/gnark-crypto v0.12.1 + github.com/consensys/gnark-crypto v0.7.0 github.com/cosmos/cosmos-proto v1.0.0-beta.3 github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/gogoproto v1.4.10 diff --git a/go.sum b/go.sum index 9275d6c58..0b20cee36 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= -github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M= -github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= +github.com/consensys/gnark-crypto v0.7.0 h1:rwdy8+ssmLYRqKp+ryRRgQJl/rCq2uv+n83cOydm5UE= +github.com/consensys/gnark-crypto v0.7.0/go.mod h1:KPSuJzyxkJA8xZ/+CV47tyqkr9MmpZA3PXivK4VPrVg= github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= @@ -1152,6 +1152,7 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/modular/gater/object_handler_test.go b/modular/gater/object_handler_test.go index 77d502e02..0d3cf5606 100644 --- a/modular/gater/object_handler_test.go +++ b/modular/gater/object_handler_test.go @@ -365,7 +365,7 @@ func Test_parseRange(t *testing.T) { }, { name: "3", - rangeStr: "bytes=-1-", + rangeStr: "bytes=a-1-", wantedResult1: false, wantedResult2: -1, wantedResult3: -1, diff --git a/modular/metadata/metadata_object_service_test.go b/modular/metadata/metadata_object_service_test.go index d7bfea456..9e69962a2 100644 --- a/modular/metadata/metadata_object_service_test.go +++ b/modular/metadata/metadata_object_service_test.go @@ -364,12 +364,12 @@ func TestMetadataModular_GfSpListDeletedObjectsByBlockNumberRange_Success(t *tes m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 10, nil }, ).Times(1) m.EXPECT().ListDeletedObjectsByBlockNumberRange(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn( - func(int64, int64, bool) ([]*bsdb.Object, error) { + func(uint64, uint64, bool) ([]*bsdb.Object, error) { return []*bsdb.Object{ &bsdb.Object{ ID: 1, @@ -404,8 +404,8 @@ func TestMetadataModular_GfSpListDeletedObjectsByBlockNumberRange_Success(t *tes }, ).Times(1) objects, err := a.GfSpListDeletedObjectsByBlockNumberRange(context.Background(), &types.GfSpListDeletedObjectsByBlockNumberRangeRequest{ - StartBlockNumber: 0, - EndBlockNumber: 8, + StartBlockNumber: uint64(0), + EndBlockNumber: uint64(8), IncludePrivate: false, }) assert.Nil(t, err) @@ -423,8 +423,8 @@ func TestMetadataModular_GfSpListDeletedObjectsByBlockNumberRange_Failed(t *test }, ).Times(1) _, err := a.GfSpListDeletedObjectsByBlockNumberRange(context.Background(), &types.GfSpListDeletedObjectsByBlockNumberRangeRequest{ - StartBlockNumber: 0, - EndBlockNumber: 8, + StartBlockNumber: uint64(0), + EndBlockNumber: uint64(8), IncludePrivate: false, }) assert.NotNil(t, err) @@ -436,18 +436,18 @@ func TestMetadataModular_GfSpListDeletedObjectsByBlockNumberRange_Failed2(t *tes m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 10, nil }, ).Times(1) m.EXPECT().ListDeletedObjectsByBlockNumberRange(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn( - func(int64, int64, bool) ([]*bsdb.Object, error) { + func(uint64, uint64, bool) ([]*bsdb.Object, error) { return nil, ErrExceedRequest }, ).Times(1) _, err := a.GfSpListDeletedObjectsByBlockNumberRange(context.Background(), &types.GfSpListDeletedObjectsByBlockNumberRangeRequest{ - StartBlockNumber: 0, - EndBlockNumber: 8, + StartBlockNumber: uint64(0), + EndBlockNumber: uint64(8), IncludePrivate: false, }) assert.NotNil(t, err) diff --git a/modular/metadata/metadata_sp_exit_service_test.go b/modular/metadata/metadata_sp_exit_service_test.go index 6df1af698..c28d62f42 100644 --- a/modular/metadata/metadata_sp_exit_service_test.go +++ b/modular/metadata/metadata_sp_exit_service_test.go @@ -214,7 +214,7 @@ func TestMetadataModularGfSpListMigrateBucketEvents_Success(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -283,7 +283,7 @@ func TestMetadataModularGfSpListMigrateBucketEvents_Success2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -339,7 +339,7 @@ func TestMetadataModularGfSpListMigrateBucketEvents_Fail(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -361,7 +361,7 @@ func TestMetadataModularGfSpListMigrateBucketEvents_Fail2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -378,7 +378,7 @@ func TestMetadataModularGfSpListMigrateBucketEvents_Fail3(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 0, ErrExceedRequest }, ).Times(1) @@ -552,7 +552,7 @@ func TestMetadataModularGfSpListSwapOutEvents_Success(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -610,7 +610,7 @@ func TestMetadataModularGfSpGfSpListSwapOutEvents_Success2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -656,7 +656,7 @@ func TestMetadataModularGfSpGfSpListSwapOutEvents_Fail(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -679,7 +679,7 @@ func TestMetadataModularGfSpGfSpListSwapOutEvents_Fail2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -696,7 +696,7 @@ func TestMetadataModularGfSpListSwapOutEvents_Fail3(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 0, ErrExceedRequest }, ).Times(1) @@ -713,7 +713,7 @@ func TestMetadataModularGfSpListSpExitEvents_Success(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -752,7 +752,7 @@ func TestMetadataModularGfSpGfSpGfSpListSpExitEvents_Success2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -782,7 +782,7 @@ func TestMetadataModularGfSpListSpExitEvents_Fail(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -805,7 +805,7 @@ func TestMetadataModularGfSpListSpExitEvents_Fail2(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -822,7 +822,7 @@ func TestMetadataModularGfSpGfSpListSpExitEvents_Fail3(t *testing.T) { m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 0, ErrExceedRequest }, ).Times(1) @@ -839,7 +839,7 @@ func TestMetadataModularGfSpListCompleteMigrationBucketEvents_Success(t *testing m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) @@ -874,7 +874,7 @@ func TestMetadataModularGfSpListCompleteMigrationBucketEvents_Fail(t *testing.T) m := bsdb.NewMockBSDB(ctrl) a.baseApp.SetGfBsDB(m) m.EXPECT().GetLatestBlockNumber().DoAndReturn( - func() (int64, error) { + func() (uint64, error) { return 100000, nil }, ).Times(1) diff --git a/store/bsdb/block_test.go b/store/bsdb/block_test.go index c44a472d4..3dc87af97 100644 --- a/store/bsdb/block_test.go +++ b/store/bsdb/block_test.go @@ -14,7 +14,7 @@ const ( ) func TestBsDBImpl_GetLatestBlockNumberSuccess(t *testing.T) { - expectedBlockHeight := int64(12345) + expectedBlockHeight := uint64(12345) s, mock := setupDB(t) mock.ExpectQuery(mockBlockHeightQuerySQL). @@ -34,7 +34,7 @@ func TestBsDBImpl_GetLatestBlockNumberNoRecords(t *testing.T) { blockNum, err := s.GetLatestBlockNumber() assert.Error(t, err) assert.True(t, errors.Is(err, gorm.ErrRecordNotFound)) - assert.Equal(t, int64(0), blockNum) + assert.Equal(t, uint64(0), blockNum) } func TestBsDBImpl_GetLatestBlockNumberDBError(t *testing.T) { @@ -44,7 +44,7 @@ func TestBsDBImpl_GetLatestBlockNumberDBError(t *testing.T) { blockNum, err := s.GetLatestBlockNumber() assert.Error(t, err) assert.Contains(t, err.Error(), mockDBInternalError.Error()) - assert.Equal(t, int64(0), blockNum) + assert.Equal(t, uint64(0), blockNum) } func TestBsDBImpl_GetLatestBlockNumberMultipleRecords(t *testing.T) { @@ -55,5 +55,5 @@ func TestBsDBImpl_GetLatestBlockNumberMultipleRecords(t *testing.T) { blockNum, err := s.GetLatestBlockNumber() assert.Nil(t, err) - assert.Equal(t, int64(54321), blockNum) + assert.Equal(t, uint64(54321), blockNum) }