diff --git a/student_no.txt b/student_no.txt index 2a6816f..59e9b28 100644 --- a/student_no.txt +++ b/student_no.txt @@ -1 +1,2 @@ # Please enter your 9-digit student number below. +100243142 \ No newline at end of file diff --git a/task1/sources/main.move b/task1/sources/main.move index 2507060..16c5f37 100644 --- a/task1/sources/main.move +++ b/task1/sources/main.move @@ -6,12 +6,14 @@ 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 { // ... + Wallet{balance:1000} } #[test] diff --git a/task2/sources/main.move b/task2/sources/main.move index d6746d8..37e85fb 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 { // ... + Foo{u:u,b: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 drop ,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] @@ -56,13 +62,13 @@ module 0x42::Task2{ // TODO // Define a struct Koo with a field: s: Moo with ability - struct Koo { + struct Koo has key,drop { s: Moo } // TODO // Define a struct Moo with a field: x: u64 with ability - struct Moo { + struct Moo has store,drop{ x: u64 } @@ -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 { // ... + Moo{x:x} } #[test] diff --git a/task3/sources/m1.move b/task3/sources/m1.move index e3542c4..74e075a 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..21e6f97 100644 --- a/task4/sources/main.move +++ b/task4/sources/main.move @@ -12,19 +12,27 @@ module 0x42::Task4 { // TODO // 1. create a deleteable object public fun createDeleteableObject(caller: &signer):ConstructorRef { - // ... + // ...= + let caller_address = signer::address_of(caller); + object::create_object(caller_address) + + } // TODO // 2. create a named object public fun createNamedObject(caller: &signer):ConstructorRef { // ... + // let caller_address = signer::address_of(caller); + object::create_named_object(caller, NAME) } // TODO // 3. create a sticky object public fun createStickyObject(caller: &signer):ConstructorRef { // ... + let caller_address = signer::address_of(caller); + object::create_sticky_object(caller_address) } #[test(caller = @0x88)]