dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #583 from nspcc-dev/fix/gettx

Browse source 
consensus: return nil interface from getTx
This commit is contained in:
Evgeniy Kulikov 2019-12-27 14:51:27 +03:00 committed by GitHub
commit d0ffa2d79d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/consensus/consensus.go
View file

@ -253,7 +253,13 @@ func (s *service) getTx(h util.Uint256) block.Transaction {
tx, _, _ := s.Config.Chain.GetTransaction(h) tx, _, _ := s.Config.Chain.GetTransaction(h)
// this is needed because in case of absent tx dBFT expects to
// get nil interface, not a nil pointer to any concrete type
if tx != nil {
return tx return tx
}
return nil
} }
func (s *service) verifyBlock(b block.Block) bool { func (s *service) verifyBlock(b block.Block) bool {

31
pkg/consensus/consensus_test.go
View file

@ -56,6 +56,37 @@ func TestService_ValidatePayload(t *testing.T) {
}) })
} }
func TestService_getTx(t *testing.T) {
srv := newTestService(t)
t.Run("transaction in mempool", func(t *testing.T) {
tx := newMinerTx(1234)
h := tx.Hash()
require.Equal(t, nil, srv.getTx(h))
item := core.NewPoolItem(tx, new(feer))
srv.Chain.GetMemPool().TryAdd(h, item)
got := srv.getTx(h)
require.NotNil(t, got)
require.Equal(t, h, got.Hash())
})
t.Run("transaction in local cache", func(t *testing.T) {
tx := newMinerTx(4321)
h := tx.Hash()
require.Equal(t, nil, srv.getTx(h))
srv.txx.Add(tx)
got := srv.getTx(h)
require.NotNil(t, got)
require.Equal(t, h, got.Hash())
})
}
func TestService_OnPayload(t *testing.T) { func TestService_OnPayload(t *testing.T) {
srv := newTestService(t) srv := newTestService(t)