0649ba9645
* remove non-mainnet check for PIBD requests * remove surplus flag * use matches! macro * fix match logic * correct match logic