From 359f1a614f6f0afe5b8876fab22d75e7f4d03013 Mon Sep 17 00:00:00 2001
From: Nick Cabatoff <ncabatoff@hashicorp.com>
Date: Fri, 14 Jul 2023 09:05:34 -0400
Subject: [PATCH] Revert "Add code that would break ent if merged prior to
 stubmaker (#21634)" (#21693)

This reverts commit 502c2830c0575fe2ada36ef72cb16f61546bb660.
---
 vault/test_stubmaker.go     | 13 -------------
 vault/test_stubmaker_oss.go | 16 ----------------
 2 files changed, 29 deletions(-)
 delete mode 100644 vault/test_stubmaker.go
 delete mode 100644 vault/test_stubmaker_oss.go

diff --git a/vault/test_stubmaker.go b/vault/test_stubmaker.go
deleted file mode 100644
index becec1d18b..0000000000
--- a/vault/test_stubmaker.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package vault
-
-import (
-	"github.com/hashicorp/vault/vault/cluster"
-)
-
-func test() {
-	testStubmaker(cluster.Listener{})
-	testStubmaker2()
-}
diff --git a/vault/test_stubmaker_oss.go b/vault/test_stubmaker_oss.go
deleted file mode 100644
index 8d3593f725..0000000000
--- a/vault/test_stubmaker_oss.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-//go:build !enterprise
-
-package vault
-
-import (
-	"github.com/hashicorp/vault/vault/cluster"
-	"github.com/hashicorp/vault/vault/seal"
-)
-
-//go:generate go run github.com/hashicorp/vault/tools/stubmaker
-
-func testStubmaker(_ cluster.Listener) {}
-func testStubmaker2() *seal.Envelope   { return nil }