Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/latest-graphql-schema
Browse files Browse the repository at this point in the history
  • Loading branch information
CalicoNino committed Oct 23, 2024
2 parents 236bdf0 + 2968cbc commit 9af25cc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/sdk/tx/account.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { accountFromEthAccount, accountFromNibiru } from "./account"
import { EthAccount } from "src/protojs/eth/types/v1/account"
import { Any } from "src/protojs/google/protobuf/any"
import { EthAccount } from "../../protojs/eth/types/v1/account"
import { Any } from "../../protojs/google/protobuf/any"
import Long from "long"
import * as cosmjs from "@cosmjs/stargate"
import { decodeOptionalPubkey } from "@cosmjs/proto-signing"
import { BaseAccount } from "src/protojs/cosmos/auth/v1beta1/auth"
import { BaseAccount } from "../../protojs/cosmos/auth/v1beta1/auth"

// Mock decodeOptionalPubkey
jest.mock("@cosmjs/proto-signing", () => ({
Expand Down
6 changes: 3 additions & 3 deletions src/sdk/tx/account.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { decodeOptionalPubkey } from "@cosmjs/proto-signing"
import { Account, accountFromAny, AccountParser } from "@cosmjs/stargate"
import { EthAccount } from "src/protojs/eth/types/v1/account"
import { Any } from "src/protojs/google/protobuf/any"
import { EthAccount } from "../../protojs/eth/types/v1/account"
import { Any } from "../../protojs/google/protobuf/any"
import { assert } from "@cosmjs/utils"
import { BaseAccount } from "src/protojs/cosmos/auth/v1beta1/auth"
import { BaseAccount } from "../../protojs/cosmos/auth/v1beta1/auth"

/**
* Converts an EthAccount to a general Cosmos Account object.
Expand Down

0 comments on commit 9af25cc

Please sign in to comment.