try immediate cleanup

Author: tt-cll

framework/components/blockchain/blockchain.go

@@ -2,6 +2,8 @@ package blockchain
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/testcontainers/testcontainers-go"
 )
 
@@ -26,6 +28,9 @@ type Input struct {
 	// a map of program name to program id
 	// there needs to be a matching .so file in contracts_dir
 	SolanaPrograms map[string]string `toml:"solana_programs"`
+
+	// used to cancel container contexts
+	T *testing.T `toml:"testing"`
 }
 
 // Output is a blockchain network output, ChainID and one or more nodes that forms the network

framework/components/blockchain/solana.go

@@ -131,6 +131,13 @@ func newSolana(in *Input) (*Output, error) {
 		ContainerRequest: req,
 		Started:          true,
 	})
+	// Call cleanup container indiscriminately
+	// This should be called as a defer directly after (before any error check)
+	// of [GenericContainer](...) or a modules Run(...) in a test to ensure the
+	// container is stopped when the function ends.
+	if in.T != nil {
+		testcontainers.CleanupContainer(in.T, c)
+	}
 	if err != nil {
 		return nil, err
 	}