Refactor NFT contract ownership management and update constructor ini…

…tialization

smart-contracts/assembly/contracts/NFT/NFT-example.ts

@@ -30,9 +30,10 @@ import {
   _update,
   _transferFrom,
 } from './NFT-internals';
-import { setOwner, onlyOwner } from '../utils/ownership';
+import { onlyOwner } from '../utils/ownership';
 
 import { Context, isDeployingContract } from '@massalabs/massa-as-sdk';
+import { _setOwner } from '../utils/ownership-internal';
 
 /**
  * @param binaryArgs - serialized strings representing the name and the symbol of the NFT
@@ -52,7 +53,7 @@ export function constructor(binaryArgs: StaticArray<u8>): void {
     .nextString()
     .expect('symbol argument is missing or invalid');
   _constructor(name, symbol);
-  setOwner(new Args().add(Context.caller().toString()).serialize());
+  _setOwner(Context.caller().toString());
 }
 
 export function name(): string {

smart-contracts/assembly/contracts/NFT/__tests__/NFTEnumerable-example.spec.ts

@@ -6,9 +6,11 @@ import {
 
 import {
   Args,
+  NoArg,
   byteToBool,
   bytesToString,
   bytesToU256,
+  stringToBytes,
 } from '@massalabs/as-types';
 import { u256 } from 'as-bignum/assembly';
 import {
@@ -54,14 +56,14 @@ beforeEach(() => {
   resetStorage();
   switchUser(contractOwner);
   setDeployContext(contractOwner);
-  constructor(new Args().add(NFTName).add(NFTSymbol).serialize());
+  constructor(NoArg.serialize());
 });
 
 describe('NFT Enumerable Contract', () => {
   describe('Initialization', () => {
     it('should return correct name and symbol', () => {
-      expect(name()).toBe(NFTName);
-      expect(symbol()).toBe(NFTSymbol);
+      expect(name()).toStrictEqual(stringToBytes(NFTName));
+      expect(symbol()).toStrictEqual(stringToBytes(NFTSymbol));
     });
     it('should return correct contract owner', () => {
       expect(bytesToString(ownerAddress([]))).toBe(contractOwner);