fix default_impl and add ContractOverrides for Enumerable

Author: brozorec

packages/core/stellar/src/non-fungible.test.ts.md

@@ -527,8 +527,9 @@ Generated by [AVA](https://avajs.dev).
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use stellar_default_impl_macro::default_impl;␊
     use stellar_non_fungible::{␊
-        Base, enumerable::{NonFungibleEnumerable, Enumerable}, NonFungibleToken␊
+        Base, ContractOverrides, enumerable::{NonFungibleEnumerable, Enumerable}, NonFungibleToken␊
     };␊
     ␊
     #[contract]␊
@@ -600,7 +601,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[defaultimpl]␊
+    #[default_impl]␊
     #[contractimpl]␊
     impl NonFungibleEnumerable for MyToken {}␊
     `
@@ -1293,9 +1294,10 @@ Generated by [AVA](https://avajs.dev).
         Address, contract, contracterror, contractimpl, Env, panic_with_error, String, Symbol,␊
         symbol_short␊
     };␊
+    use stellar_default_impl_macro::default_impl;␊
     use stellar_non_fungible::{␊
-        Base, burnable::NonFungibleBurnable, enumerable::{NonFungibleEnumerable, Enumerable},␊
-        NonFungibleToken␊
+        Base, burnable::NonFungibleBurnable, ContractOverrides,␊
+        enumerable::{NonFungibleEnumerable, Enumerable}, NonFungibleToken␊
     };␊
     use stellar_pausable::{self as pausable, Pausable};␊
     use stellar_pausable_macros::when_not_paused;␊
@@ -1393,8 +1395,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     #[contractimpl]␊
     impl NonFungibleBurnable for MyToken {␊
-        type ContractType = Enumerable;␊
-    ␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, token_id: u32) {␊
             Self::ContractType::burn(e, &from, token_id);␊
@@ -1406,7 +1406,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[defaultimpl]␊
+    #[default_impl]␊
     #[contractimpl]␊
     impl NonFungibleEnumerable for MyToken {}␊
     ␊

packages/core/stellar/src/non-fungible.test.ts.snap

@@ -98,7 +98,7 @@ export function buildNonFungible(opts: NonFungibleOptions): Contract {
   }
 
   if (allOpts.enumerable) {
-    addEnumerable(c, allOpts.burnable);
+    addEnumerable(c);
   }
 
   if (allOpts.consecutive) {
@@ -179,24 +179,21 @@ function addBurnable(c: ContractBuilder, pausable: boolean) {
   }
 }
 
-function addEnumerable(c: ContractBuilder, burnable: boolean) {
+function addEnumerable(c: ContractBuilder) {
   c.addUseClause('stellar_non_fungible', 'enumerable::{NonFungibleEnumerable, Enumerable}');
-  //c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_non_fungible', 'ContractOverrides');
 
   const nonFungibleEnumerableTrait = {
     traitName: 'NonFungibleEnumerable',
     structName: c.name,
-    tags: ['defaultimpl', 'contractimpl'],
+    tags: ['default_impl', 'contractimpl'],
     section: 'Extensions',
   };
   c.addTraitImplBlock(nonFungibleEnumerableTrait);
 
   c.overrideAssocType('NonFungibleToken', 'type ContractType = Enumerable;');
 
-  if (burnable) {
-    c.overrideAssocType('NonFungibleBurnable', 'type ContractType = Enumerable;');
-  }
-
   // Below is not required due to `defaultimpl` macro. If we require to customize the functions,
   // then we should:
   // 1. get rid of the `defaultimpl` macro form `tags` above,