Rename files to remove V2 suffix (#1198)

v2-2
Asa Oines 2 years ago committed by GitHub
parent 4a82f13dac
commit f4a2462364
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      solidity/contracts/HyperlaneConnectionClient.sol
  2. 4
      solidity/contracts/Mailbox.sol
  3. 2
      solidity/contracts/Router.sol
  4. 2
      solidity/contracts/isms/MultisigIsm.sol
  5. 0
      solidity/contracts/libs/Message.sol
  6. 2
      solidity/contracts/test/TestHyperlaneConnectionClient.sol
  7. 2
      solidity/contracts/test/TestMailbox.sol
  8. 2
      solidity/contracts/test/TestMessage.sol
  9. 2
      solidity/contracts/test/TestSendReceiver.sol
  10. 0
      solidity/interfaces/IMailbox.sol
  11. 2
      solidity/test/lib/mailboxes.ts
  12. 0
      solidity/test/mailbox.test.ts
  13. 0
      solidity/test/message.test.ts
  14. 3
      typescript/infra/test/core.test.ts
  15. 2
      typescript/sdk/src/core/events.ts

@ -3,7 +3,7 @@ pragma solidity >=0.6.11;
// ============ Internal Imports ============
import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
import {IMailbox} from "../interfaces/IMailboxV2.sol";
import {IMailbox} from "../interfaces/IMailbox.sol";
// ============ External Imports ============
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

@ -4,11 +4,11 @@ pragma solidity >=0.8.0;
// ============ Internal Imports ============
import {Versioned} from "./upgrade/Versioned.sol";
import {MerkleLib} from "./libs/Merkle.sol";
import {Message} from "./libs/MessageV2.sol";
import {Message} from "./libs/Message.sol";
import {TypeCasts} from "./libs/TypeCasts.sol";
import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
import {IInterchainSecurityModule, ISpecifiesInterchainSecurityModule} from "../interfaces/IInterchainSecurityModule.sol";
import {IMailbox} from "../interfaces/IMailboxV2.sol";
import {IMailbox} from "../interfaces/IMailbox.sol";
// ============ External Imports ============
import {Address} from "@openzeppelin/contracts/utils/Address.sol";

@ -5,7 +5,7 @@ pragma solidity >=0.6.11;
import {HyperlaneConnectionClient} from "./HyperlaneConnectionClient.sol";
import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
import {IMailbox} from "../interfaces/IMailboxV2.sol";
import {IMailbox} from "../interfaces/IMailbox.sol";
abstract contract Router is HyperlaneConnectionClient, IMessageRecipient {
string constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =

@ -8,7 +8,7 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
// ============ Internal Imports ============
import {IMultisigIsm} from "../../interfaces/IMultisigIsm.sol";
import {Message} from "../libs/MessageV2.sol";
import {Message} from "../libs/Message.sol";
import {MultisigIsmMetadata} from "../libs/MultisigIsmMetadata.sol";
import {MerkleLib} from "../libs/Merkle.sol";

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
pragma solidity >=0.6.11;
import {HyperlaneConnectionClient} from "../HyperlaneConnectionClient.sol";
import {IMailbox} from "../../interfaces/IMailboxV2.sol";
import {IMailbox} from "../../interfaces/IMailbox.sol";
contract TestHyperlaneConnectionClient is HyperlaneConnectionClient {
function initialize(address _abacusConnectionManager) external initializer {

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
pragma solidity >=0.8.0;
import {Mailbox} from "../MailboxV2.sol";
import {Mailbox} from "../Mailbox.sol";
import {TypeCasts} from "../libs/TypeCasts.sol";
import {MerkleLib} from "../libs/Merkle.sol";
import {IMessageRecipient} from "../../interfaces/IMessageRecipient.sol";

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
pragma solidity >=0.6.11;
import {Message} from "../libs/MessageV2.sol";
import {Message} from "../libs/Message.sol";
contract TestMessage {
using Message for bytes;

@ -5,7 +5,7 @@ import {TypeCasts} from "../libs/TypeCasts.sol";
import {IInterchainGasPaymaster} from "../../interfaces/IInterchainGasPaymaster.sol";
import {IMessageRecipient} from "../../interfaces/IMessageRecipient.sol";
import {IMailbox} from "../../interfaces/IMailboxV2.sol";
import {IMailbox} from "../../interfaces/IMailbox.sol";
contract TestSendReceiver is IMessageRecipient {
using TypeCasts for address;

@ -4,7 +4,7 @@ import { ethers } from 'ethers';
import { Validator, types, utils } from '@hyperlane-xyz/utils';
import { MultisigIsm, TestMailbox } from '../../types';
import { DispatchEvent } from '../../types/contracts/MailboxV2.sol/Mailbox';
import { DispatchEvent } from '../../types/contracts/Mailbox';
export type MessageAndProof = {
proof: types.MerkleProof;

@ -36,11 +36,11 @@ describe('core', async () => {
// This is kind of awkward and really these tests shouldn't live here
multiProvider = getTestMultiProvider(signer, testConfig.transactionConfigs);
coreConfig = testConfig.core;
deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
owners = objMap(testConfig.transactionConfigs, () => owner.address);
});
it('deploys', async () => {
deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
contracts = await deployer.deploy();
});
@ -58,6 +58,7 @@ describe('core', async () => {
describe('failure modes', async () => {
beforeEach(async () => {
deployer = new HyperlaneCoreInfraDeployer(multiProvider, coreConfig);
const stub = sinon.stub(deployer, 'deployContracts');
stub.withArgs('test3', sinon.match.any).rejects();
// @ts-ignore

@ -1,7 +1,7 @@
import type {
DispatchEvent,
ProcessEvent,
} from '@hyperlane-xyz/core/dist/contracts/MailboxV2.sol/Mailbox';
} from '@hyperlane-xyz/core/dist/contracts/Mailbox';
import { Annotated } from '../events';

Loading…
Cancel
Save