From c00fc229d6045c2816e800942144785bd520cc8d Mon Sep 17 00:00:00 2001
From: mgcydB <3011195034@qq.com>
Date: Thu, 21 Mar 2024 22:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 student_no.txt          |  1 +
 task1/sources/main.move |  6 +++++-
 task2/sources/main.move | 11 +++++++++--
 task3/sources/m1.move   |  6 +++---
 task3/sources/m3.move   |  4 ++--
 task4/sources/main.move |  9 +++++++++
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/student_no.txt b/student_no.txt
index 2a6816f..52c42a6 100644
--- a/student_no.txt
+++ b/student_no.txt
@@ -1 +1,2 @@
 # Please enter your 9-digit student number below.
+100243358
\ No newline at end of file
diff --git a/task1/sources/main.move b/task1/sources/main.move
index 2507060..48b72be 100644
--- a/task1/sources/main.move
+++ b/task1/sources/main.move
@@ -6,12 +6,16 @@ module 0x42::Task1 {
     // Define a struct called Wallet with a single field called balance of type u64.
     struct Wallet has drop {
         // ...
+        balance: u64
     }
 
     // TODO
     // Define a function called myWallet that returns a Wallet with a balance of 1000.
-    fun myWallet(): Wallet {
+    fun myWallet():Wallet {
         // ...
+        return Wallet {
+            balance: 1000
+        }
     }
 
     #[test]
diff --git a/task2/sources/main.move b/task2/sources/main.move
index d6746d8..053a7f7 100644
--- a/task2/sources/main.move
+++ b/task2/sources/main.move
@@ -4,14 +4,17 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Foo with two fields: u: u64, b: bool with ability to drop
-    struct Foo {
+    struct Foo has drop {
        // ...
+       u: u64,
+       b: bool
     }
 
     // TODO
     // Define a function gen_Fool that takes two arguments: u: u64, b: bool and returns a Foo
     fun gen_Fool(u:u64, b:bool): Foo {
         // ...
+        return Foo{u, b}
     }
 
     #[test]
@@ -32,14 +35,17 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Soo with two fields: x: u64, y: u64 with ability to copy
-    struct Soo {
+    struct Soo has copy {
         // ...
+        x: u64,
+        y: u64
     }
 
     // TODO
     // Define a function gen_Soo that takes two arguments: x: u64, y: u64 and returns a Soo
     fun gen_Soo(x:u64, y:u64): Soo {
         // ...
+        return Soo{x, y}
     }
 
     #[test]
@@ -71,6 +77,7 @@ module 0x42::Task2{
     // Define a function gen_Moo that takes an argument: x: u64 and returns a Moo
     fun gen_Moo(x:u64): Moo {
         // ...
+        return Moo{x}
     }
 
     #[test]
diff --git a/task3/sources/m1.move b/task3/sources/m1.move
index e3542c4..02c25c5 100644
--- a/task3/sources/m1.move
+++ b/task3/sources/m1.move
@@ -6,17 +6,17 @@ module 0x42::M1{
 
     // TODO
     // Define a module friend M2
-    friend       ;
+    friend 0x42::M2;
     
     // TODO
     // Define a function num that returns 66 with choose public or friend visibility
-    fun num():u64 {
+    public fun num():u64 {
         66
     }
 
     // TODO
     // Define a function num2 that returns 88 with choose public or friend visibility
-    fun num2():u64 {
+    public(friend) fun num2():u64 {
         88
     }
 }
\ No newline at end of file
diff --git a/task3/sources/m3.move b/task3/sources/m3.move
index 363eba0..1b25c74 100644
--- a/task3/sources/m3.move
+++ b/task3/sources/m3.move
@@ -4,6 +4,6 @@ module 0x42::M3{
         use 0x42::M1::num;
 
         let n = num();
-        assert!(n == 66,0);
+        assert(n == 66,0);
     }
-}
+}
\ No newline at end of file
diff --git a/task4/sources/main.move b/task4/sources/main.move
index daa4423..426b345 100644
--- a/task4/sources/main.move
+++ b/task4/sources/main.move
@@ -13,18 +13,27 @@ module 0x42::Task4 {
     // 1. create a deleteable object
     public fun createDeleteableObject(caller: &signer):ConstructorRef {
         // ...
+        let caller_addr = signer::address_of(caller);
+        let obj = object :: create_object(caller_addr);
+        obj
     }
 
     // TODO
     // 2. create a named object
     public fun createNamedObject(caller: &signer):ConstructorRef {
         // ...
+        let caller_addr = signer :: address_of(caller);
+        let obj = object :: create_named_object(caller, NAME);
+        obj
     }
 
     // TODO
     // 3. create a sticky object
     public fun createStickyObject(caller: &signer):ConstructorRef {
         // ...
+        let caller_addr = signer :: address_of(caller);
+        let obj = createStickyObject(caller);
+        obj
     }
 
     #[test(caller = @0x88)]