Add returning of Version from adapter reset.

shimmeringbee · Nov 7, 2020 · a6c7af2 · a6c7af2
1 parent 44b4b17
commit a6c7af2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/adapter_initialise.go b/adapter_initialise.go
@@ -55,7 +55,8 @@ func (z *ZStack) Initialise(ctx context.Context, nc zigbee.NetworkConfiguration)
 
 func (z *ZStack) waitForAdapterReset(ctx context.Context) error {
 	return retry.Retry(ctx, DefaultZStackTimeout, 18, func(invokeCtx context.Context) error {
-		return z.resetAdapter(invokeCtx, Soft)
+		_, err := z.resetAdapter(invokeCtx, Soft)
+		return err
 	})
 }
 
@@ -89,7 +90,8 @@ func (z *ZStack) wipeAdapter(ctx context.Context) error {
 			return z.writeNVRAM(invokeCtx, ZCDNVStartUpOption{StartOption: 0x03})
 		},
 		func(invokeCtx context.Context) error {
-			return z.resetAdapter(invokeCtx, Soft)
+			_, err := z.resetAdapter(invokeCtx, Soft)
+			return err
 		},
 	})
 }
@@ -100,7 +102,8 @@ func (z *ZStack) makeCoordinator(ctx context.Context) error {
 			return z.writeNVRAM(invokeCtx, ZCDNVLogicalType{LogicalType: zigbee.Coordinator})
 		},
 		func(invokeCtx context.Context) error {
-			return z.resetAdapter(invokeCtx, Soft)
+			_, err := z.resetAdapter(invokeCtx, Soft)
+			return err
 		},
 	})
 }

diff --git a/adapter_reset.go b/adapter_reset.go
@@ -2,8 +2,10 @@ package zstack
 
 import "context"
 
-func (z *ZStack) resetAdapter(ctx context.Context, resetType ResetType) error {
-	return z.requestResponder.RequestResponse(ctx, SysResetReq{ResetType: resetType}, &SysResetInd{})
+func (z *ZStack) resetAdapter(ctx context.Context, resetType ResetType) (Version, error) {
+	resetInd := &SysResetInd{}
+	err := z.requestResponder.RequestResponse(ctx, SysResetReq{ResetType: resetType}, resetInd)
+	return resetInd.Version, err
 }
 
 type ResetType uint8

diff --git a/adapter_reset_test.go b/adapter_reset_test.go
@@ -51,22 +51,34 @@ func (m *MockRequestResponder) RequestResponse(ctx context.Context, req interfac
 func Test_resetAdapter(t *testing.T) {
 	t.Run("verifies that a request response is made to unpi", func(t *testing.T) {
 		mrr := new(MockRequestResponder)
+		defer mrr.AssertExpectations(t)
+
+		expectedVersion := Version{
+			TransportRevision: 1,
+			ProductID:         2,
+			MajorRelease:      3,
+			MinorRelease:      4,
+			HardwareRevision:  5,
+		}
 
-		mrr.On("RequestResponse", mock.Anything, SysResetReq{ResetType: Soft}, &SysResetInd{}).Return(nil)
+		mrr.On("RequestResponse", mock.Anything, SysResetReq{ResetType: Soft}, &SysResetInd{}).Return(nil).Run(func(args mock.Arguments) {
+			sysResetInd := args.Get(2).(*SysResetInd)
+			sysResetInd.Version = expectedVersion
+		})
 
 		z := ZStack{requestResponder: mrr}
 
 		ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
 		defer cancel()
 
-		err := z.resetAdapter(ctx, Soft)
-
-		mrr.AssertExpectations(t)
+		actualVersion, err := z.resetAdapter(ctx, Soft)
 		assert.NoError(t, err)
+		assert.Equal(t, expectedVersion, actualVersion)
 	})
 
 	t.Run("verifies that a request response with errors is raised", func(t *testing.T) {
 		mrr := new(MockRequestResponder)
+		defer mrr.AssertExpectations(t)
 
 		mrr.On("RequestResponse", mock.Anything, SysResetReq{ResetType: Soft}, &SysResetInd{}).Return(errors.New("context expired"))
 
@@ -75,9 +87,7 @@ func Test_resetAdapter(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
 		defer cancel()
 
-		err := z.resetAdapter(ctx, Soft)
-
-		mrr.AssertExpectations(t)
+		_, err := z.resetAdapter(ctx, Soft)
 		assert.Error(t, err)
 	})
 }