Fix for benchmark & More refactoring#817

yrong merged 3 commits into

refactor-beacon-clientSnowfork/snowbridge:refactor-beacon-clientfrom

ron/refactor-beacon-clientSnowfork/snowbridge:ron/refactor-beacon-clientCopy head branch name to clipboard