Skip to content

P
plugin
Commit f000476b authored by 郝东博's avatar 郝东博 Committed by vipwzw
Browse files
Options

fix ineffassign warning

parent 2836aa3e
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 7 deletions
plugin/consensus/ticket/ticket_test.go
View file @ f000476b
......@@ -51,7 +51,7 @@ func TestTicket(t *testing.T) {
//js, _ := json.MarshalIndent(detail, "", " ")
//fmt.Println(string(js))
assert.Equal(t, int32(2), detail.Receipt.Ty)
reply, err = mock33.GetAPI().ExecWalletFunc("ticket", "WalletAutoMiner", &ty.MinerFlag{Flag: 1})
_, err = mock33.GetAPI().ExecWalletFunc("ticket", "WalletAutoMiner", &ty.MinerFlag{Flag: 1})
assert.Nil(t, err)
err = mock33.WaitHeight(100)
assert.Nil(t, err)
......
plugin/dapp/privacy/crypto/ring_signature_test.go
View file @ f000476b
......@@ -108,17 +108,22 @@ func TestGenerateRingSignature1(t *testing.T) {
var signs [maxCount]*Sign
index := 0
prefixHash, err := common.FromHex("fd1f64844a7d6a9f74fc2141bceba9d9d69b1fd6104f93bfa42a6d708a6ab22c")
assert.Nil(t, err)
tmp, err := common.FromHex("e7d85d6e81512c5650adce0499d6c17a83e2e29a05c1166cd2171b6b9288b3c4")
assert.Nil(t, err)
copy(image[:], tmp)
tmp, err = common.FromHex("15e3cc7cdb904d62f7c20d7fa51923fa2839f9e0a92ff0eddf8c12bd09089c15")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
pub := PubKeyPrivacy{}
copy(pub[:], tmp[32*i:32*(i+1)])
pubs[i] = &pub
}
tmp, err = common.FromHex("fd8de2e12410e3da20350e6f4083b73cc3396b4812c09af633d7c223bfb2560b")
assert.Nil(t, err)
copy(sec[:], tmp)
tmp, err = common.FromHex("b5c0a53bce99106e74284ee1d2c64a68a14e8b4c1735e8ab9ca7215a414f97084749935d87d516b5659a01e84b08279c42e649b2e500e2ede443fe68885b0206")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
signs[i] = &Sign{}
}
......@@ -139,14 +144,17 @@ func TestCheckRingSignature1(t *testing.T) {
t.Error("initialize public key from hex failed.")
}
tmp, err := common.FromHex("e7d85d6e81512c5650adce0499d6c17a83e2e29a05c1166cd2171b6b9288b3c4")
assert.Nil(t, err)
copy(image[:], tmp)
tmp, err = common.FromHex("15e3cc7cdb904d62f7c20d7fa51923fa2839f9e0a92ff0eddf8c12bd09089c15")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
pub := PubKeyPrivacy{}
copy(pub[:], tmp[32*i:32*(i+1)])
pubs[i] = &pub
}
tmp, err = common.FromHex("a142d0180a6047cf883125a83617c7dd56e9d8153ec04a96b3c5d9a5e03cd70cfd6827b200d6c2f4b41fb5b0162117a5447e327c29482c358a0a3c82db88fb0f")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
sign := Sign{}
copy(sign[:], tmp[64*i:64*(i+1)])
......@@ -172,11 +180,13 @@ func TestCheckRingSignatureAPI1(t *testing.T) {
}
tmp, err := common.FromHex("15e3cc7cdb904d62f7c20d7fa51923fa2839f9e0a92ff0eddf8c12bd09089c15")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
publickeys[i] = append(publickeys[i], tmp...)
}
tmp, err = common.FromHex("a142d0180a6047cf883125a83617c7dd56e9d8153ec04a96b3c5d9a5e03cd70cfd6827b200d6c2f4b41fb5b0162117a5447e327c29482c358a0a3c82db88fb0f")
assert.Nil(t, err)
data := make([][]byte, maxCount)
for i := 0; i < maxCount; i++ {
data[i] = make([]byte, 0)
......@@ -200,14 +210,17 @@ func TestCheckRingSignature3(t *testing.T) {
t.Error("initialize public key from hex failed.")
}
tmp, err := common.FromHex("04e593e5e4028ce1c1194eb473efc21359b114737e5a64f14420b3cf5b22204b")
assert.Nil(t, err)
copy(image[:], tmp)
tmp, err = common.FromHex("6bfc9654082a7da3055121aa69ddb46852577be71d6c9a204aae3492f0db7e41194f27c9fe4d81cc8421bf8256374edf660806d78b4ed7914a3b74359c8ac0bd65ff1bca674607f7948ea0ae8e83b6d9c5092942b52d2847b6cf44c9c609264d")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
pub := PubKeyPrivacy{}
copy(pub[:], tmp[32*i:32*(i+1)])
pubs[i] = &pub
}
tmp, err = common.FromHex("30041e9694c3184980c3bb87f817eab3f973cd969810ec9df4d2feeee907970693eba4bc5436dc7cf49ce476e091bf74d20003f0f73f6d0412909ed8c1a10701c9c4ec11623dd3c50980ead83865a03dfa27614e5e9fb875d75667c11ced390d438f5dd04a137c73a0ec9ca36dfab62c948ce596722067de0315b570db1f720bab7fb7ea1b124f55c9633548f06d1bb403d7e2e15a1fed70ab2865e324ef340327f6d0ad0a7129b272ce12a5a63836a4e96e95897ee44cc22a7048023f438006")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
sign := Sign{}
copy(sign[:], tmp[64*i:64*(i+1)])
......@@ -250,15 +263,18 @@ func TestCheckRingSignature17(t *testing.T) {
t.Error("initialize public key from hex failed.")
}
tmp, err := common.FromHex("199c5e78a71b320b704e01850a67c371fed3aca11a04077a36e10c808fdc5f57")
assert.Nil(t, err)
copy(image[:], tmp)
for i := 0; i < maxCount; i++ {
pub := PubKeyPrivacy{}
tmp, err = common.FromHex(pubstrs[i])
assert.Nil(t, err)
copy(pub[:], tmp)
pubs[i] = &pub
}
tmp, err = common.FromHex("f5b1a5079f6122d2370da403efc2e5504b07d67ade7ca57ad3720c7e00a676096ad418262cd9f8c9afee8e58be894cb2bf6387a5018f67d629bf8845bdc9b307aee86f85f8612f74ed870abc81d54cb38f2f9108c20dbf81eb7c1160935bc801cdca5d3f09f1d4bac810cb03ec32753f65a2071a97ba787c2d550ea5ff4d890ac398a1576d108ee67138e7596af54199247c6413e06124af8db76c0ad67c160f351e53029cac4a073c8b188eb8b5151ebf1f34a6693ddbf467ac8c20eec51204c3ca29fd5814f0848b966d2bca9543fc953a0d04bb4782950123d87bd378f60d3cdc5e44160ed4265b7cd84a8200244fa24bac86c50c35b885a15f1bc1de9909fabab87d504fc0cb0b263564e606505477ded1f89543bd4d6ed87ce61918f705359c525c0e0a4cc1d77043c71dfdf9c6834e2623197af1629e34962d940eb4080d06dddaa6e12953232595906289e4712f6aa8c1189f336b823a6a38ac95390b63c508a3409256f0c4df687d4b49990d9878fc5c97af32aa99bc9ffa1215860f69fc141c763fe1f4ed3ccc72e6817e926164752686d55238e74032c47c8c580f7042a62bd74858768815a05b58887f9828bf0f184eceba1416ac294abe453105a0de353316374b1c0560acc0f98181e3229084721a0d2a6ed891d57b805984044372cbb566c91696f5d63e7e5d8cc906c5fb029e71e87a339fcbaee9502f3d01dfd203dbd04797c33370dd0626baabfb9577ca1c294d1d8c6b82ac9624496f04893ad6b2222799cfd1d4ec525b011ecf72b01f6f3b8a6a165f0169fa7cc0960025787d4253e1064e71190d36965605adb850e72e17685e35772cdd3fdfb3d505e96e5eb0ecf8c11bcef62c79e0d49e3ebc76e56d18753403a880b7d7ed399c0e143df235ac8b0748d99e1b0cdcc511abc079c1bdbfead04265d9ad44e5dd7c0e97e4afbacba478539071db02315cc9326c8edb3d8530c7fc78af9ca12b241c04f87bffab95d85f8486ff01aec75e7e38a75ff023e4b2b0f59999c4ac067b500863a63de803da2c89de74878879a39aec6cf800b117ef89ea068a71db5ef70200163d1b4beaeea8c642430e15a64baefd350cb16ca5dae6563c13162904908301485d2c4e5bac6d55dd947a169a38df2848d5e227482760f6d818c45f66a6380507d691ef87e3550626254da3ec65411e8e5aa2ab4846222e208c9ba18cd5ee09617398af31b9eac38b59180bfaec538e5542d698da20016720ced6edb7ba270059c1e1e7107d71524e4a9cf562b5da263b52368f477c5205c768ac36975a250310c37d1f40f5a6eac857ed6082c12f5cf20a0403afcde3f1ea2e4743cb1ba10fd5d92038b1fc65d09467aeac9fe7cd24f78b9376d47d2ef1d3677ede62b2640544dd1b301292b8d082a97bd910ca24fbb5eea878f2cfa4e983bb25a8a66a25065988477eec0c1815a3fa2ff421621707954e9eacdf823eea02c2e3742797c6097e570479b36ca4580c5be9bab187de6a1fa6609768b3fa6448b5bc56d6de820d")
assert.Nil(t, err)
for i := 0; i < maxCount; i++ {
sign := Sign{}
copy(sign[:], tmp[64*i:64*(i+1)])
......
plugin/dapp/privacy/executor/privacy.go
View file @ f000476b
......@@ -272,7 +272,7 @@ func (p *privacy) CheckTx(tx *types.Transaction, index int) error {
totalOutput += output.Amount
}
feeAmount := int64(0)
var feeAmount int64
if action.Ty == pty.ActionPrivacy2Privacy {
feeAmount = totalInput - totalOutput
} else {
......
plugin/dapp/privacy/wallet/privacy.go
View file @ f000476b
......@@ -312,8 +312,8 @@ func (policy *privacyPolicy) showPrivacyKeyPair(reqAddr *types.ReqString) (*priv
return nil, err
}
pair := privacyInfo.ViewPubkey[:]
pair = append(pair, privacyInfo.SpendPubkey[:]...)
//pair := privacyInfo.ViewPubkey[:]
//pair = append(pair, privacyInfo.SpendPubkey[:]...)
replyPrivacyPkPair := &privacytypes.ReplyPrivacyPkPair{
ShowSuccessful: true,
......@@ -333,6 +333,10 @@ func (policy *privacyPolicy) getPrivacyAccountInfo(req *privacytypes.ReqPPrivacy
// 搜索可用余额
privacyDBStore, err := policy.store.listAvailableUTXOs(token, addr)
if err != nil {
bizlog.Error("getPrivacyAccountInfo", "listAvailableUTXOs")
return nil, err
}
utxos := make([]*privacytypes.UTXO, 0)
for _, ele := range privacyDBStore {
utxoBasic := &privacytypes.UTXOBasic{
......
plugin/dapp/privacy/wallet/privacybizpolicy_test.go
View file @ f000476b
......@@ -118,7 +118,7 @@ func (mock *testDataMock) importPrivateKey(PrivKey *types.ReqWalletImportPrivkey
defer wallet.GetMutex().Unlock()
ok, err := wallet.CheckWalletStatus()
if !ok {
if !ok || err != nil {
return
}
......@@ -128,7 +128,7 @@ func (mock *testDataMock) importPrivateKey(PrivKey *types.ReqWalletImportPrivkey
//校验label是否已经被使用
Account, err := wallet.GetAccountByLabel(PrivKey.GetLabel())
if Account != nil {
if Account != nil || err != nil {
return
}
......@@ -161,7 +161,7 @@ func (mock *testDataMock) importPrivateKey(PrivKey *types.ReqWalletImportPrivkey
Encrypteredstr := common.ToHex(Encryptered)
//校验PrivKey对应的addr是否已经存在钱包中
Account, err = wallet.GetAccountByAddr(addr)
if Account != nil {
if Account != nil || err != nil {
if Account.Privkey == Encrypteredstr {
return
} else {
......
plugin/dapp/privacy/wallet/privacystore_test.go
View file @ f000476b
......@@ -255,8 +255,10 @@ func testStore_listAvailableUTXOs(t *testing.T) {
err = store.Set(key, []byte("AccKey"))
assert.NoError(t, err)
utxos, err = store.listAvailableUTXOs(token, addr)
assert.Nil(t, utxos)
assert.NotNil(t, err)
err = store.Set([]byte("AccKey"), bt)
assert.NoError(t, err)
utxos, err = store.listAvailableUTXOs(token, addr)
assert.NoError(t, err)
assert.Equal(t, 1, len(utxos))
......@@ -290,6 +292,7 @@ func testStore_getAccountByAddr(t *testing.T) {
bt, err := proto.Marshal(account)
assert.NoError(t, err)
err = store.Set(calcAddrKey(addr), bt)
assert.NoError(t, err)
was, err = store.getAccountByAddr(addr)
assert.Equal(t, true, proto.Equal(was, account))
assert.NoError(t, err)
......@@ -345,6 +348,7 @@ func testStore_getVersion(t *testing.T) {
bt, err = json.Marshal(PRIVACYDBVERSION)
assert.NoError(t, err)
err = store.Set(calcPrivacyDBVersion(), bt)
assert.NoError(t, err)
version = store.getVersion()
assert.Equal(t, PRIVACYDBVERSION, version)
}
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