Update escrow.move

Author: root28root

escrow/sources/escrow.move

@@ -1,6 +1,4 @@
 module Escrow::escrow {
-    use std::signer;
-
     /// Error codes
     const E_ALREADY_FUNDED: u64 = 1;
     const E_NOT_FUNDED: u64   = 2;
@@ -9,10 +7,10 @@ module Escrow::escrow {
     const E_NOT_BUYER: u64    = 5;
     const E_NOT_SELLER: u64   = 6;
 
-    /// Simple wallet resource for demo/tests (no global storage)
+    /// Simple wallet (no global storage)
     struct Wallet has store { balance: u64 }
 
-    /// Deal state kept in-memory for demo
+    /// Deal state (in-memory demo)
     struct Deal has store {
         buyer: address,
         seller: address,
@@ -21,45 +19,37 @@ module Escrow::escrow {
         completed: bool,
     }
 
-    public fun new_wallet(_owner: &signer): Wallet { Wallet { balance: 0 } }
+    public fun new_wallet(): Wallet { Wallet { balance: 0 } }
 
-    public fun deposit(_owner: &signer, w: &mut Wallet, amount: u64) {
-        w.balance = w.balance + amount;
-    }
+    public fun deposit(w: &mut Wallet, amount: u64) { w.balance = w.balance + amount; }
 
     public fun balance(w: &Wallet): u64 { w.balance }
 
-    public fun create(buyer: &signer, seller: address, amount: u64): Deal {
-        Deal {
-            buyer: signer::address_of(buyer),
-            seller,
-            amount,
-            funded: false,
-            completed: false,
-        }
+    public fun create(buyer: address, seller: address, amount: u64): Deal {
+        Deal { buyer, seller, amount, funded: false, completed: false }
     }
 
-    public fun fund(buyer: &signer, buyer_wallet: &mut Wallet, d: &mut Deal) {
-        assert!(signer::address_of(buyer) == d.buyer, E_NOT_BUYER);
+    public fun fund(buyer: address, bw: &mut Wallet, d: &mut Deal) {
+        assert!(buyer == d.buyer, E_NOT_BUYER);
         assert!(!d.funded, E_ALREADY_FUNDED);
-        assert!(buyer_wallet.balance >= d.amount, E_INSUFFICIENT);
-        buyer_wallet.balance = buyer_wallet.balance - d.amount;
+        assert!(bw.balance >= d.amount, E_INSUFFICIENT);
+        bw.balance = bw.balance - d.amount;
         d.funded = true;
     }
 
-    public fun release(seller: &signer, seller_wallet: &mut Wallet, d: &mut Deal) {
-        assert!(signer::address_of(seller) == d.seller, E_NOT_SELLER);
+    public fun release(seller: address, sw: &mut Wallet, d: &mut Deal) {
+        assert!(seller == d.seller, E_NOT_SELLER);
         assert!(d.funded, E_NOT_FUNDED);
         assert!(!d.completed, E_COMPLETED);
-        seller_wallet.balance = seller_wallet.balance + d.amount;
+        sw.balance = sw.balance + d.amount;
         d.completed = true;
     }
 
-    public fun refund(buyer: &signer, buyer_wallet: &mut Wallet, d: &mut Deal) {
-        assert!(signer::address_of(buyer) == d.buyer, E_NOT_BUYER);
+    public fun refund(buyer: address, bw: &mut Wallet, d: &mut Deal) {
+        assert!(buyer == d.buyer, E_NOT_BUYER);
         assert!(d.funded, E_NOT_FUNDED);
         assert!(!d.completed, E_COMPLETED);
-        buyer_wallet.balance = buyer_wallet.balance + d.amount;
+        bw.balance = bw.balance + d.amount;
         d.completed = true;
     }
 }