From 46bb53b96a66947be6e4fabaafb73fe3940959de Mon Sep 17 00:00:00 2001 From: xbtmatt <90358481+xbtmatt@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:11:27 -0700 Subject: [PATCH] Rebasing --- src/transactions/types.ts | 2 ++ tests/e2e/api/transaction_arguments.test.ts | 29 +++++---------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/transactions/types.ts b/src/transactions/types.ts index 7e8d9d010..3c66ef1e1 100644 --- a/src/transactions/types.ts +++ b/src/transactions/types.ts @@ -31,6 +31,7 @@ export type EntryFunctionArgumentTypes = | MoveVector | MoveOption | AccountAddress + | MoveString | FixedBytes; export type ScriptFunctionArgumentTypes = | Bool @@ -44,6 +45,7 @@ export type ScriptFunctionArgumentTypes = | MoveObject | MoveVector | AccountAddress + | MoveString | FixedBytes; /** diff --git a/tests/e2e/api/transaction_arguments.test.ts b/tests/e2e/api/transaction_arguments.test.ts index 3f4a290a1..ec3bedafe 100644 --- a/tests/e2e/api/transaction_arguments.test.ts +++ b/tests/e2e/api/transaction_arguments.test.ts @@ -50,29 +50,12 @@ describe("various transaction arguments", () => { beforeAll(async () => { const config = new AptosConfig({ network: Network.LOCAL }); aptos = new Aptos(config); - // const account1 = Account.fromPrivateKey({ - // privateKey: new Ed25519PrivateKey({ - // hexInput: "0x5aba8dab1c523be32bd4dafe2cc612f7f8050ce42a3322b60216ef67dc97768c", - // }), - // }); - account1 = Account.generate({ - scheme: SigningScheme.Ed25519, - }); - account2 = Account.generate({ - scheme: SigningScheme.Ed25519, - }); - account3 = Account.generate({ - scheme: SigningScheme.Ed25519, - }); - account4 = Account.generate({ - scheme: SigningScheme.Ed25519, - }); - account5 = Account.generate({ - scheme: SigningScheme.Ed25519, - }); - accountFeePayer = Account.generate({ - scheme: SigningScheme.Ed25519, - }); + account1 = Account.generate(); + account2 = Account.generate(); + account3 = Account.generate(); + account4 = Account.generate(); + account5 = Account.generate(); + accountFeePayer = Account.generate(); const accounts = [account1, account2, account3, account4, account5, accountFeePayer]; for (const account of accounts) { await aptos.fundAccount({