Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(core-magistrate): Split core-marketplace into core-magistrate-crypto and core-magistrate-transactions #2967

Merged
merged 12 commits into from
Sep 27, 2019
Prev Previous commit
Next Next commit
refactor: export builder by namespace
  • Loading branch information
KovacZan committed Sep 27, 2019
commit 294fbea8bfffac7556f3acaae71c7777cc5a0933
19 changes: 7 additions & 12 deletions __tests__/helpers/transaction-factory.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { app } from "@arkecosystem/core-container";
import { Database } from "@arkecosystem/core-interfaces";
import {
BridgechainRegistrationBuilder,
BridgechainResignationBuilder,
BridgechainUpdateBuilder,
BusinessRegistrationBuilder,
BusinessResignationBuilder,
BusinessUpdateBuilder,
Builders as MagistrateBuilders,
Interfaces as MagistrateInterfaces,
} from "@arkecosystem/core-magistrate-crypto";
import { Identities, Interfaces, Managers, Transactions, Types, Utils } from "@arkecosystem/crypto";
Expand Down Expand Up @@ -125,39 +120,39 @@ export class TransactionFactory {
public static businessRegistration(
businessRegistrationAsset: MagistrateInterfaces.IBusinessRegistrationAsset,
): TransactionFactory {
const businessRegistrationBuilder = new BusinessRegistrationBuilder();
const businessRegistrationBuilder = new MagistrateBuilders.BusinessRegistrationBuilder();
businessRegistrationBuilder.businessRegistrationAsset(businessRegistrationAsset);
return new TransactionFactory(businessRegistrationBuilder);
}

public static businessResignation(): TransactionFactory {
return new TransactionFactory(new BusinessResignationBuilder());
return new TransactionFactory(new MagistrateBuilders.BusinessResignationBuilder());
}

public static businessUpdate(businessUpdateAsset: MagistrateInterfaces.IBusinessUpdateAsset): TransactionFactory {
const businessUpdateBuilder = new BusinessUpdateBuilder();
const businessUpdateBuilder = new MagistrateBuilders.BusinessUpdateBuilder();
businessUpdateBuilder.businessUpdateAsset(businessUpdateAsset);
return new TransactionFactory(businessUpdateBuilder);
}

public static bridgechainRegistration(
bridgechainRegistrationAsset: MagistrateInterfaces.IBridgechainRegistrationAsset,
): TransactionFactory {
const bridgechainRegistrationBuilder = new BridgechainRegistrationBuilder();
const bridgechainRegistrationBuilder = new MagistrateBuilders.BridgechainRegistrationBuilder();
bridgechainRegistrationBuilder.bridgechainRegistrationAsset(bridgechainRegistrationAsset);
return new TransactionFactory(bridgechainRegistrationBuilder);
}

public static bridgechainResignation(registeredBridgechainId: string): TransactionFactory {
const bridgechainResignationBuilder = new BridgechainResignationBuilder();
const bridgechainResignationBuilder = new MagistrateBuilders.BridgechainResignationBuilder();
bridgechainResignationBuilder.businessResignationAsset(registeredBridgechainId);
return new TransactionFactory(bridgechainResignationBuilder);
}

public static bridgechainUpdate(
bridgechainUpdateAsset: MagistrateInterfaces.IBridgechainUpdateAsset,
): TransactionFactory {
const bridgechainUpdateBuilder = new BridgechainUpdateBuilder();
const bridgechainUpdateBuilder = new MagistrateBuilders.BridgechainUpdateBuilder();
bridgechainUpdateBuilder.bridgechainUpdateAsset(bridgechainUpdateAsset);
return new TransactionFactory(bridgechainUpdateBuilder);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "jest-extended";

import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { Errors, Managers, Transactions, Utils } from "@arkecosystem/crypto";
import { BridgechainRegistrationBuilder } from "../../../../packages/core-magistrate-crypto/src/builders";
import { MagistrateTransactionType } from "../../../../packages/core-magistrate-crypto/src/enums";
import { BridgechainRegistrationTransaction } from "../../../../packages/core-magistrate-crypto/src/transactions";
import {
Expand All @@ -10,14 +10,14 @@ import {
bridgechainRegistrationAssetBad,
} from "../helper";

let builder: BridgechainRegistrationBuilder;
let builder: MagistrateBuilders.BridgechainRegistrationBuilder;

describe("Bridgechain registration builder", () => {
Managers.configManager.setFromPreset("testnet");
Transactions.TransactionRegistry.registerTransactionType(BridgechainRegistrationTransaction);

beforeEach(() => {
builder = new BridgechainRegistrationBuilder();
builder = new MagistrateBuilders.BridgechainRegistrationBuilder();
});

describe("should test verification", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import "jest-extended";

import { BridgechainResignationBuilder } from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { BridgechainResignationTransaction } from "@arkecosystem/core-magistrate-crypto";
import { Managers, Transactions } from "@arkecosystem/crypto";

let builder: BridgechainResignationBuilder;
let builder: MagistrateBuilders.BridgechainResignationBuilder;

describe("Bridgechain resignation builder", () => {
Managers.configManager.setFromPreset("testnet");
Transactions.TransactionRegistry.registerTransactionType(BridgechainResignationTransaction);

beforeEach(() => {
builder = new BridgechainResignationBuilder();
builder = new MagistrateBuilders.BridgechainResignationBuilder();
});
describe("should test verification", () => {
it("should be true", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import "jest-extended";

import { BridgechainUpdateBuilder } from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { BridgechainUpdateTransaction } from "@arkecosystem/core-magistrate-crypto";
import { Managers, Transactions, Utils } from "@arkecosystem/crypto";

let builder: BridgechainUpdateBuilder;
let builder: MagistrateBuilders.BridgechainUpdateBuilder;

describe("Bridgechain update builder", () => {
Managers.configManager.setFromPreset("testnet");

Transactions.TransactionRegistry.registerTransactionType(BridgechainUpdateTransaction);

beforeEach(() => {
builder = new BridgechainUpdateBuilder();
builder = new MagistrateBuilders.BridgechainUpdateBuilder();
});

describe("should test verification", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import "jest-extended";

import { BusinessRegistrationBuilder } from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { MagistrateTransactionType } from "@arkecosystem/core-magistrate-crypto";
import { BusinessRegistrationTransaction } from "@arkecosystem/core-magistrate-crypto";
import { Managers, Transactions, Utils } from "@arkecosystem/crypto";

let builder: BusinessRegistrationBuilder;
let builder: MagistrateBuilders.BusinessRegistrationBuilder;

describe("Business registration builder", () => {
Managers.configManager.setFromPreset("testnet");
Transactions.TransactionRegistry.registerTransactionType(BusinessRegistrationTransaction);

beforeEach(() => {
builder = new BusinessRegistrationBuilder();
builder = new MagistrateBuilders.BusinessRegistrationBuilder();
});

describe("should test verification ", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import "jest-extended";

import { BusinessResignationBuilder } from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { BusinessResignationTransaction } from "@arkecosystem/core-magistrate-crypto";
import { Managers, Transactions } from "@arkecosystem/crypto";

let builder: BusinessResignationBuilder;
let builder: MagistrateBuilders.BusinessResignationBuilder;

describe("Business resignation builder", () => {
Managers.configManager.setFromPreset("testnet");
Transactions.TransactionRegistry.registerTransactionType(BusinessResignationTransaction);

beforeEach(() => {
builder = new BusinessResignationBuilder();
builder = new MagistrateBuilders.BusinessResignationBuilder();
});

describe("should test verification", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import "jest-extended";

import { BusinessUpdateBuilder } from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { BusinessUpdateTransaction } from "@arkecosystem/core-magistrate-crypto";
import { Managers, Transactions } from "@arkecosystem/crypto";

let builder: BusinessUpdateBuilder;
let builder: MagistrateBuilders.BusinessUpdateBuilder;

describe("Business update builder", () => {
Managers.configManager.setFromPreset("testnet");
Transactions.TransactionRegistry.registerTransactionType(BusinessUpdateTransaction);

beforeEach(() => {
builder = new BusinessUpdateBuilder();
builder = new MagistrateBuilders.BusinessUpdateBuilder();
});

describe("should test verification", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
import "jest-extended";

import { State } from "@arkecosystem/core-interfaces";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { Wallets } from "@arkecosystem/core-state";
import { Handlers } from "@arkecosystem/core-transactions";
import { Managers, Utils } from "@arkecosystem/crypto";
import {
BridgechainRegistrationBuilder,
BridgechainResignationBuilder,
BusinessRegistrationBuilder,
} from "@arkecosystem/core-magistrate-crypto";

import {
BridgechainIsResignedError,
WalletIsNotBusinessError,
Expand All @@ -31,9 +26,9 @@ let businessRegistrationHandler: Handlers.TransactionHandler;
let bridgechainRegistrationHandler: Handlers.TransactionHandler;
let bridgechainResignationHandler: Handlers.TransactionHandler;

let businessRegistrationBuilder: BusinessRegistrationBuilder;
let bridgechianRegistrationBuilder: BridgechainRegistrationBuilder;
let bridgechainResignationBuilder: BridgechainResignationBuilder;
let businessRegistrationBuilder: MagistrateBuilders.BusinessRegistrationBuilder;
let bridgechianRegistrationBuilder: MagistrateBuilders.BridgechainRegistrationBuilder;
let bridgechainResignationBuilder: MagistrateBuilders.BridgechainResignationBuilder;

let senderWallet: Wallets.Wallet;
let walletManager: State.IWalletManager;
Expand All @@ -50,9 +45,9 @@ describe("should test marketplace transaction handlers", () => {
bridgechainRegistrationHandler = new BridgechainRegistrationTransactionHandler();
bridgechainResignationHandler = new BridgechainResignationTransactionHandler();

businessRegistrationBuilder = new BusinessRegistrationBuilder();
bridgechianRegistrationBuilder = new BridgechainRegistrationBuilder();
bridgechainResignationBuilder = new BridgechainResignationBuilder();
businessRegistrationBuilder = new MagistrateBuilders.BusinessRegistrationBuilder();
bridgechianRegistrationBuilder = new MagistrateBuilders.BridgechainRegistrationBuilder();
bridgechainResignationBuilder = new MagistrateBuilders.BridgechainResignationBuilder();

walletManager = new Wallets.WalletManager();
walletManager.registerIndex(MagistrateIndex.Businesses, businessIndexer);
Expand Down
26 changes: 12 additions & 14 deletions __tests__/unit/core-magistrate/handlers/business-handlers.test.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
import "jest-extended";

import { State } from "@arkecosystem/core-interfaces";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { businessIndexer, MagistrateIndex } from "@arkecosystem/core-magistrate-transactions/src/wallet-manager";
import { Wallets } from "@arkecosystem/core-state";
import { Handlers } from "@arkecosystem/core-transactions";
import { Managers, Utils } from "@arkecosystem/crypto";
import {
BusinessRegistrationBuilder, BusinessResignationBuilder,
} from "@arkecosystem/core-magistrate-crypto";

import {
businessIndexer,
MagistrateIndex,
} from "@arkecosystem/core-magistrate-transactions/src/wallet-manager";
import {
BusinessAlreadyRegisteredError, BusinessIsNotRegisteredError, BusinessIsResignedError,
BusinessAlreadyRegisteredError,
BusinessIsNotRegisteredError,
BusinessIsResignedError,
} from "../../../../packages/core-magistrate-transactions/src/errors";
import {
BusinessRegistrationTransactionHandler, BusinessResignationTransactionHandler, BusinessUpdateTransactionHandler,
BusinessRegistrationTransactionHandler,
BusinessResignationTransactionHandler,
BusinessUpdateTransactionHandler,
} from "../../../../packages/core-magistrate-transactions/src/handlers";
import { IBusinessWalletAttributes } from "../../../../packages/core-magistrate-transactions/src/interfaces";
import { businessRegistrationAsset1, businessRegistrationAsset2 } from "../helper";

let businessRegistrationHandler: Handlers.TransactionHandler;
let businessResignationHandler: Handlers.TransactionHandler;

let businessRegistrationBuilder: BusinessRegistrationBuilder;
let businessResignationBuilder: BusinessResignationBuilder;
let businessRegistrationBuilder: MagistrateBuilders.BusinessRegistrationBuilder;
let businessResignationBuilder: MagistrateBuilders.BusinessResignationBuilder;

let senderWallet: Wallets.Wallet;
let walletManager: State.IWalletManager;
Expand All @@ -41,8 +39,8 @@ describe("should test marketplace transaction handlers", () => {
businessRegistrationHandler = new BusinessRegistrationTransactionHandler();
businessResignationHandler = new BusinessResignationTransactionHandler();

businessRegistrationBuilder = new BusinessRegistrationBuilder();
businessResignationBuilder = new BusinessResignationBuilder();
businessRegistrationBuilder = new MagistrateBuilders.BusinessRegistrationBuilder();
businessResignationBuilder = new MagistrateBuilders.BusinessResignationBuilder();

walletManager = new Wallets.WalletManager();
walletManager.registerIndex(MagistrateIndex.Businesses, businessIndexer);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import "jest-extended";

import { State } from "@arkecosystem/core-interfaces";
import { BusinessRegistrationBuilder } from "@arkecosystem/core-magistrate-crypto";
import {
Interfaces as MagistrateInterfaces,
} from "@arkecosystem/core-magistrate-crypto";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { Interfaces as MagistrateInterfaces } from "@arkecosystem/core-magistrate-crypto";
import { businessIndexer, MagistrateIndex } from "@arkecosystem/core-magistrate-transactions/src/wallet-manager";
import { Wallets } from "@arkecosystem/core-state";
import { Handlers } from "@arkecosystem/core-transactions";
Expand All @@ -16,7 +14,7 @@ import { businessRegistrationAsset1 } from "../helper";

let businessRegistrationHandler: Handlers.TransactionHandler;

let businessRegistrationBuilder: BusinessRegistrationBuilder;
let businessRegistrationBuilder: MagistrateBuilders.BusinessRegistrationBuilder;

let senderWallet: Wallets.Wallet;
let walletManager: State.IWalletManager;
Expand All @@ -29,7 +27,7 @@ describe("Business registration handler", () => {
beforeEach(() => {
businessRegistrationHandler = new BusinessRegistrationTransactionHandler();

businessRegistrationBuilder = new BusinessRegistrationBuilder();
businessRegistrationBuilder = new MagistrateBuilders.BusinessRegistrationBuilder();

walletManager = new Wallets.WalletManager();
walletManager.registerIndex(MagistrateIndex.Businesses, businessIndexer);
Expand All @@ -53,7 +51,10 @@ describe("Business registration handler", () => {
});

it("should reject because wallet is already a business", async () => {
senderWallet.setAttribute<MagistrateInterfaces.IBusinessRegistrationAsset>("business.businessAsset", businessRegistrationAsset1);
senderWallet.setAttribute<MagistrateInterfaces.IBusinessRegistrationAsset>(
"business.businessAsset",
businessRegistrationAsset1,
);

const actual = businessRegistrationBuilder
.businessRegistrationAsset(businessRegistrationAsset1)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import "jest-extended";

import { State } from "@arkecosystem/core-interfaces";
import { Builders as MagistrateBuilders } from "@arkecosystem/core-magistrate-crypto";
import { businessIndexer, MagistrateIndex } from "@arkecosystem/core-magistrate-transactions/src/wallet-manager";
import { Wallets } from "@arkecosystem/core-state";
import { Handlers } from "@arkecosystem/core-transactions";
import { Managers, Utils } from "@arkecosystem/crypto";
import {
BusinessRegistrationBuilder,
BusinessResignationBuilder,
} from "@arkecosystem/core-magistrate-crypto";
import {
BusinessIsNotRegisteredError,
} from "../../../../packages/core-magistrate-transactions/src/errors";

import { BusinessIsNotRegisteredError } from "../../../../packages/core-magistrate-transactions/src/errors";

import {
BusinessRegistrationTransactionHandler,
Expand All @@ -24,8 +18,8 @@ let businessRegistrationHandler: Handlers.TransactionHandler;
let businessResignationHandler: Handlers.TransactionHandler;

// @ts-ignore
let businessRegistrationBuilder: BusinessRegistrationBuilder;
let businessResignationBuilder: BusinessResignationBuilder;
let businessRegistrationBuilder: MagistrateBuilders.BusinessRegistrationBuilder;
let businessResignationBuilder: MagistrateBuilders.BusinessResignationBuilder;

let senderWallet: Wallets.Wallet;
let walletManager: State.IWalletManager;
Expand All @@ -40,8 +34,8 @@ describe("Business resignation handler", () => {
businessRegistrationHandler = new BusinessRegistrationTransactionHandler();
businessResignationHandler = new BusinessResignationTransactionHandler();

businessRegistrationBuilder = new BusinessRegistrationBuilder();
businessResignationBuilder = new BusinessResignationBuilder();
businessRegistrationBuilder = new MagistrateBuilders.BusinessRegistrationBuilder();
businessResignationBuilder = new MagistrateBuilders.BusinessResignationBuilder();

walletManager = new Wallets.WalletManager();
walletManager.registerIndex(MagistrateIndex.Businesses, businessIndexer);
Expand Down
5 changes: 1 addition & 4 deletions __tests__/unit/core-magistrate/handlers/handlers.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import "jest-extended";

import { MagistrateTransactionGroup, MagistrateTransactionType } from "@arkecosystem/core-magistrate-crypto";
import { Handlers } from "@arkecosystem/core-transactions";
import { Managers } from "@arkecosystem/crypto";
import {
MagistrateTransactionGroup,
MagistrateTransactionType,
} from "@arkecosystem/core-magistrate-crypto";
import {
BridgechainRegistrationTransactionHandler,
BridgechainResignationTransactionHandler,
Expand Down
Loading