Changed all references to NeoCouponMarketplaceResolver to regular Cou…

…ponMarketplaceResolver
Luiserebii · Mar 30, 2019 · 3a2ac21 · 3a2ac21
1 parent 67dfcf9
commit 3a2ac21
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/contracts/CouponMarketplaceVia.sol b/contracts/CouponMarketplaceVia.sol
@@ -5,7 +5,7 @@ import "./interfaces/SnowflakeResolverInterface.sol";
 import "./zeppelin/math/SafeMath.sol";
 import "./interfaces/CouponMarketplaceResolverInterface.sol";
 import "./interfaces/SnowflakeInterface.sol";
-import "./resolvers/NeoCouponMarketplaceResolver.sol";
+import "./resolvers/CouponMarketplaceResolver.sol";
 import "./ein/util/SnowflakeEINOwnable.sol";
 
 import "./interfaces/marketplace/CouponInterface.sol";
@@ -25,7 +25,7 @@ contract CouponMarketplaceVia is SnowflakeVia, SnowflakeEINOwnable {
 
     using SafeMath for uint256;
 
-    address public NeoCouponMarketplaceResolverAddress;
+    address public CouponMarketplaceResolverAddress;
 
     constructor(address _snowflakeAddress) SnowflakeVia(_snowflakeAddress) public {
         //Constructing parents
@@ -53,7 +53,7 @@ contract CouponMarketplaceVia is SnowflakeVia, SnowflakeEINOwnable {
     function processTransaction(/*address resolver, */uint itemID, uint einBuyer, uint einSeller, uint amount, uint couponID) public senderIsSnowflake returns (bool) {
 
         //Initialize NeoCouponMarketplaceResolverAddress
-        NeoCouponMarketplaceResolver mktResolver = NeoCouponMarketplaceResolver(NeoCouponMarketplaceResolverAddress);
+        CouponMarketplaceResolver mktResolver = CouponMarketplaceResolver(CouponMarketplaceResolverAddress);
         ItemFeature itemFeature = ItemFeature(mktResolver.ItemFeatureAddress());
 
         //Initialize Snowflake
@@ -146,8 +146,8 @@ contract CouponMarketplaceVia is SnowflakeVia, SnowflakeEINOwnable {
         revert("Not Implemented.");
     }
 
-    function setNeoCouponMarketplaceResolverAddress(address _NeoCouponMarketplaceResolverAddress) public onlyEINOwner returns (bool) {
-        NeoCouponMarketplaceResolverAddress = _NeoCouponMarketplaceResolverAddress;
+    function setCouponMarketplaceResolverAddress(address _CouponMarketplaceResolverAddress) public onlyEINOwner returns (bool) {
+        CouponMarketplaceResolverAddress = _CouponMarketplaceResolverAddress;
         return true;
 }
 

diff --git a/...esolvers/NeoCouponMarketplaceResolver.sol → ...s/resolvers/CouponMarketplaceResolver.sol b/...esolvers/NeoCouponMarketplaceResolver.sol → ...s/resolvers/CouponMarketplaceResolver.sol
@@ -13,7 +13,7 @@ import "../marketplace/features/CouponFeature.sol";
 import "../marketplace/features/ItemFeature.sol";
 
 
-contract NeoCouponMarketplaceResolver is SnowflakeResolver, SnowflakeEINMarketplace, NeoCouponMarketplaceResolverInterface {
+contract CouponMarketplaceResolver is SnowflakeResolver, SnowflakeEINMarketplace, NeoCouponMarketplaceResolverInterface {
 
 /*
 

diff --git a/test/common.js b/test/common.js
@@ -4,7 +4,7 @@ const Snowflake = artifacts.require('./Snowflake.sol')
 const ClientRaindrop = artifacts.require('./resolvers/ClientRaindrop/ClientRaindrop.sol')
 const OldClientRaindrop = artifacts.require('./_testing/OldClientRaindrop.sol')
 
-const NeoCouponMarketplaceResolver = artifacts.require('./resolvers/NeoCouponMarketplaceResolver.sol')
+const CouponMarketplaceResolver = artifacts.require('./resolvers/CouponMarketplaceResolver.sol')
 const CouponMarketplaceVia = artifacts.require('./CouponMarketplaceVia.sol')
 
 const ItemFeature = artifacts.require('./marketplace/features/ItemFeature.sol')
@@ -63,6 +63,6 @@ module.exports = {
   },
   'ItemFeature': ItemFeature,
   'CouponFeature': CouponFeature,
-  'NeoCouponMarketplaceResolver': NeoCouponMarketplaceResolver,
+  'CouponMarketplaceResolver': CouponMarketplaceResolver,
   'CouponDistribution': CouponDistribution
 }
diff --git a/test/marketplace/coupon-marketplace.js b/test/marketplace/coupon-marketplace.js
@@ -13,7 +13,7 @@ const enums = allEnums.CouponMarketPlaceResolverInterface;
 const ItemFeature = common.ItemFeature
 const CouponFeature = common.CouponFeature
 const CouponDistribution = common.CouponDistribution
-const NeoCouponMarketplaceResolver = common.NeoCouponMarketplaceResolver
+const CouponMarketplaceResolver = common.CouponMarketplaceResolver
 
 
 
@@ -134,7 +134,7 @@ contract('Testing Coupon Marketplace', function (accounts) {
     it('deploy Coupon Marketplace Resolver contract', async function () {
 //      let ein = await instances.IdentityRegistry.getEIN(seller.address)
 
-      instances.NeoCouponMarketplaceResolver = await NeoCouponMarketplaceResolver.new(
+      instances.CouponMarketplaceResolver = await CouponMarketplaceResolver.new(
         "Test-Marketplace-Resolver",
         "A test Coupon Marketplace Resolver built on top of Hydro Snowflake", 
         instances.Snowflake.address,
@@ -148,14 +148,14 @@ contract('Testing Coupon Marketplace', function (accounts) {
 
     it('deploy Coupon Distribution contract', async function () {
       instances.CouponDistribution = await CouponDistribution.new(
-        instances.NeoCouponMarketplaceResolver.address,
+        instances.CouponMarketplaceResolver.address,
         instances.Snowflake.address
       )
     })
 
 
     it('Deployer is EIN Owner', async function () {
-      let isEINOwner = await instances.NeoCouponMarketplaceResolver.isEINOwner.call({ from: accounts[0]})
+      let isEINOwner = await instances.CouponMarketplaceResolver.isEINOwner.call({ from: accounts[0]})
       assert.isTrue(isEINOwner);
     })
 
@@ -170,7 +170,7 @@ contract('Testing Coupon Marketplace', function (accounts) {
         it('addItemTag', async function () {
           await assertSolidityRevert(
             async function(){ 
-              await instances.NeoCouponMarketplaceResolver.addItemTag("Test_Item_Tag", {from: nonOwner}) 
+              await instances.CouponMarketplaceResolver.addItemTag("Test_Item_Tag", {from: nonOwner}) 
             }
           )
         })
@@ -179,7 +179,7 @@ contract('Testing Coupon Marketplace', function (accounts) {
         it('updateItemTag', async function () {
           await assertSolidityRevert(
             async function(){ 
-              await instances.NeoCouponMarketplaceResolver.updateItemTag(1, "Test_Item_Tag", {from: nonOwner}) 
+              await instances.CouponMarketplaceResolver.updateItemTag(1, "Test_Item_Tag", {from: nonOwner}) 
             }
           )
         })
@@ -188,7 +188,7 @@ contract('Testing Coupon Marketplace', function (accounts) {
         it('deleteItemTag', async function () {
           await assertSolidityRevert(
             async function(){ 
-              await instances.NeoCouponMarketplaceResolver.deleteItemTag(1, {from: nonOwner})
+              await instances.CouponMarketplaceResolver.deleteItemTag(1, {from: nonOwner})
             }
           )
         })