Extracting AddrFilters and AddrsFactory for easy re-use with libp2p hosts

I am adding address related options in ipfs-cluster, Announce, NoAnnounce, AddrsFilter (inspired from IPFS options with the same names). Code for this in present in https://github.com/ipfs/go-ipfs/blob/master/core/node/libp2p/addrs.go

For cluster, I have copied the code, and modified as per needs. Because these functions return `func() (opts Libp2pOpts, err error)` instead of a libp2p option, it is not possible to readily re-use them.

Is it possible to extract this and if so, what would be the best place to do that?

Linking relevant comment https://github.com/ipfs/ipfs-cluster/pull/980#issuecomment-565620752