diff --git a/student_no.txt b/student_no.txt index 2a6816f..3d16f24 100644 --- a/student_no.txt +++ b/student_no.txt @@ -1 +1,2 @@ # Please enter your 9-digit student number below. +100243254 \ No newline at end of file diff --git a/task1/sources/main.move b/task1/sources/main.move index 2507060..a56a383 100644 --- a/task1/sources/main.move +++ b/task1/sources/main.move @@ -5,13 +5,13 @@ 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] diff --git a/task2/sources/main.move b/task2/sources/main.move index d6746d8..b241091 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, 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, y } } #[test] @@ -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 } } #[test] diff --git a/task3/sources/m1.move b/task3/sources/m1.move index e3542c4..d00718a 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 fun num2():u64 { 88 } } \ No newline at end of file diff --git a/task4/sources/main.move b/task4/sources/main.move index daa4423..67f0ded 100644 --- a/task4/sources/main.move +++ b/task4/sources/main.move @@ -12,19 +12,21 @@ 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 { - // ... + 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)]