Merge branch 'master' into vms-serialize-test

snow/engine/avalanche/transitive_test.go

@@ -24,6 +24,22 @@ var (
 	errMissing       = errors.New("missing")
 )
 
+func TestEngineShutdown(t *testing.T) {
+	config := DefaultConfig()
+	vmShutdownCalled := false
+	vm := &VMTest{}
+	vm.ShutdownF = func() { vmShutdownCalled = true }
+	config.VM = vm
+
+	transitive := &Transitive{}
+
+	transitive.Initialize(config)
+	transitive.finishBootstrapping()
+	transitive.Shutdown()
+	if !vmShutdownCalled {
+		t.Fatal("Shutting down the Transitive did not shutdown the VM")
+	}
+}
 func TestEngineAdd(t *testing.T) {
 	config := DefaultConfig()
 

snow/engine/snowman/transitive_test.go

@@ -64,6 +64,17 @@ func setup(t *testing.T) (validators.Validator, validators.Set, *common.SenderTe
 	return vdr, vals, sender, vm, te, gBlk
 }
 
+func TestEngineShutdown(t *testing.T) {
+	_, _, _, vm, transitive, _ := setup(t)
+	vmShutdownCalled := false
+	vm.ShutdownF = func() { vmShutdownCalled = true }
+	vm.CantShutdown = false
+	transitive.Shutdown()
+	if !vmShutdownCalled {
+		t.Fatal("Shutting down the Transitive did not shutdown the VM")
+	}
+}
+
 func TestEngineAdd(t *testing.T) {
 	vdr, _, sender, vm, te, _ := setup(t)
 

snow/networking/sender/sender_test.go

@@ -4,6 +4,7 @@
 package sender
 
 import (
+	"reflect"
 	"sync"
 	"testing"
 	"time"
@@ -17,6 +18,20 @@ import (
 	"github.com/ava-labs/gecko/utils/logging"
 )
 
+func TestSenderContext(t *testing.T) {
+	context := snow.DefaultContextTest()
+	sender := Sender{}
+	sender.Initialize(
+		context,
+		&ExternalSenderTest{},
+		&router.ChainRouter{},
+		&timeout.Manager{},
+	)
+	if res := sender.Context(); !reflect.DeepEqual(res, context) {
+		t.Fatalf("Got %#v, expected %#v", res, context)
+	}
+}
+
 func TestTimeout(t *testing.T) {
 	tm := timeout.Manager{}
 	tm.Initialize(time.Millisecond)