Fix merge conflicts with e2e_refactor

[trayanm]

Signed-off-by: Trayan Manolov trayan.manolov@limechain.tech

Detailed description: Fixed conflicts issues between branches main, e2e_refactoring and functionalities for NFT & Fee Per User.

Which issue(s) this PR fixes: Fixes #773 #618

Special notes for your reviewer:

Checklist

• [ ] Documentation added
• [x] Tests updated

[codecov[bot]]

Codecov Report

Merging #796 (f79b5a2) into main (87cdb45) will not change coverage. The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #796   +/-   ##
=======================================
  Coverage   62.56%   62.56%           
=======================================
  Files          87       87           
  Lines        6465     6465           
=======================================
  Hits         4045     4045           
  Misses       2224     2224           
  Partials      196      196           

Flag	Coverage Δ
unittests	62.56% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.