Skip to content

GitLab

新注册的用户请输入邮箱并保存，随后登录邮箱激活账号。后续可直接使用邮箱登录！

Commit e41328c7 authored by yqm's avatar yqm Committed by taifu yuan
Browse files
Options

chore: update mock and lint --story=1012203

parent ac0e03e9
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 64 deletions
certmgr/cert_alias_manage_contract_test.go
View file @ e41328c7
......@@ -13,7 +13,6 @@ import (
commonPb "chainmaker.org/chainmaker/pb-go/v2/common"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert"
)
......@@ -75,6 +74,7 @@ func Test_UpdateAlias(t *testing.T) {
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.NotNil(t, err)
assert.Nil(t, event)
assert.Nil(t, result)
// alias not exist
aliasName2 := []byte("alias02")
......@@ -83,6 +83,7 @@ func Test_UpdateAlias(t *testing.T) {
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.NotNil(t, err)
assert.Nil(t, event)
assert.Nil(t, result)
// add alias
params2 := make(map[string][]byte)
......@@ -98,6 +99,7 @@ func Test_UpdateAlias(t *testing.T) {
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.NotNil(t, err)
assert.Nil(t, event)
assert.Nil(t, result)
// bad org
params[paramNameAlias] = aliasName2
......@@ -105,6 +107,7 @@ func Test_UpdateAlias(t *testing.T) {
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.NotNil(t, err)
assert.Nil(t, event)
assert.Nil(t, result)
// same cert
params[paramNameAlias] = aliasName2
......@@ -112,22 +115,25 @@ func Test_UpdateAlias(t *testing.T) {
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.NotNil(t, err)
assert.Nil(t, event)
assert.Nil(t, result)
// normal
params[paramNameAlias] = aliasName2
params[paramNameCert] = getOrg1Admin1Signer().MemberInfo
result, event, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.Nil(t, err)
assert.Equal(t, "ok", string(result2))
assert.Equal(t, len(event), 1)
assert.Equal(t, len(event[0].EventData), 1)
assert.Equal(t, event[0].EventData[0], string(aliasName2))
assert.NotNil(t, result)
for i := 0; i < 11; i++ {
params[paramNameCert] = getOrg1Client1Signer().MemberInfo
result, _, err = mgrRuntime.UpdateAlias(txSimContext, params)
_, _, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.Nil(t, err)
params[paramNameCert] = getOrg1Admin1Signer().MemberInfo
result, _, err = mgrRuntime.UpdateAlias(txSimContext, params)
_, _, err = mgrRuntime.UpdateAlias(txSimContext, params)
assert.Nil(t, err)
}
params[paramNameAliases] = aliasName2
result, err = mgrRuntime.QueryAlias(txSimContext, params)
......@@ -183,11 +189,12 @@ func Test_DeleteAlias(t *testing.T) {
assert.Equal(t, len(event), 1)
assert.Equal(t, len(event[0].EventData), 1)
assert.Equal(t, event[0].EventData[0], string(aliasName3))
assert.NotNil(t, result)
// repeat
params[paramNameAliases] = aliasName3
params[paramNameCert] = getOrg1Client1Signer().MemberInfo
result, _, err = mgrRuntime.DeleteAlias(txSimContext, params)
_, _, err = mgrRuntime.DeleteAlias(txSimContext, params)
assert.NotNil(t, err)
}
......@@ -198,11 +205,12 @@ func Test_QueryAlias(t *testing.T) {
// no params
result, err := mgrRuntime.QueryAlias(txSimContext, nil)
assert.NotNil(t, err)
assert.Nil(t, result)
// not found
params := make(map[string][]byte)
params[paramNameAliases] = []byte("alias04")
result, err = mgrRuntime.QueryAlias(txSimContext, params)
_, err = mgrRuntime.QueryAlias(txSimContext, params)
assert.NotNil(t, err)
// add alias
......
certmgr/cert_manage_contract_test.go
View file @ e41328c7
......@@ -12,18 +12,14 @@ import (
"sync"
"testing"
"chainmaker.org/chainmaker/utils/v2"
commonPb "chainmaker.org/chainmaker/pb-go/v2/common"
"chainmaker.org/chainmaker/pb-go/v2/accesscontrol"
"chainmaker.org/chainmaker/protocol/v2/test"
"github.com/stretchr/testify/assert"
commonPb "chainmaker.org/chainmaker/pb-go/v2/common"
"chainmaker.org/chainmaker/protocol/v2"
"chainmaker.org/chainmaker/protocol/v2/mock"
"chainmaker.org/chainmaker/protocol/v2/test"
"chainmaker.org/chainmaker/utils/v2"
"github.com/golang/mock/gomock"
"chainmaker.org/chainmaker/protocol/v2"
"github.com/stretchr/testify/assert"
)
var (
......@@ -50,12 +46,13 @@ func Test_DeleteCert(t *testing.T) {
result, err := mgrRuntime.Add(txSimContext, nil)
assert.Equal(t, "e77c9238c51e3446d942f94bd8803cc4f351254f8771f972146d7bfc6e0be7f4", string(result))
assert.Nil(t, err)
params := make(map[string][]byte)
params[paramNameCertHashes] = []byte("e77c9238c51e3446d942f94bd8803cc4f351254f8771f972146d7bfc6e0be7f4")
result, _, err = mgrRuntime.Delete(txSimContext, params)
_, _, err = mgrRuntime.Delete(txSimContext, params)
assert.Nil(t, err)
result, _, err = mgrRuntime.Delete(txSimContext, params)
_, _, err = mgrRuntime.Delete(txSimContext, params)
assert.NotNil(t, err)
_, _, err = mgrRuntime.Delete(txSimContext, nil)
......
go.mod
View file @ e41328c7
......@@ -3,13 +3,12 @@ module chainmaker.org/chainmaker/vm-native/v2
go 1.16
require (
chainmaker.org/chainmaker/chainconf/v2 v2.2.3-0.20220601093135-49f1a82f5679
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220628084133-47574edae904
chainmaker.org/chainmaker/localconf/v2 v2.2.2-0.20220714065948-d56b9b5eaa1e
chainmaker.org/chainmaker/logger/v2 v2.2.2-0.20220607065325-81b19abf90a7 // indirect
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220823024131-d9a66d5d97e8
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220721031125-12c493f33966
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220824033430-e5157d5a7c65
chainmaker.org/chainmaker/chainconf/v2 v2.3.0
chainmaker.org/chainmaker/common/v2 v2.3.0
chainmaker.org/chainmaker/localconf/v2 v2.3.0
chainmaker.org/chainmaker/pb-go/v2 v2.3.0
chainmaker.org/chainmaker/protocol/v2 v2.3.0
chainmaker.org/chainmaker/utils/v2 v2.3.0
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
......
go.sum
View file @ e41328c7
chainmaker.org/chainmaker/chainconf/v2 v2.2.3-0.20220601093135-49f1a82f5679 h1:AkitaDaNXLvAY757Y9tKGy+ryHUrmIRkoe4YGsib650=
chainmaker.org/chainmaker/chainconf/v2 v2.2.3-0.20220601093135-49f1a82f5679/go.mod h1:CPeJ37RNWUp6hDqesyu9J3ija1XNEGOZI0CQHrSnIIE=
chainmaker.org/chainmaker/common/v2 v2.2.1-0.20220420025036-09af89f10b3c/go.mod h1:rVrIKImPQJizGt4lI+ffl3KZ+mgMR4+Y2ReHaDWac3c=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220601090655-ddcadbaf280f/go.mod h1:9XlRMLjG6V4JlovJA0zjsz9NZRDV8Em6mCQQ1DZNnQA=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220607063940-ded004f7fce5/go.mod h1:8IYaQ/r3OjnUl9dLqY15mWs6TiBSl4hHn58ZPXT2Hu8=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220610113539-987118ad2d41/go.mod h1:8MnHhYrOjjASJCUtL7HHrhidFg3EazOqYHWm6+F4vqo=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220628025818-290c39d5f1c8/go.mod h1:8MnHhYrOjjASJCUtL7HHrhidFg3EazOqYHWm6+F4vqo=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220628084133-47574edae904 h1:R5RueYZyEIbwQ5wqhb0Sez5FKJkEqIE643wfGMSdwok=
chainmaker.org/chainmaker/common/v2 v2.2.2-0.20220628084133-47574edae904/go.mod h1:8MnHhYrOjjASJCUtL7HHrhidFg3EazOqYHWm6+F4vqo=
chainmaker.org/chainmaker/localconf/v2 v2.2.2-0.20220714065948-d56b9b5eaa1e h1:XkgK1d+PLCIsvBhSAoFK5R1SlXj1H9AP7KiXg2gxpVc=
chainmaker.org/chainmaker/localconf/v2 v2.2.2-0.20220714065948-d56b9b5eaa1e/go.mod h1:psqFFF+tNwru3J2WVRtB4RP/qan+++xOLUopAKyXTg0=
chainmaker.org/chainmaker/logger/v2 v2.2.2-0.20220601091955-6c66ad476f3a/go.mod h1:NKHb0tOqmUBzXgBMhi0+bL+1l4jToLtdhABWlbnjq/U=
chainmaker.org/chainmaker/logger/v2 v2.2.2-0.20220607065325-81b19abf90a7 h1:PphElWv6LoIFctl59WEBOhcIFhCJuHyDqI6tl9lvQx4=
chainmaker.org/chainmaker/logger/v2 v2.2.2-0.20220607065325-81b19abf90a7/go.mod h1:g2Qnxrm81bKlHrW6Wmc1Slib63W14X0MIz1dpsjzwcA=
chainmaker.org/chainmaker/pb-go/v2 v2.2.1-0.20220418083449-5ddd619fd3f6/go.mod h1:b5fg5e93xCjSHU1b5yk/mnslab+z7N08kMkNVDoSpcI=
chainmaker.org/chainmaker/pb-go/v2 v2.2.1-0.20220419123031-1f6cae2792f2/go.mod h1:b5fg5e93xCjSHU1b5yk/mnslab+z7N08kMkNVDoSpcI=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220601073343-3015c97c2728/go.mod h1:b5fg5e93xCjSHU1b5yk/mnslab+z7N08kMkNVDoSpcI=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220607063430-b037daa0847d/go.mod h1:MB2+suualBWOKvd6FRQD/XcZzlav7APiSa7uzdDLkY8=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220627132320-95cc14a8d47d/go.mod h1:MB2+suualBWOKvd6FRQD/XcZzlav7APiSa7uzdDLkY8=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220713115418-627748021f33 h1:/mawnXy9MPxbXw810lviHe8dHFkO7TAElq2q0W6n0tg=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220713115418-627748021f33/go.mod h1:MB2+suualBWOKvd6FRQD/XcZzlav7APiSa7uzdDLkY8=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220823024131-d9a66d5d97e8 h1:sHc9kNuuz39JveJugHV/TE33aqUD8s8LvR0JY+dJtqc=
chainmaker.org/chainmaker/pb-go/v2 v2.2.2-0.20220823024131-d9a66d5d97e8/go.mod h1:MB2+suualBWOKvd6FRQD/XcZzlav7APiSa7uzdDLkY8=
chainmaker.org/chainmaker/protocol/v2 v2.2.1-0.20220420035842-6273a5991b73/go.mod h1:C3QQOKuRWJeSP+nIeVGLCf4ScHzfyBVYNoVMn149uVU=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220601091317-c1b2cd0fb763/go.mod h1:EQMkCcb9reNMxc2p2N6ecyjImdYMszZPHKMt/Vqx8Js=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220704085016-8d4e4164a9e1/go.mod h1:/1+PK+fCwmopWd8c0vyY69tcg4kdjeXVl5hIZ3n+7r0=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220708135509-30586e5c4415 h1:ecXjq/Gx3BJVBaBQhTxKf4DYDbx1C8q9T6Goq/Avhgw=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220708135509-30586e5c4415/go.mod h1:/1+PK+fCwmopWd8c0vyY69tcg4kdjeXVl5hIZ3n+7r0=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220721031125-12c493f33966 h1:k4MoBqfGcTsiX00Ejcn19kAsOcXUnsrrI9DH+jAML+I=
chainmaker.org/chainmaker/protocol/v2 v2.2.3-0.20220721031125-12c493f33966/go.mod h1:/1+PK+fCwmopWd8c0vyY69tcg4kdjeXVl5hIZ3n+7r0=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220601092510-ec93c1095f0f/go.mod h1:i4nlJCGIo+V9ePPUDTE0HZe3TctG9kkLP1snVF7BEJc=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220711061227-aa7ff9c750ff h1:cm7KzBMATcHjI4R+YBd+6vHguYKFrDWriPMoIpnhBXo=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220711061227-aa7ff9c750ff/go.mod h1:nxJKxJ3jxYa7GapqNo+3/27s7hJieA7xpcsOuCr57yY=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220714093409-76db3fe643ae h1:ZZgESa8twNQaXS6ayhuKC/UsLNEBZI2gaP4kQIErfio=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220714093409-76db3fe643ae/go.mod h1:nxJKxJ3jxYa7GapqNo+3/27s7hJieA7xpcsOuCr57yY=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220823124732-aeb758fba087 h1:27sObKwSi+6ZlsPvJ+gaoXIJeGHDb4xCL0nK2+ucioQ=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220823124732-aeb758fba087/go.mod h1:nxJKxJ3jxYa7GapqNo+3/27s7hJieA7xpcsOuCr57yY=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220824033430-e5157d5a7c65 h1:f6EPD8C72rdrouklztqBmBcFAHra7yJz2qtW+UnajG8=
chainmaker.org/chainmaker/utils/v2 v2.2.3-0.20220824033430-e5157d5a7c65/go.mod h1:nkgAu35USzulwACn04DDgrwvAq112ysfW2pO/qmDMIg=
chainmaker.org/chainmaker/chainconf/v2 v2.3.0 h1:AvgRmasWZqHCqkOI5yBU2YsVFbLeI/5Mk9jCJvWyQLQ=
chainmaker.org/chainmaker/chainconf/v2 v2.3.0/go.mod h1:JXISUHzKPGMcRh59OupxMNj2pB9Xih/wao8GkxLntPw=
chainmaker.org/chainmaker/common/v2 v2.3.0 h1:ZjJrDnHGQUSdCI7154zAiBAiLlmLkd+DroQ0NUpRd5o=
chainmaker.org/chainmaker/common/v2 v2.3.0/go.mod h1:LV6bEVvqWBa6NY/QyNY9CDIdah44Hpd/aEqWkG5rXws=
chainmaker.org/chainmaker/localconf/v2 v2.3.0 h1:xkwW31eFgAt4T2+ddD6j+kBKotM0bbI+svbHRW8pd4o=
chainmaker.org/chainmaker/localconf/v2 v2.3.0/go.mod h1:FsrIi0ts5Ba9MmRhg+j+dLAB9oGyVTQsPgjSA39Ql+k=
chainmaker.org/chainmaker/logger/v2 v2.3.0 h1:SuBA48m+OQ5HChX34j6eXk4o0uhXHi8Jfkrjf90U7rQ=
chainmaker.org/chainmaker/logger/v2 v2.3.0/go.mod h1:kmHXCIBl9833c0UO+G4GKAifbhqhNdiL4f5dDsR+Vks=
chainmaker.org/chainmaker/pb-go/v2 v2.3.0 h1:GcFY14KFGDnDlWw07VWL9Ew5XqUBkbcjm7IHtMgmF2s=
chainmaker.org/chainmaker/pb-go/v2 v2.3.0/go.mod h1:MB2+suualBWOKvd6FRQD/XcZzlav7APiSa7uzdDLkY8=
chainmaker.org/chainmaker/protocol/v2 v2.3.0 h1:c/Mgq6Fdx0A6rRhgX1H9uyYpYwExM332LsSutmkiGP4=
chainmaker.org/chainmaker/protocol/v2 v2.3.0/go.mod h1:l3EfuaCdGG1FKcCItDbGeIJ4YmYnMjSUIoXQ5GElARY=
chainmaker.org/chainmaker/utils/v2 v2.3.0 h1:GxlmTBjC46974MWlhJfiQ7fu60NXDGKWWKdFLzXldvE=
chainmaker.org/chainmaker/utils/v2 v2.3.0/go.mod h1:NXZXc0fVrRCpWqrVyFP/WyobSeT3gz2zmL4uA0Lqvoo=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
......@@ -503,6 +478,7 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
......@@ -969,7 +945,6 @@ github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/studyzy/sqlparse v0.0.0-20210520090832-d40c792e1576/go.mod h1:CwlutJYtBPc/M6R2P1e32ub0YyP9l6gaQ/xJjUMkEwA=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
......
privatecompute/tx_context_mock.go
View file @ e41328c7
......@@ -25,6 +25,11 @@ type TxContextMock struct {
cacheMap dataStore
}
// GetBlockFingerprint mock
func (s *TxContextMock) GetBlockFingerprint() string {
panic("implement me")
}
// GetStrAddrFromPbMember mock
func (s *TxContextMock) GetStrAddrFromPbMember(pbMember *acPb.Member) (string, error) {
//TODO implement me
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © 2021 ChainMaker Org. All Rights Reserved. 长安链 版权所有。