Merge pull request #37 from FuelLabs/bitzoic-SRC_5-to-SRC5

Remove `Ownerhship` struct and change `SRC_5` abi to `SRC5`

Author: bitzoic

examples/src_5/initialized_example/src/initialized_example.sw

@@ -1,6 +1,6 @@
 contract;
 
-use src_5::{Ownership, SRC_5, State};
+use src_5::{SRC5, State};
 use std::constants::ZERO_B256;
 
 configurable {
@@ -10,12 +10,10 @@ configurable {
 
 storage {
     /// The owner in storage.
-    owner: Ownership = Ownership {
-        state: State::Initialized(INITIAL_OWNER),
-    },
+    owner: State = State::Initialized(INITIAL_OWNER),
 }
 
-impl SRC_5 for Contract {
+impl SRC5 for Contract {
     /// Returns the owner.
     ///
     /// # Return Values
@@ -42,6 +40,6 @@ impl SRC_5 for Contract {
     /// ```
     #[storage(read)]
     fn owner() -> State {
-        storage.owner.read().state
+        storage.owner.read()
     }
 }

examples/src_5/uninitialized_example/src/uninitialized_example.sw

@@ -1,15 +1,13 @@
 contract;
 
-use src_5::{Ownership, SRC_5, State};
+use src_5::{SRC5, State};
 
 storage {
     /// The owner in storage.
-    owner: Ownership = Ownership {
-        state: State::Uninitialized,
-    },
+    owner: State = State::Uninitialized,
 }
 
-impl SRC_5 for Contract {
+impl SRC5 for Contract {
     /// Returns the owner.
     ///
     /// # Return Values
@@ -36,6 +34,6 @@ impl SRC_5 for Contract {
     /// ```
     #[storage(read)]
     fn owner() -> State {
-        storage.owner.read().state
+        storage.owner.read()
     }
 }

standards/src_5/README.md

@@ -81,7 +81,7 @@ use std::constants::ZERO_B256;
 use standards::src_5::*;
 
 storage {
-    owner: Ownership = Ownership::initialized(Identity::Address(Address::from(ZERO_B256))),
+    owner: State = Identity::Address(Address::from(ZERO_B256)),
 }
 
 impl SRC_5 for MyContract {

standards/src_5/src/src_5.sw

@@ -29,13 +29,7 @@ pub enum AccessError {
     NotOwner: (),
 }
 
-/// Contains the ownership state.
-pub struct Ownership {
-    /// Represents the state of ownership.
-    state: State,
-}
-
-abi SRC_5 {
+abi SRC5 {
     /// Returns the owner.
     ///
     /// # Return Values