Patches for merge

cmd/geth/logging_test.go

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import (
 	"bufio"

cmd/geth/logtestcmd_active.go

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import (
 	"errors"

cmd/geth/logtestcmd_inactive.go

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
-package main
+package geth
 
 import "github.com/urfave/cli/v2"