primitives: covenant encoding/decoding simplification

[kilpatty]

We have our encoding and decoding done for covenants following a similar example to hsd, but there are some scenarios in which things are overly complicated. This section needs a cleanup, but along with the previous issue we should have some tests before we do this to ensure that the cleanup doesn't change functionality at the edge cases.