Address PR comments

hashicorp · Dec 22, 2023 · 2e3e6bf · 2e3e6bf
1 parent c92f1bd
commit 2e3e6bf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 199 deletions.
diff --git a/physical/raft/msgpack.go b/physical/raft/msgpack.go
diff --git a/physical/raft/raft.go b/physical/raft/raft.go
@@ -904,9 +904,6 @@ type SetupOpts struct {
 	// RecoveryModeConfig is the configuration for the raft cluster in recovery
 	// mode.
 	RecoveryModeConfig *raft.Configuration
-
-	// overrideMsgpackUseNewTimeFormat is used for testing backwards compatability
-	overrideMsgpackUseNewTimeFormat *bool
 }
 
 func (b *RaftBackend) StartRecoveryCluster(ctx context.Context, peer Peer) error {
@@ -1008,9 +1005,6 @@ func (b *RaftBackend) SetupCluster(ctx context.Context, opts SetupOpts) error {
 			Logger:                  b.logger.Named("raft-net"),
 			MsgpackUseNewTimeFormat: true,
 		}
-		if opts.overrideMsgpackUseNewTimeFormat != nil {
-			transConfig.MsgpackUseNewTimeFormat = *opts.overrideMsgpackUseNewTimeFormat
-		}
 		transport := raft.NewNetworkTransportWithConfig(transConfig)
 
 		b.streamLayer = streamLayer

diff --git a/physical/raft/raft_network_test.go b/physical/raft/raft_network_test.go
diff --git a/physical/raft/testing.go b/physical/raft/testing.go
@@ -14,20 +14,16 @@ import (
 )
 
 func GetRaft(t testing.TB, bootstrap bool, noStoreState bool) (*RaftBackend, string) {
-	return GetRaftWithOpts(t, bootstrap, noStoreState, SetupOpts{})
-}
-
-func GetRaftWithOpts(t testing.TB, bootstrap bool, noStoreState bool, setupOpts SetupOpts) (*RaftBackend, string) {
 	raftDir, err := ioutil.TempDir("", "vault-raft-")
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Logf("raft dir: %s", raftDir)
 
-	return getRaftWithDir(t, bootstrap, noStoreState, raftDir, setupOpts)
+	return getRaftWithDir(t, bootstrap, noStoreState, raftDir)
 }
 
-func getRaftWithDir(t testing.TB, bootstrap bool, noStoreState bool, raftDir string, setupOpts SetupOpts) (*RaftBackend, string) {
+func getRaftWithDir(t testing.TB, bootstrap bool, noStoreState bool, raftDir string) (*RaftBackend, string) {
 	id, err := uuid.GenerateUUID()
 	if err != nil {
 		t.Fatal(err)
@@ -66,7 +62,7 @@ func getRaftWithDir(t testing.TB, bootstrap bool, noStoreState bool, raftDir str
 			t.Fatal(err)
 		}
 
-		err = backend.SetupCluster(context.Background(), setupOpts)
+		err = backend.SetupCluster(context.Background(), SetupOpts{})
 		if err != nil {
 			t.Fatal(err)
 		}