tree 83e3e990cebe4d78873eeb8a1d81301e6b5d67c6
parent e2ddb9371edb03c43b0fe386ef340db2697eede1
author alan-baker <33432579+alan-baker@users.noreply.github.com> 1554230225 -0400
committer GitHub <noreply@github.com> 1554230225 -0400
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJco6vRCRBK7hj4Ov3rIwAAdHIIAFPN3/qqXIl/pUssscfbrLjD
 RZCOUpCP4raLc81OE5wOtNkBqmZrWEiQNb9cQhCv9VUKLU72fhQUta94SCZrTH7h
 /QPWOiHnLSStXF7qyflpzS/c9Ad+WSqCaeutodqxJAs+PJYW9/7FwHSf+gk+Zz+N
 Al4dFfaI5CaPf6BNIwXStRyzKYzzK9wknv11c5YMOaRZ69SfGDN5taa++T7kWdRi
 CBMpGEy0Fo/iUNjlCyJqolVBTjOpWJrFr0fP1sSJnFnMvHlUexmY8Bud+rSSlekq
 NhsGP1y1UJ0AfnyjfA28Cn32fq0z22VIOQbEE6056aEcLbwKINLd6hdUD/afX+c=
 =3o6Y
 -----END PGP SIGNATURE-----
 

Remove merge assert in block calculation (#2489)

Fixes #2488

* Validator doesn't identify back-edge of the loop, so the merge is
never set
* Construct::blocks() has safe uses of `merge` so the assert can be
removed
* Added a test