commit 2b2534cc76a3d86af4d4895b2433d08d19663b38
author Abtin Keshavarzian <abtink@google.com> Mon Mar 28 21:07:34 2022 -0700
committer GitHub <noreply@github.com> Mon Mar 28 21:07:34 2022 -0700
tree ad8104dde254f3438db454d4a7dcdb8840c68093
parent 3be955b28b91356cd5656e8877c46b57cb5765b3

[mle] change `Restore()` to return `void` (#7537)

src/core/common/instance.cpp

diff --git a/src/core/common/instance.cpp b/src/core/common/instance.cpp
index bb2b4a7..5e87a7e 100644
--- a/src/core/common/instance.cpp
+++ b/src/core/common/instance.cpp
@@ -189,7 +189,7 @@
     // Restore datasets and network information
 
     Get<Settings>().Init();
-    IgnoreError(Get<Mle::MleRouter>().Restore());
+    Get<Mle::MleRouter>().Restore();
 
 #if OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE
     Get<Trel::Link>().AfterInit();

src/core/thread/mle.cpp

diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index f877371..82d112e 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -310,9 +310,8 @@
     return;
 }
 
-Error Mle::Restore(void)
+void Mle::Restore(void)
 {
-    Error                 error = kErrorNone;
     Settings::NetworkInfo networkInfo;
     Settings::ParentInfo  parentInfo;
 
@@ -323,7 +322,7 @@
     Get<DuaManager>().Restore();
 #endif
 
-    SuccessOrExit(error = Get<Settings>().Read(networkInfo));
+    SuccessOrExit(Get<Settings>().Read(networkInfo));
 
     Get<KeyManager>().SetCurrentKeySequence(networkInfo.GetKeySequence());
     Get<KeyManager>().SetMleFrameCounter(networkInfo.GetMleFrameCounter());
@@ -356,9 +355,7 @@
 
     if (!IsActiveRouter(networkInfo.GetRloc16()))
     {
-        error = Get<Settings>().Read(parentInfo);
-
-        if (error != kErrorNone)
+        if (Get<Settings>().Read(parentInfo) != kErrorNone)
         {
             // If the restored RLOC16 corresponds to an end-device, it
             // is expected that the `ParentInfo` settings to be valid
@@ -390,11 +387,11 @@
     }
 #endif
 
-    // Sucessfully restored the network information from non-volatile settings after boot.
+    // Successfully restored the network information from non-volatile settings after boot.
     mHasRestored = true;
 
 exit:
-    return error;
+    return;
 }
 
 Error Mle::Store(void)

src/core/thread/mle.hpp

diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp
index 92211da..38d8f87 100644
--- a/src/core/thread/mle.hpp
+++ b/src/core/thread/mle.hpp
@@ -144,13 +144,10 @@
     void Stop(void) { Stop(kUpdateNetworkDatasets); }
 
     /**
-     * This method restores network information from non-volatile memory.
-     *
-     * @retval kErrorNone      Successfully restore the network information.
-     * @retval kErrorNotFound  There is no valid network information stored in non-volatile memory.
+     * This method restores network information from non-volatile memory (if any).
      *
      */
-    Error Restore(void);
+    void Restore(void);
 
     /**
      * This method stores network information into non-volatile memory.