From e0c005c6bbffd17a5759d2412e9ccbf004167aa2 Mon Sep 17 00:00:00 2001
From: BananaDevil <yrd241@gmail.com>
Date: Thu, 21 Mar 2024 16:11:30 +0800
Subject: [PATCH] updates

---
 student_no.txt          |  1 +
 task1/sources/main.move |  5 +++--
 task2/sources/main.move | 20 +++++++++++---------
 task3/sources/m1.move   | 11 +++++------
 task3/sources/m3.move   |  2 +-
 task4/sources/main.move | 13 +++++++++----
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/student_no.txt b/student_no.txt
index 2a6816f..09d1959 100644
--- a/student_no.txt
+++ b/student_no.txt
@@ -1 +1,2 @@
 # Please enter your 9-digit student number below.
+100243385
diff --git a/task1/sources/main.move b/task1/sources/main.move
index 2507060..6a96255 100644
--- a/task1/sources/main.move
+++ b/task1/sources/main.move
@@ -5,13 +5,14 @@ module 0x42::Task1 {
     // TODO
     // 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 {
         // ...
+        Wallet{balance:1000}
     }
 
     #[test]
@@ -19,4 +20,4 @@ module 0x42::Task1 {
         let wallet = myWallet();
         assert!(wallet.balance == 1000, 0);
     }
-}
\ No newline at end of file
+}
diff --git a/task2/sources/main.move b/task2/sources/main.move
index d6746d8..63627dd 100644
--- a/task2/sources/main.move
+++ b/task2/sources/main.move
@@ -4,14 +4,15 @@ 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 {
-        // ...
+        Foo{u:u,b:b}
     }
 
     #[test]
@@ -32,14 +33,15 @@ 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 {
-        // ...
+        Soo{x:x,y:y}
     }
 
     #[test]
@@ -62,7 +64,7 @@ module 0x42::Task2{
 
     // TODO
     // Define a struct Moo with a field: x: u64 with ability
-    struct Moo {
+    struct Moo has copy{
         x: u64
     }
 
@@ -70,7 +72,7 @@ module 0x42::Task2{
     // TODO
     // Define a function gen_Moo that takes an argument: x: u64 and returns a Moo
     fun gen_Moo(x:u64): Moo {
-        // ...
+        Moo{x:x}
     }
 
     #[test]
@@ -80,4 +82,4 @@ module 0x42::Task2{
         assert!(k.s.x == 42,0);
         let Koo { s: Moo { x: _ } } = k;
     }
-}
\ No newline at end of file
+}
diff --git a/task3/sources/m1.move b/task3/sources/m1.move
index e3542c4..5ff3475 100644
--- a/task3/sources/m1.move
+++ b/task3/sources/m1.move
@@ -3,20 +3,19 @@
 // Observe the function permissions called in M1, M2, and M3.
 // modify the visibility of the functions in M1, and set the M1 module visibility.
 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 1b25c74..3eb9496 100644
--- a/task3/sources/m3.move
+++ b/task3/sources/m3.move
@@ -6,4 +6,4 @@ module 0x42::M3{
         let n = num();
         assert(n == 66,0);
     }
-}
\ No newline at end of file
+}
diff --git a/task4/sources/main.move b/task4/sources/main.move
index daa4423..8016129 100644
--- a/task4/sources/main.move
+++ b/task4/sources/main.move
@@ -12,19 +12,24 @@ module 0x42::Task4 {
     // TODO
     // 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 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 = object::create_sticky_object(caller_addr);
+      obj
     }
 
     #[test(caller = @0x88)]
@@ -49,4 +54,4 @@ module 0x42::Task4 {
         assert!( object::address_from_constructor_ref(&obj2) == @0xfab16b00983f01e5c2b7682472a4f4c3e5929fbba987958570b6290c02817df2, 1);
 
     }
-}
\ No newline at end of file
+}