Commit f7626473 authored by hezhengjun's avatar hezhengjun Committed by vipwzw

bug fix of ut's data race

parent 44a494a8
...@@ -38,7 +38,7 @@ var ( ...@@ -38,7 +38,7 @@ var (
passphrase = "123456hzj" passphrase = "123456hzj"
) )
func Test_ImportPrivateKey(t *testing.T) { func Test_ImportRestorePrivateKey(t *testing.T) {
mock33 := newMock33() mock33 := newMock33()
defer mock33.Close() defer mock33.Close()
_, _, _, x2EthDeployInfo, err := setup.DeployContracts() _, _, _, x2EthDeployInfo, err := setup.DeployContracts()
...@@ -60,17 +60,8 @@ func Test_ImportPrivateKey(t *testing.T) { ...@@ -60,17 +60,8 @@ func Test_ImportPrivateKey(t *testing.T) {
key, _, _ = chain33Relayer.GetAccount(passphrase) key, _, _ = chain33Relayer.GetAccount(passphrase)
assert.Equal(t, key, privateKeyStr) assert.Equal(t, key, privateKeyStr)
}
func Test_RestorePrivateKeys(t *testing.T) {
mock33 := newMock33()
defer mock33.Close()
_, _, _, x2EthDeployInfo, err := setup.DeployContracts()
require.NoError(t, err)
chain33Relayer := newChain33Relayer(x2EthDeployInfo, "127.0.0.1:60003")
err = chain33Relayer.ImportPrivateKey(passphrase, privateKeyStr)
assert.NoError(t, err)
//////////////restore part//////////
go func() { go func() {
for range chain33Relayer.unlockChan { for range chain33Relayer.unlockChan {
} }
...@@ -91,8 +82,6 @@ func Test_RestorePrivateKeys(t *testing.T) { ...@@ -91,8 +82,6 @@ func Test_RestorePrivateKeys(t *testing.T) {
err = chain33Relayer.RestorePrivateKeys("new123") err = chain33Relayer.RestorePrivateKeys("new123")
assert.Equal(t, chain33Common.ToHex(chain33Relayer.privateKey4Chain33.Bytes()), privateKeyStr) assert.Equal(t, chain33Common.ToHex(chain33Relayer.privateKey4Chain33.Bytes()), privateKeyStr)
assert.NoError(t, err) assert.NoError(t, err)
time.Sleep(200 * time.Millisecond)
} }
func newChain33Relayer(x2EthDeployInfo *ethtxs.X2EthDeployInfo, pushBind string) *Relayer4Chain33 { func newChain33Relayer(x2EthDeployInfo *ethtxs.X2EthDeployInfo, pushBind string) *Relayer4Chain33 {
......
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