Skip to content

Commit

Permalink
test: fix failing unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ac10n
ac10n committed Apr 24, 2024
1 parent eed4942 commit efede33
Show file tree
Hide file tree
Showing 6 changed files with 349 additions and 345 deletions.
246 changes: 125 additions & 121 deletions packages/taquito-michelson-encoder/test/sample1.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('Schema test', () => {
expect(s).toEqual({
accounts: {
big_map: {
key: "address",
key: 'address',
value: {
allowances: {
map: {
Expand All @@ -32,60 +32,60 @@ describe('Schema test', () => {
});

expect(schema.generateSchema()).toEqual({
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
accounts: {
__michelsonType: "big_map",
__michelsonType: 'big_map',
schema: {
key: {
__michelsonType: "address",
schema: "address"
__michelsonType: 'address',
schema: 'address',
},
value: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
allowances: {
__michelsonType: "map",
__michelsonType: 'map',
schema: {
key: {
__michelsonType: "address",
schema: "address"
__michelsonType: 'address',
schema: 'address',
},
value: {
__michelsonType: "nat",
schema: "nat"
__michelsonType: 'nat',
schema: 'nat',
},
},
},
balance: {
__michelsonType: "nat",
schema: "nat"
}
}
__michelsonType: 'nat',
schema: 'nat',
},
},
},
},
},
name: {
__michelsonType: "string",
schema: "string"
__michelsonType: 'string',
schema: 'string',
},
owner: {
__michelsonType: "address",
schema: "address"
__michelsonType: 'address',
schema: 'address',
},
symbol: {
__michelsonType: "string",
schema: "string"
__michelsonType: 'string',
schema: 'string',
},
totalSupply: {
__michelsonType: "nat",
schema: "nat"
__michelsonType: 'nat',
schema: 'nat',
},
version: {
__michelsonType: "nat",
schema: "nat"
__michelsonType: 'nat',
schema: 'nat',
},
}
},
});
});

Expand Down Expand Up @@ -205,164 +205,164 @@ describe('Schema test', () => {
const s = schema.ExtractSchema();
expect(s).toEqual({
allowance: {
'4': 'address',
'5': 'address',
'0': 'address',
'1': 'address',
NatNatContract: 'contract',
},
approve: {
'1': 'address',
'2': 'nat',
'0': 'address',
'1': 'nat',
},
balanceOf: {
'3': 'address',
'0': 'address',
NatContract: 'contract',
},
createAccount: {
'5': 'address',
'6': 'nat',
'0': 'address',
'1': 'nat',
},
createAccounts: {
list: {
"6": "address",
"7": "nat",
'0': 'address',
'1': 'nat',
},
},
transfer: {
'0': 'address',
'1': 'nat',
},
transferFrom: {
'2': 'address',
'3': 'address',
'4': 'nat',
'0': 'address',
'1': 'address',
'2': 'nat',
},
});

expect(schema.generateSchema()).toEqual({
__michelsonType: "or",
__michelsonType: 'or',
schema: {
allowance: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'4': {
__michelsonType: "address",
schema: "address"
'0': {
__michelsonType: 'address',
schema: 'address',
},
'5': {
__michelsonType: "address",
schema: "address"
'1': {
__michelsonType: 'address',
schema: 'address',
},
NatNatContract: {
__michelsonType: "contract",
__michelsonType: 'contract',
schema: {
parameter: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'0': {
__michelsonType: "nat",
schema: "nat"
__michelsonType: 'nat',
schema: 'nat',
},
'1': {
__michelsonType: "nat",
schema: "nat"
}
}
}
}
}
}
__michelsonType: 'nat',
schema: 'nat',
},
},
},
},
},
},
},
approve: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'0': {
__michelsonType: 'address',
schema: 'address',
},
'1': {
__michelsonType: "address",
schema: "address"
__michelsonType: 'nat',
schema: 'nat',
},
'2': {
__michelsonType: "nat",
schema: "nat"
}
}
},
},
balanceOf: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'3': {
__michelsonType: "address",
schema: "address"
'0': {
__michelsonType: 'address',
schema: 'address',
},
NatContract: {
__michelsonType: "contract",
__michelsonType: 'contract',
schema: {
parameter: {
__michelsonType: "nat",
schema: "nat"
}
}
__michelsonType: 'nat',
schema: 'nat',
},
},
},
}
},
},
createAccount: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'5': {
__michelsonType: "address",
schema: "address"
'0': {
__michelsonType: 'address',
schema: 'address',
},
'6': {
__michelsonType: "nat",
schema: "nat"
'1': {
__michelsonType: 'nat',
schema: 'nat',
},
}
},
},
createAccounts: {
__michelsonType: "list",
__michelsonType: 'list',
schema: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
"6": {
__michelsonType: "address",
schema: "address"
'0': {
__michelsonType: 'address',
schema: 'address',
},
"7": {
__michelsonType: "nat",
schema: "nat"
'1': {
__michelsonType: 'nat',
schema: 'nat',
},
}
},
},
},
transfer: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'0': {
__michelsonType: "address",
schema: "address"
__michelsonType: 'address',
schema: 'address',
},
'1': {
__michelsonType: "nat",
schema: "nat"
__michelsonType: 'nat',
schema: 'nat',
},
}
},
},
transferFrom: {
__michelsonType: "pair",
__michelsonType: 'pair',
schema: {
'2': {
__michelsonType: "address",
schema: "address"
'0': {
__michelsonType: 'address',
schema: 'address',
},
'3': {
__michelsonType: "address",
schema: "address"
'1': {
__michelsonType: 'address',
schema: 'address',
},
'4': {
__michelsonType: "nat",
schema: "nat"
'2': {
__michelsonType: 'nat',
schema: 'nat',
},
}
},
},
}
},
});
});

Expand All @@ -373,12 +373,14 @@ describe('Schema test', () => {
expect(sig).toContainEqual(['approve', 'address', 'nat']);
expect(sig).toContainEqual(['balanceOf', 'address', 'contract']);
expect(sig).toContainEqual(['createAccount', 'address', 'nat']);
expect(sig).toContainEqual(["createAccounts", {
list: {
"6": "address",
"7": "nat"
}
}
expect(sig).toContainEqual([
'createAccounts',
{
list: {
'0': 'address',
'1': 'nat',
},
},
]);
expect(sig).toContainEqual(['transfer', 'address', 'nat']);
expect(sig).toContainEqual(['transferFrom', 'address', 'address', 'nat']);
Expand All @@ -389,17 +391,19 @@ describe('Schema test', () => {
const s = schema.Execute(txParams);
expect(s).toEqual({
approve: {
'1': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
'2': new BigNumber('60'),
'0': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
'1': new BigNumber('60'),
},
});
});

it(`Should find the value that corresponds to the type ({ prim: 'string', annots: ['%name'] }) in top-level pairs of the storage`, () => {
const typeOfValueToFind = { prim: 'string', annots: ['%name'] };
const storageSchema = new Schema(storage);
const valueFound = storageSchema.FindFirstInTopLevelPair(rpcContractResponse.script.storage, typeOfValueToFind);
const valueFound = storageSchema.FindFirstInTopLevelPair(
rpcContractResponse.script.storage,
typeOfValueToFind
);
expect(valueFound).toEqual({ string: 'Token B' });
});

});
Loading

0 comments on commit efede33

Please sign in to comment.