testutil: change the prototype for wrapMssimTransport

canonical · Jul 31, 2024 · 12ba3f6 · 12ba3f6
1 parent 8b41c43
commit 12ba3f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/testutil/export_test.go b/testutil/export_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/canonical/go-tpm2"
 )
 
-func MockWrapMssimTransport(fn func(tpm2.Transport, TPMFeatureFlags) (*Transport, error)) (restore func()) {
+func MockWrapMssimTransport(fn func(tpm2.Transport) (*Transport, error)) (restore func()) {
 	origWrapMssimTransport := wrapMssimTransport
 	wrapMssimTransport = fn
 	return func() {

diff --git a/testutil/tpm.go b/testutil/tpm.go
@@ -168,7 +168,9 @@ var (
 	// MssimPort defines the port number of the TPM simulator command port where TPMBackend is TPMBackendMssim.
 	MssimPort uint = 2321
 
-	wrapMssimTransport = WrapTransport
+	wrapMssimTransport = func(transport tpm2.Transport) (*Transport, error) {
+		return WrapTransport(transport, TPMFeatureFlags(math.MaxUint32))
+	}
 
 	ErrSkipNoTPM = errors.New("no TPM configured for the test")
 )
@@ -970,7 +972,7 @@ func (d *simulatorDevice) Open() (tpm2.Transport, error) {
 		return nil, err
 	}
 
-	return wrapMssimTransport(transport, TPMFeatureFlags(math.MaxUint32))
+	return wrapMssimTransport(transport)
 }
 
 func (d *simulatorDevice) String() string {

diff --git a/testutil/transport_test.go b/testutil/transport_test.go
@@ -64,7 +64,7 @@ func (s *transportSuite) SetUpTest(c *C) {
 }
 
 func (s *transportSuite) initTPMContext(c *C, permittedFeatures TPMFeatureFlags) {
-	restore := MockWrapMssimTransport(func(transport tpm2.Transport, _ TPMFeatureFlags) (*Transport, error) {
+	restore := MockWrapMssimTransport(func(transport tpm2.Transport) (*Transport, error) {
 		return WrapTransport(&ignoreCloseTransport{transport: transport}, permittedFeatures)
 	})
 	defer restore()