* Revert "start to refactor block import wrapper a bit" This reverts commit b919de49. * Refactor grandpa stuff to get tests almost compiling * Fixes after rebase * Fixes merge compile errors