some clean

Author: vasyafromrussia

contract/src/claim/api.rs

@@ -66,8 +66,8 @@ impl ClaimApi for Contract {
         }
 
         let account_rollback = AccountV1Companion {
-            score: Some(account.score),
-            jars: Some(rollback_jars),
+            score: account.score.into(),
+            jars: rollback_jars.into(),
             ..AccountV1Companion::default()
         };
 

contract/src/jar/api.rs

@@ -10,7 +10,11 @@ use sweat_jar_model::{
 use crate::{
     assert::assert_not_locked_legacy,
     event::{emit, EventKind, RestakeData},
-    jar::{account::Account, model::AccountLegacyV2, view::DetailedJarV2},
+    jar::{
+        account::{v1::AccountV1, Account},
+        model::AccountLegacyV2,
+        view::DetailedJarV2,
+    },
     product::model::v1::{InterestCalculator, Product},
     score::AccountScore,
     Contract, ContractExt,
@@ -121,9 +125,7 @@ impl From<&AccountLegacyV2> for Account {
     fn from(value: &AccountLegacyV2) -> Self {
         let mut account = Account {
             nonce: value.last_id,
-            jars: HashMap::default(),
-            score: AccountScore::default(),
-            is_penalty_applied: false,
+            ..Account::default()
         };
 
         for jar in &value.jars {

contract/src/score/account_score.rs

@@ -62,11 +62,9 @@ impl AccountScore {
         }
     }
 
-    pub fn try_reset_score(&mut self) -> Option<Vec<Score>> {
+    pub fn try_reset_score(&mut self) {
         if self.is_valid() {
-            Some(self.reset_score())
-        } else {
-            None
+            self.reset_score();
         }
     }