Skip to content
This repository was archived by the owner on Jan 18, 2023. It is now read-only.

Conversation

bweick
Copy link
Contributor

@bweick bweick commented Jul 15, 2018

No description provided.

await coreWrapper.setDefaultStateAndAuthorizationsAsync(core, vault, transferProxy, setTokenFactory);
});

describe.only("#fillOrder", async () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.only!

@bweick bweick force-pushed the brian+alex/integrate_taker_wallet branch from f38411c to 498a348 Compare July 16, 2018 19:17
@coveralls
Copy link

coveralls commented Jul 16, 2018

Pull Request Test Coverage Report for Build 702

  • 25 of 25 (100.0%) changed or added relevant lines in 4 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.01%) to 99.751%

Totals Coverage Status
Change from base Build 674: 0.01%
Covered Lines: 300
Relevant Lines: 300

💛 - Coveralls

@asoong asoong requested a review from a team July 16, 2018 19:50
);

// Record taker token and amount to return values
uint256 orderCount = scannedBytes >> 6;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this work? Does it increment one at a time?

Copy link
Contributor

@asoong asoong Jul 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but this is particular to our workflow because we scan 64 bytes at at time, so you can think of it as counting from 0 starting on the 7th bit.

);

// Transfer component tokens from wrapper to vault
batchDepositInternal(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow that's really nice!

}

settleAccounts(_order, _fillQuantity, requiredMakerTokenAmount, makerTokenAmountUsed);
settleAccounts(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have the logic to send remaining makerTokens to the taker/arb yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's in the settle accounts function itself

@bweick bweick force-pushed the brian+alex/integrate_taker_wallet branch from 891cb9a to 6e0e7e2 Compare July 17, 2018 00:37
…ved some IssuanceOrder logic not relevant to taker wallets
@bweick bweick force-pushed the brian+alex/integrate_taker_wallet branch from 7101d90 to 34c4175 Compare July 17, 2018 18:29
@bweick bweick requested a review from a team July 17, 2018 18:29
@bweick bweick merged commit 1263169 into master Jul 17, 2018
address _tokenAddress,
uint _quantity
)
public
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be internal?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes...important catch. Imma push a fix immediately.

* The ICoreIssuance Contract defines all the functions exposed in the CoreIssuance
* extension.
*/
contract ICoreAccounting {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a little weird to be using an abstract class here instead of interface (same for ICoreIssuance)...I think solidity throws warnings if methods in interfaces aren't external which wouldn't work here though but I wonder if we should be splitting up the naming of interfaces from abstract classes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah we can't use internal functions in libraries so we have to define it as a contract. Which unfortunately makes us have to be more careful with inheritance when the Core inherits the IssuanceOrder extension lest we overwrite the actual logic of the batchDepositInternal function. If we want to name it something else we can do that since it isn't technically an interface thought it is intended to act as such.

@justinkchen justinkchen deleted the brian+alex/integrate_taker_wallet branch July 18, 2018 16:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants