diff --git a/pkg/core/notary_test.go b/pkg/core/notary_test.go index 784b477db..2ca1d8e89 100644 --- a/pkg/core/notary_test.go +++ b/pkg/core/notary_test.go @@ -55,6 +55,18 @@ func getTestNotary(t *testing.T, bc *Blockchain, walletPath, pass string, onTx f 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) { bc := newTestChain(t) var ( @@ -146,7 +158,7 @@ func TestNotary(t *testing.T) { fallback.Nonce = nonce nonce++ fallback.SystemFee = 1_0000_0000 - fallback.ValidUntilBlock = bc.BlockHeight() + 50 + fallback.ValidUntilBlock = bc.BlockHeight() + 2*nvbDiffFallback fallback.Signers = []transaction.Signer{ { Account: bc.GetNotaryContractScriptHash(), @@ -344,7 +356,7 @@ func TestNotary(t *testing.T) { completedCount := len(completedTxes) // 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) require.Equal(t, completedCount, len(completedTxes)) } @@ -380,7 +392,7 @@ func TestNotary(t *testing.T) { checkMainTx(t, requesters, submittedRequests, i+1, shouldComplete) // 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) } @@ -424,7 +436,7 @@ func TestNotary(t *testing.T) { completedCount := len(completedTxes) // 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) require.Equal(t, completedCount, len(completedTxes)) }