Skip to content

Commit

Permalink
Merge branch 'develop' into release/3.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
qianxiaofeng committed Apr 30, 2019
2 parents 503e60e + 739ec29 commit 43f1749
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 157 deletions.
268 changes: 154 additions & 114 deletions unittests/actiondemo/actiondemo.abi
Original file line number Diff line number Diff line change
@@ -1,119 +1,159 @@
{
"____comment": "This file was generated by eosio-abigen. DO NOT EDIT - 2019-01-07T10:42:22",
"version": "eosio::abi/1.0",
"types": [],
"structs": [{
"name": "seedobj",
"base": "",
"fields": [{
"name": "id",
"type": "uint64"
},{
"name": "create",
"type": "time_point"
},{
"name": "seedstr",
"type": "string"
},{
"name": "txid",
"type": "string"
},{
"name": "action",
"type": "uint64"
"____comment": "This file was generated with eosio-abigen. DO NOT EDIT Sat Apr 27 08:00:01 2019",
"version": "eosio::abi/1.1",
"structs": [
{
"name": "apply",
"base": "",
"fields": [
{
"name": "contract",
"type": "name"
},
{
"name": "act",
"type": "name"
}
]
},
{
"name": "args",
"base": "",
"fields": [
{
"name": "loop",
"type": "uint64"
},
{
"name": "num",
"type": "uint64"
}
]
},
{
"name": "args_name",
"base": "",
"fields": [
{
"name": "name",
"type": "name"
}
]
},
{
"name": "argsinline",
"base": "",
"fields": [
{
"name": "payer",
"type": "name"
},
{
"name": "in",
"type": "name"
}
]
},
{
"name": "clear",
"base": "",
"fields": []
},
{
"name": "generate",
"base": "",
"fields": [
{
"name": "t",
"type": "args"
}
]
},
{
"name": "hascontract",
"base": "",
"fields": [
{
"name": "t",
"type": "args_name"
}
]
},
{
"name": "inlineact",
"base": "",
"fields": [
{
"name": "t",
"type": "argsinline"
}
]
},
{
"name": "seedobj",
"base": "",
"fields": [
{
"name": "id",
"type": "uint64"
},
{
"name": "create",
"type": "time_point"
},
{
"name": "seedstr",
"type": "string"
},
{
"name": "txid",
"type": "string"
},
{
"name": "action",
"type": "uint64"
}
]
}
]
},{
"name": "args",
"base": "",
"fields": [{
"name": "loop",
"type": "uint64"
},{
"name": "num",
"type": "uint64"
],
"types": [],
"actions": [
{
"name": "apply",
"type": "apply",
"ricardian_contract": ""
},
{
"name": "clear",
"type": "clear",
"ricardian_contract": ""
},
{
"name": "generate",
"type": "generate",
"ricardian_contract": ""
},
{
"name": "hascontract",
"type": "hascontract",
"ricardian_contract": ""
},
{
"name": "inlineact",
"type": "inlineact",
"ricardian_contract": ""
}
]
},{
"name": "generate",
"base": "",
"fields": [{
"name": "t",
"type": "args"
],
"tables": [
{
"name": "seedobjs",
"type": "seedobj",
"index_type": "i64",
"key_names": [],
"key_types": []
}
]
},{
"name": "clear",
"base": "",
"fields": []
},{
"name": "args_name",
"base": "",
"fields": [{
"name": "name",
"type": "name"
}
]
},{
"name": "hascontract",
"base": "",
"fields": [{
"name": "t",
"type": "args_name"
}
]
},{
"name": "args_inline",
"base": "",
"fields": [{
"name": "payer",
"type": "name"
},{
"name": "in",
"type": "name"
}
]
},{
"name": "inlineact",
"base": "",
"fields": [{
"name": "t",
"type": "args_inline"
}
]
}
],
"actions": [{
"name": "generate",
"type": "generate",
"ricardian_contract": ""
},{
"name": "clear",
"type": "clear",
"ricardian_contract": ""
},{
"name": "hascontract",
"type": "hascontract",
"ricardian_contract": ""
},{
"name": "inlineact",
"type": "inlineact",
"ricardian_contract": ""
}
],
"tables": [{
"name": "seedobjs",
"index_type": "i64",
"key_names": [
"id"
],
"key_types": [
"uint64"
],
"type": "seedobj"
}
],
"ricardian_clauses": [],
"error_messages": [],
"abi_extensions": [],
"variants": []
],
"ricardian_clauses": [],
"variants": [],
"abi_extensions": []
}
Loading

0 comments on commit 43f1749

Please sign in to comment.