diff --git a/student_no.txt b/student_no.txt index 2a6816f..404b74a 100644 --- a/student_no.txt +++ b/student_no.txt @@ -1 +1,2 @@ # Please enter your 9-digit student number below. +100243181 diff --git a/task1/sources/main.move b/task1/sources/main.move index 2507060..dbf8db2 100644 --- a/task1/sources/main.move +++ b/task1/sources/main.move @@ -5,6 +5,7 @@ module 0x42::Task1 { // TODO // Define a struct called Wallet with a single field called balance of type u64. struct Wallet has drop { + balance : u64 // ... } @@ -12,6 +13,10 @@ module 0x42::Task1 { // Define a function called myWallet that returns a Wallet with a balance of 1000. fun myWallet(): Wallet { // ... + return Wallet{ + balance : 1000 + } + } #[test] diff --git a/task2/sources/main.move b/task2/sources/main.move index d6746d8..65f010f 100644 --- a/task2/sources/main.move +++ b/task2/sources/main.move @@ -4,13 +4,19 @@ 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: u, + b: b + } // ... } @@ -32,13 +38,19 @@ 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:x, + y:x + } // ... } @@ -70,6 +82,9 @@ 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 { + return Moo { + x:x + } // ... } 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/task4/sources/main.move b/task4/sources/main.move index daa4423..03d7983 100644 --- a/task4/sources/main.move +++ b/task4/sources/main.move @@ -12,18 +12,26 @@ 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 // ... }