-
Notifications
You must be signed in to change notification settings - Fork 117
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
2065 local forging support new operations for lima 2 #2139
Merged
roxaneletourneau
merged 37 commits into
lima
from
2065-local-forging-support-new-operations-for-lima-2
Nov 28, 2022
Merged
Changes from 33 commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
47cf160
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang 53bf5c5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang eddeb1d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang ac9bd70
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang ca9577d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang 8c1643d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang d34128b
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang ad53532
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang 1d175f5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang b1414ef
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang c029847
feat: support new types for new operations UpdateConsensusKey and Dra…
hui-an-yang 33489db
test: update_consensus_key unit test added for limanet
hui-an-yang 029efa1
feat: support new operation UpdateConsensusKey for Lima
hui-an-yang 2992fcf
feat: support new operation updateConsensusKey in local-forger for Lima
hui-an-yang edd3f63
revert: removed unnecesorry change of updateConsensusKey in rpc-batch…
hui-an-yang e0126e5
revert: changes of update_consensus_key in RpcContractProvider and RP…
hui-an-yang 984e3a5
feat: support new operation drainDelegate for Lima
hui-an-yang 1c0a203
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang db4db3d
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang b2f4a98
feat: support new encoding for ticket & ticket depreacted in lima wit…
hui-an-yang 3f0723c
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang 4070a28
fix: added ASSERT_SOME in ticketCode and fixed 2 integration tests in…
hui-an-yang d978b87
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang 64903a8
fixs merge conflicts
hui-an-yang 6628b93
fix: fixs merge conflicts
hui-an-yang 5b73497
fix: replaced ASSERT_SOME with its expansion in ticketCode
hui-an-yang dbc38dc
fix: resolving merge conflicts with lima
hui-an-yang 9c71ca0
Merge branch '2072-support-new-encoding-for-ticket-in-lima' of github…
hui-an-yang f3761d5
test: added local-forgin integration tests for new operations
hui-an-yang db7ece5
fix: address comments removed duplicate tests and move kathcases to c…
hui-an-yang 5a68628
fix: address comments to remove kathcases integration tests
hui-an-yang d67480b
test: address comments add forge and parse operation test suite back …
hui-an-yang d1efd1e
test: addressing comments updated file name and added simicolons
hui-an-yang 26ae7d8
test: address comments added semicolon
hui-an-yang bff6e29
fix: configure localforger with lima protocol hash with lima cases
hui-an-yang 460d81f
fix: removed update_consensus_key & drain_delegate from encodersProto…
hui-an-yang fcbfe2f
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
110 changes: 110 additions & 0 deletions
110
integration-tests/contract-deploy-having-ticket.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
import { CONFIGS } from "./config"; | ||
import { ticketCode, ticketStorage } from './data/code_with_ticket'; | ||
import { ticketCodeProto14, ticketStorageProto14 } from './data/code_with_ticket_proto14'; | ||
import { Protocols } from "@taquito/taquito"; | ||
|
||
CONFIGS().forEach(({ lib, rpc, setup, protocol }) => { | ||
const Tezos = lib; | ||
const kathmandunet = protocol === Protocols.PtKathman ? test: test.skip; | ||
const limanetAndAlpha = protocol === Protocols.PtLimaPtL || protocol === Protocols.ProtoALpha ? test: test.skip; | ||
|
||
describe(`Test origination of a token contract using: ${rpc}`, () => { | ||
|
||
beforeEach(async (done) => { | ||
await setup(); | ||
done() | ||
}) | ||
|
||
kathmandunet('Originates a contract having ticket with init and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCodeProto14, | ||
init: `(Pair None None)` | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
|
||
kathmandunet('Originates a contract having ticket with init in JSON and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCodeProto14, | ||
init: { prim: 'Pair', args: [ { prim: 'None' }, { prim: 'None' } ] } | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
|
||
kathmandunet('Originates a contract having ticket with storage and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCodeProto14, | ||
storage: { | ||
'%x': null, | ||
'%y': null | ||
} | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
}); | ||
|
||
describe(`Test origination of a token contract using: ${rpc}`, () => { | ||
|
||
beforeEach(async (done) => { | ||
await setup(); | ||
done() | ||
}) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same comment as above |
||
|
||
limanetAndAlpha('Originates a contract having ticket with init and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCode, | ||
init: `(Pair None None)` | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
|
||
limanetAndAlpha('Originates a contract having ticket with init in JSON and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCode, | ||
init: { prim: 'Pair', args: [ { prim: 'None' }, { prim: 'None' } ] } | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
|
||
limanetAndAlpha('Originates a contract having ticket with storage and the contract api', async (done) => { | ||
const op = await Tezos.contract.originate({ | ||
code: ticketCode, | ||
storage: { | ||
'%x': null, | ||
'%y': null | ||
} | ||
}); | ||
|
||
await op.confirmation(); | ||
expect(op.hash).toBeDefined(); | ||
expect(op.includedInBlock).toBeLessThan(Number.POSITIVE_INFINITY); | ||
|
||
done(); | ||
}); | ||
}); | ||
}) |
67 changes: 0 additions & 67 deletions
67
integration-tests/contract-edo-deploy-having-ticket.spec.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
semi colons 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quick note for next time, those should be added automatically if using
npm run commit