Skip to content

Commit 82c4406

Browse files
bysomeonevipwzw
bysomeone
authored and
vipwzw
committed
crypto:replace New with Load
1 parent 843c952 commit 82c4406

File tree

11 files changed

+27
-31
lines changed

11 files changed

+27
-31
lines changed

‎common/address/address_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
)
2121

2222
func genkey() crypto.PrivKey {
23-
c, err := crypto.New("secp256k1")
23+
c, err := crypto.Load("secp256k1", -1)
2424
if err != nil {
2525
panic(err)
2626
}
@@ -62,7 +62,7 @@ func TestPubkeyToAddress(t *testing.T) {
6262
}
6363

6464
func TestCheckAddress(t *testing.T) {
65-
c, err := crypto.New("secp256k1")
65+
c, err := crypto.Load("secp256k1", -1)
6666
if err != nil {
6767
t.Error(err)
6868
return

‎common/crypto/crypto.go

+4-8
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,13 @@ func GetType(name string) int {
134134
// Load 加载加密插件, 内部会检测在指定区块高度是否使能
135135
//
136136
// 不考虑使能情况, 只做插件加载, blockHeight传负值, 如-1
137-
func Load(name string, blockHeight int64) (Crypto, error) {
137+
func Load(name string, blockHeight int64, opts ...LoadOption) (Crypto, error) {
138+
if len(opts) > 0 {
139+
return load(name, append(opts, WithLoadOptionEnableCheck(blockHeight))...)
140+
}
138141
return load(name, WithLoadOptionEnableCheck(blockHeight))
139142
}
140143

141-
// New new
142-
//
143-
// Deprecated: 加密插件已支持高度分叉配置, 使用Load接口替换
144-
func New(name string) (Crypto, error) {
145-
return load(name)
146-
}
147-
148144
// load crypto with defined options
149145
func load(name string, opts ...LoadOption) (Crypto, error) {
150146
c, ok := drivers[name]

‎common/crypto/crypto_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestAll(t *testing.T) {
6363
func testFromBytes(t *testing.T, name string) {
6464
require := require.New(t)
6565

66-
c, err := crypto.New(name)
66+
c, err := crypto.Load(name, -1)
6767
require.Nil(err)
6868

6969
priv, err := c.GenKey()
@@ -108,7 +108,7 @@ func testFromBytes(t *testing.T, name string) {
108108
func testCrypto(t *testing.T, name string) {
109109
require := require.New(t)
110110

111-
c, err := crypto.New(name)
111+
c, err := crypto.Load(name, -1)
112112
require.Nil(err)
113113

114114
priv, err := c.GenKey()
@@ -152,7 +152,7 @@ func BenchmarkVerifySm2(b *testing.B) {
152152
}
153153

154154
func benchSign(b *testing.B, name string) {
155-
c, _ := crypto.New(name)
155+
c, _ := crypto.Load(name, -1)
156156
priv, _ := c.GenKey()
157157
msg := []byte("hello world")
158158
for i := 0; i < b.N; i++ {
@@ -161,7 +161,7 @@ func benchSign(b *testing.B, name string) {
161161
}
162162

163163
func benchVerify(b *testing.B, name string) {
164-
c, _ := crypto.New(name)
164+
c, _ := crypto.Load(name, -1)
165165
priv, _ := c.GenKey()
166166
pub := priv.PubKey()
167167
msg := []byte("hello world")
@@ -172,7 +172,7 @@ func benchVerify(b *testing.B, name string) {
172172
}
173173

174174
func TestAggregate(t *testing.T) {
175-
c, err := crypto.New("secp256k1")
175+
c, err := crypto.Load("secp256k1", -1)
176176
if err != nil {
177177
panic(err)
178178
}
@@ -230,7 +230,7 @@ func (d democryptoCGO) GenKey() (crypto.PrivKey, error) {
230230
}
231231

232232
func TestRegister(t *testing.T) {
233-
c, err := crypto.New("secp256k1")
233+
c, err := crypto.Load("secp256k1", -1)
234234
require.Nil(t, err)
235235
p, err := c.GenKey()
236236
require.Nil(t, err)
@@ -247,7 +247,7 @@ func TestRegister(t *testing.T) {
247247
crypto.Register(secp256k1.Name+"cgo", democryptoCGO{}, crypto.WithRegOptionTypeID(secp256k1.ID))
248248
})
249249

250-
c, err = crypto.New("secp256k1")
250+
c, err = crypto.Load("secp256k1", -1)
251251
require.Nil(t, err)
252252
p, err = c.GenKey()
253253
require.Nil(t, p)

‎system/crypto/secp256r1/test/authority_secp256r1_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var (
4545

4646
privRaw, _ = common.FromHex("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
4747
tr = &cty.CoinsAction_Transfer{Transfer: &types.AssetsTransfer{Amount: int64(1e8)}}
48-
secpp256, _ = crypto.New(types.GetSignName("", types.SECP256K1))
48+
secpp256, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
4949
privKey, _ = secpp256.PrivKeyFromBytes(privRaw)
5050
tx14 = &types.Transaction{
5151
Execer: []byte("coins"),
@@ -146,7 +146,7 @@ func (loader *UserLoader) loadUsers() error {
146146
}
147147

148148
func (loader *UserLoader) genCryptoPriv(keyBytes []byte) (crypto.PrivKey, error) {
149-
cr, err := crypto.New(types.GetSignName("cert", loader.signType))
149+
cr, err := crypto.Load(types.GetSignName("cert", loader.signType), -1)
150150
if err != nil {
151151
return nil, fmt.Errorf("create crypto %s failed, error:%s", types.GetSignName("cert", loader.signType), err)
152152
}
@@ -282,7 +282,7 @@ func TestChckSignWithNoneAuth(t *testing.T) {
282282
TestCase05 不带证书，secp256r1签名验证
283283
*/
284284
func TestChckSignWithEcdsa(t *testing.T) {
285-
ecdsacrypto, _ := crypto.New(types.GetSignName("cert", secp256r1.ID))
285+
ecdsacrypto, _ := crypto.Load(types.GetSignName("cert", secp256r1.ID), -1)
286286
privKeyecdsa, _ := ecdsacrypto.PrivKeyFromBytes(privRaw)
287287
tx16 := &types.Transaction{Execer: []byte("coins"),
288288
Payload: types.Encode(&cty.CoinsAction{Value: tr, Ty: cty.CoinsActionTransfer}),

‎system/crypto/sm2/test/authority_sm2_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var (
4545

4646
privRaw, _ = common.FromHex("CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944")
4747
tr = &cty.CoinsAction_Transfer{Transfer: &types.AssetsTransfer{Amount: int64(1e8)}}
48-
secpp256, _ = crypto.New(types.GetSignName("", types.SECP256K1))
48+
secpp256, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
4949
privKey, _ = secpp256.PrivKeyFromBytes(privRaw)
5050
tx14 = &types.Transaction{
5151
Execer: []byte("coins"),
@@ -146,7 +146,7 @@ func (loader *UserLoader) loadUsers() error {
146146
}
147147

148148
func (loader *UserLoader) genCryptoPriv(keyBytes []byte) (crypto.PrivKey, error) {
149-
cr, err := crypto.New(types.GetSignName("cert", loader.signType))
149+
cr, err := crypto.Load(types.GetSignName("cert", loader.signType), -1)
150150
if err != nil {
151151
return nil, fmt.Errorf("create crypto %s failed, error:%s", types.GetSignName("cert", loader.signType), err)
152152
}
@@ -282,7 +282,7 @@ func TestChckSignWithNoneAuth(t *testing.T) {
282282
TestCase05 不带证书，SM2签名验证
283283
*/
284284
func TestChckSignWithSm2(t *testing.T) {
285-
sm2, err := crypto.New(types.GetSignName("cert", sm2Util.ID))
285+
sm2, err := crypto.Load(types.GetSignName("cert", sm2Util.ID), -1)
286286
assert.Nil(t, err)
287287
privKeysm2, _ := sm2.PrivKeyFromBytes(privRaw)
288288
tx15 := &types.Transaction{Execer: []byte("coins"),

‎system/mempool/mempool_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838

3939
//----------------------------- data for testing ---------------------------------
4040
var (
41-
c, _ = crypto.New(types.GetSignName("", types.SECP256K1))
41+
c, _ = crypto.Load(types.GetSignName("", types.SECP256K1), -1)
4242
hexPirv = "CC38546E9E659D15E6B4893F0AB32A06D103931A8230B0BDE71459D2B27D6944"
4343
a, _ = common.FromHex(hexPirv)
4444
privKey, _ = c.PrivKeyFromBytes(a)
@@ -135,7 +135,7 @@ func init() {
135135
}
136136

137137
func getprivkey(key string) crypto.PrivKey {
138-
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
138+
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
139139
if err != nil {
140140
panic(err)
141141
}
@@ -226,7 +226,7 @@ func createTx(cfg *types.Chain33Config, priv crypto.PrivKey, to string, amount i
226226
}
227227

228228
func genaddress() (string, crypto.PrivKey) {
229-
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
229+
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
230230
if err != nil {
231231
panic(err)
232232
}

‎types/tx_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func TestDecodeTx(t *testing.T) {
194194
}
195195

196196
func getprivkey(key string) crypto.PrivKey {
197-
cr, err := crypto.New(GetSignName("", SECP256K1))
197+
cr, err := crypto.Load(GetSignName("", SECP256K1), -1)
198198
if err != nil {
199199
panic(err)
200200
}

‎util/private.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var TestPrivkeyList = []crypto.PrivKey{
4040

4141
//HexToPrivkey ： convert hex string to private key
4242
func HexToPrivkey(key string) crypto.PrivKey {
43-
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
43+
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
4444
if err != nil {
4545
panic(err)
4646
}

‎util/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func GenCoinsTxs(cfg *types.Chain33Config, priv crypto.PrivKey, n int64) (txs []
9191

9292
//Genaddress : generate a address
9393
func Genaddress() (string, crypto.PrivKey) {
94-
cr, err := crypto.New(types.GetSignName("", types.SECP256K1))
94+
cr, err := crypto.Load(types.GetSignName("", types.SECP256K1), -1)
9595
if err != nil {
9696
panic(err)
9797
}

‎wallet/bipwallet/bipwallet.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (w *HDWallet) NewKeyPair(index uint32) (priv, pub []byte, err error) {
8484
return key.Key, key.PublicKey().Key, err
8585
}
8686

87-
edcrypto, err := crypto.New(crypto.GetName(int(w.KeyType)))
87+
edcrypto, err := crypto.Load(crypto.GetName(int(w.KeyType)), -1)
8888
if err != nil {
8989
return nil, nil, err
9090
}

‎wallet/bipwallet/transformer/btcbase/btcbase.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (t btcBaseTransformer) PrivKeyToPub(keyTy uint32, priv []byte) (pub []byte,
4343
}
4444
//pub = secp256k1.PubkeyFromSeckey(priv)
4545

46-
edcrypto, err := crypto.New(crypto.GetName(int(keyTy)))
46+
edcrypto, err := crypto.Load(crypto.GetName(int(keyTy)), -1)
4747
if err != nil {
4848
return nil, err
4949
}

0 commit comments

Comments
 (0)