TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2260 from nspcc-dev/fix-notary-test-failure

Browse source 
Fix notary test failure
This commit is contained in:
Roman Khimov 2021-11-16 16:09:41 +03:00 committed by GitHub
commit ecfe3e7247
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/core/notary_test.go
View file

@ -55,6 +55,18 @@ func getTestNotary(t *testing.T, bc *Blockchain, walletPath, pass string, onTx f
return w.Accounts[0], ntr, mp return w.Accounts[0], ntr, mp
} }
// dupNotaryRequest duplicates notary request by serializing/deserializing it. Use
// it to avoid data races when reusing the same payload. Normal OnNewRequest handler
// never receives the same (as in the same pointer) payload multiple times, even if
// the contents is the same it would be a separate buffer.
func dupNotaryRequest(t *testing.T, p *payload.P2PNotaryRequest) *payload.P2PNotaryRequest {
b, err := p.Bytes()
require.NoError(t, err)
r, err := payload.NewP2PNotaryRequestFromBytes(b)
require.NoError(t, err)
return r
}
func TestNotary(t *testing.T) { func TestNotary(t *testing.T) {
bc := newTestChain(t) bc := newTestChain(t)
var ( var (
@ -146,7 +158,7 @@ func TestNotary(t *testing.T) {
fallback.Nonce = nonce fallback.Nonce = nonce
nonce++ nonce++
fallback.SystemFee = 1_0000_0000 fallback.SystemFee = 1_0000_0000
fallback.ValidUntilBlock = bc.BlockHeight() + 50 fallback.ValidUntilBlock = bc.BlockHeight() + 2*nvbDiffFallback
fallback.Signers = []transaction.Signer{ fallback.Signers = []transaction.Signer{
{ {
Account: bc.GetNotaryContractScriptHash(), Account: bc.GetNotaryContractScriptHash(),
@ -344,7 +356,7 @@ func TestNotary(t *testing.T) {
completedCount := len(completedTxes) completedCount := len(completedTxes)
// check that the same request won't be processed twice // check that the same request won't be processed twice
ntr1.OnNewRequest(requests[sendOrder[i]]) ntr1.OnNewRequest(dupNotaryRequest(t, requests[sendOrder[i]]))
checkMainTx(t, requesters, requests, i+1, shouldComplete) checkMainTx(t, requesters, requests, i+1, shouldComplete)
require.Equal(t, completedCount, len(completedTxes)) require.Equal(t, completedCount, len(completedTxes))
} }
@ -380,7 +392,7 @@ func TestNotary(t *testing.T) {
checkMainTx(t, requesters, submittedRequests, i+1, shouldComplete) checkMainTx(t, requesters, submittedRequests, i+1, shouldComplete)
// check that the same request won't be processed twice // check that the same request won't be processed twice
ntr1.OnNewRequest(requests[sendOrder[i]]) ntr1.OnNewRequest(dupNotaryRequest(t, requests[sendOrder[i]]))
checkMainTx(t, requesters, submittedRequests, i+1, shouldComplete) checkMainTx(t, requesters, submittedRequests, i+1, shouldComplete)
} }
@ -424,7 +436,7 @@ func TestNotary(t *testing.T) {
completedCount := len(completedTxes) completedCount := len(completedTxes)
// check that the same request won't be processed twice // check that the same request won't be processed twice
ntr1.OnNewRequest(requests[i]) ntr1.OnNewRequest(dupNotaryRequest(t, requests[i]))
checkMainTx(t, requesters, requests, i+1, shouldComplete) checkMainTx(t, requesters, requests, i+1, shouldComplete)
require.Equal(t, completedCount, len(completedTxes)) require.Equal(t, completedCount, len(completedTxes))
} }