removes mergify merge conflicts

solana-labs · Jun 10, 2022 · fe95d03 · fe95d03
1 parent 72af569
commit fe95d03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 63 deletions.
diff --git a/sdk/program/src/system_instruction.rs b/sdk/program/src/system_instruction.rs
@@ -138,13 +138,8 @@ pub fn instruction_to_nonce_error(
 /// maximum permitted size of data: 10 MB
 pub const MAX_PERMITTED_DATA_LENGTH: u64 = 10 * 1024 * 1024;
 
-<<<<<<< HEAD
-#[frozen_abi(digest = "2xnDcizcPKKR7b624FeuuPd1zj5bmnkmVsBWgoKPTh4w")]
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, AbiExample, AbiEnumVisitor)]
-=======
 #[frozen_abi(digest = "5e22s2kFu9Do77hdcCyxyhuKHD8ThAB6Q6dNaLTCjL5M")]
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, AbiExample, AbiEnumVisitor)]
->>>>>>> b4190319a (feat(nonce): adds system instruction to upgrade legacy nonce versions (#25789))
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, AbiExample, AbiEnumVisitor)]
 pub enum SystemInstruction {
     /// Create a new account
     ///

diff --git a/web3.js/src/system-program.ts b/web3.js/src/system-program.ts
@@ -531,60 +531,6 @@ export type SystemInstructionType =
   | 'WithdrawNonceAccount'
   | 'UpgradeNonceAccount';
 
-<<<<<<< HEAD
-=======
-type SystemInstructionInputData = {
-  AdvanceNonceAccount: IInstructionInputData;
-  Allocate: IInstructionInputData & {
-    space: number;
-  };
-  AllocateWithSeed: IInstructionInputData & {
-    base: Uint8Array;
-    programId: Uint8Array;
-    seed: string;
-    space: number;
-  };
-  Assign: IInstructionInputData & {
-    programId: Uint8Array;
-  };
-  AssignWithSeed: IInstructionInputData & {
-    base: Uint8Array;
-    seed: string;
-    programId: Uint8Array;
-  };
-  AuthorizeNonceAccount: IInstructionInputData & {
-    authorized: Uint8Array;
-  };
-  Create: IInstructionInputData & {
-    lamports: number;
-    programId: Uint8Array;
-    space: number;
-  };
-  CreateWithSeed: IInstructionInputData & {
-    base: Uint8Array;
-    lamports: number;
-    programId: Uint8Array;
-    seed: string;
-    space: number;
-  };
-  InitializeNonceAccount: IInstructionInputData & {
-    authorized: Uint8Array;
-  };
-  Transfer: IInstructionInputData & {
-    lamports: bigint;
-  };
-  TransferWithSeed: IInstructionInputData & {
-    lamports: bigint;
-    programId: Uint8Array;
-    seed: string;
-  };
-  WithdrawNonceAccount: IInstructionInputData & {
-    lamports: number;
-  };
-  UpgradeNonceAccount: IInstructionInputData;
-};
-
->>>>>>> b4190319a (feat(nonce): adds system instruction to upgrade legacy nonce versions (#25789))
 /**
  * An enumeration of valid system InstructionType's
  * @internal
@@ -688,9 +634,7 @@ export const SYSTEM_INSTRUCTION_LAYOUTS: {
   },
   UpgradeNonceAccount: {
     index: 12,
-    layout: BufferLayout.struct<
-      SystemInstructionInputData['UpgradeNonceAccount']
-    >([BufferLayout.u32('instruction')]),
+    layout: BufferLayout.struct([BufferLayout.u32('instruction')]),
   },
 });