address comments

me-foundation · Nov 21, 2024 · 7112056 · 7112056
1 parent 609e72e
commit 7112056
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 38 deletions.
diff --git a/programs/mmm/src/errors.rs b/programs/mmm/src/errors.rs
@@ -72,10 +72,6 @@ pub enum MMMErrorCode {
     InvalidTokenExtension, // 0x1791
     #[msg("Unsupported asset plugin")]
     UnsupportedAssetPlugin, // 0x1792
-    #[msg("Mismatched creator data lengths")]
-    MismatchedCreatorDataLengths, // 0x1793
-    #[msg("Invalid cnft creators")]
-    InvalidCnftCreators, // 0x1794
     #[msg("Invalid cnft metadata")]
     InvalidCnftMetadata, // 0x1795
     #[msg("Invalid cnft metadata args")]

diff --git a/programs/mmm/src/util.rs b/programs/mmm/src/util.rs
@@ -1350,7 +1350,7 @@ pub fn hash_creators_from_metadata_args(
     if creator_accounts.len() != creator_shares.len()
         || creator_accounts.len() != creator_verified.len()
     {
-        return Err(MMMErrorCode::MismatchedCreatorDataLengths.into());
+        return Err(MMMErrorCode::InvalidCreatorAddress.into());
     }
 
     // Convert input data to a vector of Creator structs

diff --git a/sdk/src/idl/mmm.ts b/sdk/src/idl/mmm.ts
@@ -3249,21 +3249,11 @@ export type Mmm = {
     },
     {
       "code": 6035,
-      "name": "MismatchedCreatorDataLengths",
-      "msg": "Mismatched creator data lengths"
-    },
-    {
-      "code": 6036,
-      "name": "InvalidCnftCreators",
-      "msg": "Invalid cnft creators"
-    },
-    {
-      "code": 6037,
       "name": "InvalidCnftMetadata",
       "msg": "Invalid cnft metadata"
     },
     {
-      "code": 6038,
+      "code": 6036,
       "name": "InvalidCnftMetadataArgs",
       "msg": "Invalid cnft metadata args"
     }
@@ -6521,21 +6511,11 @@ export const IDL: Mmm = {
     },
     {
       "code": 6035,
-      "name": "MismatchedCreatorDataLengths",
-      "msg": "Mismatched creator data lengths"
-    },
-    {
-      "code": 6036,
-      "name": "InvalidCnftCreators",
-      "msg": "Invalid cnft creators"
-    },
-    {
-      "code": 6037,
       "name": "InvalidCnftMetadata",
       "msg": "Invalid cnft metadata"
     },
     {
-      "code": 6038,
+      "code": 6036,
       "name": "InvalidCnftMetadataArgs",
       "msg": "Invalid cnft metadata args"
     }

diff --git a/tests/mmm-cnft.spec.ts b/tests/mmm-cnft.spec.ts
@@ -338,8 +338,6 @@ describe('cnft tests', () => {
       buyerSolEscrowAccountBalanceAfter + spotPrice * LAMPORTS_PER_SOL,
     );
 
-    // In production it should be seller buy tx fee, but with this test set up, buyer pays
-    // tx fee due to provider is initiated under buyer.
     assert.equal(
       sellerAfter,
       sellerBefore +
@@ -573,8 +571,6 @@ describe('cnft tests', () => {
       buyerSolEscrowAccountBalanceAfter,
     );
 
-    // In production it should be seller buy tx fee, but with this test set up, buyer pays
-    // tx fee due to provider is initiated under buyer.
     assert.equal(sellerAfter, sellerBefore);
 
     assert.equal(creator1After, creator1Before);
@@ -789,8 +785,6 @@ describe('cnft tests', () => {
       buyerSolEscrowAccountBalanceAfter,
     );
 
-    // In production it should be seller buy tx fee, but with this test set up, buyer pays
-    // tx fee due to provider is initiated under buyer.
     assert.equal(sellerAfter, sellerBefore);
 
     assert.equal(creator1After, creator1Before);

diff --git a/tests/utils/cnft.ts b/tests/utils/cnft.ts
@@ -51,8 +51,6 @@ export const ME_TREASURY = new Web3PubKey(
   'rFqFJ9g7TGBD8Ed7TPDnvGKZ5pWLPDyxLcvcH2eRCtt',
 );
 
-export const treasury = publicKey(ME_TREASURY.toBase58());
-
 export const createUmi = async (endpoint?: string, airdropAmount?: SolAmount) =>
   (await baseCreateUmi(endpoint, { commitment: 'confirmed' }, airdropAmount))
     .use(mplTokenMetadata())
@@ -176,9 +174,6 @@ export const mint = async (
   };
 };
 
-// This is Hash(metadataArgs). Useful for verifying sellers fee basis points are valid.
-// NOTE: this does not perform any checks on the hash, it is recommended to use getMetadataHashChecked
-// in production!!
 export function hashMetadataArgsArgs(metadata: MetadataArgsArgs): Uint8Array {
   return hash(getMetadataArgsSerializer().serialize(metadata));
 }