chore(decider): Refactor aqua code

src/aqua/chain/blocks.aqua

@@ -16,43 +16,35 @@ func get_latest(spell_id: SpellId, chain: ChainInfo) -> ?string:
         spell_log(spell_id, ["error retrieving latest block number", latest_block.error])
     <- latest
 
--- implements Less Than or Equal for two hex strings, i.e. `hex_a <= hex_b`
+-- Implements comparison for two hex strings
+-- spell_id - spell id for error log
+-- hex_a - left hex string
+-- hex_b - right hex string
+-- pred - func from ordering to result 
+--        ordering is -1 for <, 0 for =, 1 for >
 -- returns nil if either `hex_a` or `hex_b` is an invalid hex
-func lte(spell_id: string, hex_a: string, hex_b: string) -> ?bool:
-    lte: ?bool
+func hex_cmp(spell_id: SpellId, hex_a: string, hex_b: string, pred: i8 -> bool) -> ?bool:
+    result: ?bool
 
     cmp <- ChainConnector.hex_cmp(hex_a, hex_b)
+
     if cmp.success:
-        -- `hex_a` is less than `hex_b`
-        if cmp.ordering == -1:
-            lte <<- true
-        -- `hex_a` equals to `hex_b`
-        if cmp.ordering == 0:
-            lte <<- true
-        -- `hex_a` is greater than `hex_b`
-        if cmp.ordering == 1:
-            lte <<- false
+        result <- pred(cmp.ordering)
     else:
         spell_log(spell_id, ["hex_cmp error", cmp.error])
 
-    <- lte
+    <- result
 
--- `hex_a > hex_b`
-func gt(spell_id: string, hex_a: string, hex_b: string) -> ?bool:
-    gt: ?bool
+-- LTE for two hex strings, i.e. `hex_a <= hex_b`
+func lte(spell_id: SpellId, hex_a: string, hex_b: string) -> ?bool:
+    pred = (ord: i8) -> bool:
+        <- ord <= 0
 
-    cmp <- ChainConnector.hex_cmp(hex_a, hex_b)
-    if cmp.success:
-        -- `hex_a` is less than `hex_b`
-        if cmp.ordering == -1:
-            gt <<- false
-        -- `hex_a` equals to `hex_b`
-        if cmp.ordering == 0:
-            gt <<- false
-        -- `hex_a` is greater than `hex_b`
-        if cmp.ordering == 1:
-            gt <<- true
-    else:
-        spell_log(spell_id, ["hex_cmp error", cmp.error])
+    <- hex_cmp(spell_id, hex_a, hex_b, pred)
+
+-- GT for two hex strings, i.e. `hex_a > hex_b`
+func gt(spell_id: string, hex_a: string, hex_b: string) -> ?bool:
+    pred = (ord: i8) -> bool:
+        <- ord > 0
 
-    <- gt
+    <- hex_cmp(spell_id, hex_a, hex_b, pred)

src/aqua/chain/new_deals.aqua

@@ -1,6 +1,5 @@
 module NewDeals declares poll_new_deals
 
-import or, not from "@fluencelabs/aqua-lib/binary.aqua"
 import Spell, TriggerConfig from "@fluencelabs/spell/spell_service.aqua"
 
 import ChainConnector, DealMatched from "services.aqua"
@@ -99,7 +98,7 @@ func poll_logs(spell_id: SpellId, chain: ChainInfo, left: string) -> ?Poll:
     poll: ?Poll
 
     result <- ChainConnector.poll_deal_matches(chain, left)
-    if result.success == false:
+    if !result.success:
         spell_log(spell_id, ["error polling deal created events", result.error])
     else:
         logs = result.logs

src/aqua/decider/deal_spell.aqua

@@ -4,11 +4,11 @@ export main
 
 import deal_install from "@fluencelabs/installation-spell/src/aqua/deal_spell.aqua"
 
-import SpellId, DealId from "../types.aqua"
+import SpellId, DealId, CID from "../types.aqua"
 
 service Console("run-console"):
    print(msg: []string)
 
-func main(spell_id: SpellId, ipfs: string, deal_id: DealId, worker_def_cid: string):
+func main(spell_id: SpellId, ipfs: string, deal_id: DealId, worker_def_cid: CID):
     Console.print(["worker", spell_id, deal_id, worker_def_cid, ipfs])
     deal_install(ipfs, worker_def_cid, deal_id)

src/aqua/decider/deal_storage.aqua

@@ -1,7 +1,6 @@
 module DealStorage declares DealState, JoinedDeal, JsonDealState, JsonJoinedDeal, store_deal_state, get_deal_state, store_joined_deal, get_joined_deals, make_change_reqs, get_joined_deals
 
 import Spell from "@fluencelabs/spell/spell_service.aqua"
-import or, not, and from "@fluencelabs/aqua-lib/binary.aqua"
 
 import Json from "../fluence/peer.aqua"
 import spell_log, get_string, deal_log from "../fluence/spell.aqua"
@@ -36,7 +35,7 @@ func get_deal_state(decider_id: SpellId, deal_id: DealId) -> ?DealState:
     state: ?DealState
 
     json <- Spell.get_string(deal_id)
-    if and(json.success, not(json.absent)):
+    if json.success && !json.absent:
         try:
             state <- JsonDealState.parse(json.str)
         catch e:
@@ -58,13 +57,12 @@ func get_joined_deals(spell_id: SpellId) -> []JoinedDeal:
     joined_deals: *JoinedDeal
 
     list <- Spell.list_get_strings("joined_deals")
-    if list.success == false:
+    if !list.success:
         spell_log(spell_id, ["can't restrive joined deals", list.error])
     else:
         for joined_deal_str <- list.strings:
             try:
-                joined_deal <- JsonJoinedDeal.parse(joined_deal_str)
-                joined_deals <<- joined_deal
+                joined_deals <- JsonJoinedDeal.parse(joined_deal_str)
             catch e:
                 spell_log(spell_id, ["error parsing JoinedDeal", joined_deal_str, e])
 

src/aqua/decider/mailbox.aqua

@@ -40,11 +40,8 @@ func poll_mailbox(spell_id: SpellId):
                 process_message(message)
                 spell_log(spell_id, "will pop")
                 popped <- Spell.pop_mailbox()
-                if popped.message.length == 0:
-                    spell_log(spell_id, ["произошла чудовищная ошибка. expected", msg, "popped nothing"])
-                else:
-                    if popped.message!.message != msg.message:
-                        spell_log(spell_id, ["произошла чудовищная ошибка. expected", msg, "popped", popped])
+                if popped.message.length == 0 || popped.message!.message != msg.message:
+                    spell_log(spell_id, ["произошла чудовищная ошибка. expected", msg, "popped", popped])
 
 func push_remove_worker(spell_id: SpellId, host_id: PeerId, worker_id: WorkerId):
     Spell spell_id

src/aqua/fluence/spell.aqua

@@ -27,11 +27,12 @@ func get_string(spell_id: SpellId, key: string) -> ?string:
     result: *string
 
     value <- Spell.get_string(key)
-    if value.success == false:
+    if !value.success:
         spell_log(spell_id, ["get_string failed", key, value.error])
     else:
-        if value.absent == false:
+        if !value.absent:
             result <<- value.str
+
     <- result
 
 

src/aqua/hex.aqua

@@ -7,20 +7,20 @@ import spell_log from "../fluence/spell.aqua"
 -- increment `hex` by 1
 func inc(spell_id: SpellId, hex: string) -> ?string:
     inc <- ChainConnector.hex_add(hex, 1)
-    if inc.success == false:
+    if !inc.success:
         spell_log(spell_id, ["hex_add failed", hex, 1])
     <- inc.hex
 
 -- decrement `hex` by 1
 func dec(spell_id: SpellId, hex: string) -> ?string:
     dec <- ChainConnector.hex_sub(hex, 1)
-    if dec.success == false:
+    if !dec.success:
         spell_log(spell_id, ["hex_sub failed", hex, 1])
     <- dec.diff
 
 -- decrement `hex` by 1
 func min(spell_id: SpellId, hex_a: string, hex_b: string) -> ?string:
     min <- ChainConnector.hex_min(hex_a, hex_b)
-    if min.success == false:
+    if !min.success:
         spell_log(spell_id, ["hex_min failed", hex_a, hex_b])
     <- min.hex