Remove unused parameter (defaultPolicy)

diff --git a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
index db32b8c..9953169 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
+++ b/src/main/scala/gr/grnet/aquarium/user/UserStateComputations.scala
@@ -87,7 +87,6 @@ class UserStateComputations extends Loggable {
                                        userCreationMillis: Long,
                                        currentUserState: UserState,
                                        zeroUserState: UserState, 
-                                       defaultPolicy: DSLPolicy,
                                        defaultResourcesMap: DSLResourcesMap,
                                        accounting: Accounting,
                                        contextualLogger: Maybe[ContextualLogger] = NoVal): Maybe[UserState] = {
@@ -109,7 +108,6 @@ class UserStateComputations extends Loggable {
         userCreationMillis,
         currentUserState,
         zeroUserState,
-        defaultPolicy,
         defaultResourcesMap,
         accounting,
         Just(clog))
@@ -192,7 +190,6 @@ class UserStateComputations extends Loggable {
                            userCreationMillis: Long,
                            currentUserState: UserState,
                            zeroUserState: UserState,
-                           defaultPolicy: DSLPolicy,
                            defaultResourcesMap: DSLResourcesMap,
                            accounting: Accounting,
                            contextualLogger: Maybe[ContextualLogger] = NoVal): Maybe[UserState] = Maybe {
@@ -216,7 +213,6 @@ class UserStateComputations extends Loggable {
       userCreationMillis,
       currentUserState,
       zeroUserState,
-      defaultPolicy,
       defaultResourcesMap,
       accounting,
       Just(clog)

diff --git a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
index 514c15e..99b60a8 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/user/UserStateComputationsTest.scala
@@ -104,9 +104,10 @@ aquariumpolicy:
     val resourceEventStore = storeProvider.resourceEventStore
     val policyStore = storeProvider.policyStore
 
-    val policyOccurredMillis  = StartOfBillingYearDateCalc.toMillis
-    val policyValidFromMillis = StartOfBillingYearDateCalc.copy.goPreviousYear.toMillis
-    val policyValidToMillis   = StartOfBillingYearDateCalc.copy.goNextYear.toMillis
+    val policyDateCalc        = StartOfBillingYearDateCalc.copy
+    val policyOccurredMillis  = policyDateCalc.toMillis
+    val policyValidFromMillis = policyDateCalc.copy.goPreviousYear.toMillis
+    val policyValidToMillis   = policyDateCalc.copy.goNextYear.toMillis
     policyStore.storePolicyEntry(DefaultPolicy.toPolicyEntry(policyOccurredMillis, policyValidFromMillis, policyValidToMillis))
 
     val Aquarium = AquariumSim(List(VMTimeResource, DiskspaceResource, BandwidthResource), storeProvider.resourceEventStore)
@@ -184,7 +185,6 @@ aquariumpolicy:
       UserCKKL.userCreationDate.getTime,
       currentUserState,
       initialUserState,
-      DefaultPolicy,
       DefaultResourcesMap,
       new Accounting{},
       Just(clog)