Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
0f2c4070
Commit
0f2c4070
authored
Jun 29, 2018
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean recorder instanciation
parent
71807720
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
22 deletions
+18
-22
run-tab.js
src/app/tabs/run-tab.js
+10
-8
recorder.js
src/recorder.js
+8
-14
No files found.
src/app/tabs/run-tab.js
View file @
0f2c4070
...
@@ -198,15 +198,8 @@ function updateAccountBalances (container, self) {
...
@@ -198,15 +198,8 @@ function updateAccountBalances (container, self) {
RECORDER
RECORDER
------------------------------------------------ */
------------------------------------------------ */
function
makeRecorder
(
registry
,
runTabEvent
,
self
)
{
function
makeRecorder
(
registry
,
runTabEvent
,
self
)
{
var
recorder
=
new
Recorder
(
self
.
_deps
.
compiler
,
self
.
_deps
.
udapp
,
var
recorder
=
new
Recorder
(
self
.
_deps
.
compiler
,
self
.
_deps
.
udapp
,
(
msg
)
=>
{
(
msg
)
=>
{
self
.
_deps
.
editorPanel
.
logMessage
(
msg
)
self
.
_deps
.
editorPanel
.
logMessage
(
msg
)
},
{
events
:
{
udapp
:
self
.
_deps
.
udapp
.
event
,
executioncontext
:
executionContext
.
event
,
runtab
:
runTabEvent
}
})
})
recorder
.
event
.
register
(
'newTxRecorded'
,
(
count
)
=>
{
recorder
.
event
.
register
(
'newTxRecorded'
,
(
count
)
=>
{
...
@@ -217,6 +210,15 @@ function makeRecorder (registry, runTabEvent, self) {
...
@@ -217,6 +210,15 @@ function makeRecorder (registry, runTabEvent, self) {
self
.
data
.
count
=
0
self
.
data
.
count
=
0
self
.
_view
.
recorderCount
.
innerText
=
0
self
.
_view
.
recorderCount
.
innerText
=
0
})
})
executionContext
.
event
.
register
(
'contextChanged'
,
()
=>
{
recorder
.
clearAll
()
})
runTabEvent
.
register
(
'clearInstance'
,
()
=>
{
recorder
.
clearAll
()
})
var
css2
=
csjs
`
var
css2
=
csjs
`
.container {}
.container {}
.runTxs {}
.runTxs {}
...
...
src/recorder.js
View file @
0f2c4070
...
@@ -13,19 +13,13 @@ var modal = require('./app/ui/modal-dialog-custom')
...
@@ -13,19 +13,13 @@ var modal = require('./app/ui/modal-dialog-custom')
*
*
*/
*/
class
Recorder
{
class
Recorder
{
constructor
(
compiler
,
udapp
,
logMessageCallback
,
opts
=
{}
)
{
constructor
(
compiler
,
udapp
,
msgCallBack
)
{
var
self
=
this
var
self
=
this
self
.
logMessageCallback
=
logMessageCallb
ack
self
.
msgCallBack
=
msgCallB
ack
self
.
event
=
new
EventManager
()
self
.
event
=
new
EventManager
()
self
.
data
=
{
_listen
:
true
,
_replay
:
false
,
journal
:
[],
_createdContracts
:
{},
_createdContractsReverse
:
{},
_usedAccounts
:
{},
_abis
:
{},
_contractABIReferences
:
{},
_linkReferences
:
{}
}
self
.
data
=
{
_listen
:
true
,
_replay
:
false
,
journal
:
[],
_createdContracts
:
{},
_createdContractsReverse
:
{},
_usedAccounts
:
{},
_abis
:
{},
_contractABIReferences
:
{},
_linkReferences
:
{}
}
opts
.
events
.
executioncontext
.
register
(
'contextChanged'
,
()
=>
{
self
.
clearAll
()
})
opts
.
events
.
runtab
.
register
(
'clearInstance'
,
()
=>
{
self
.
clearAll
()
})
opts
.
events
.
udapp
.
register
(
'initiatingTransaction'
,
(
timestamp
,
tx
,
payLoad
)
=>
{
udapp
.
event
.
register
(
'initiatingTransaction'
,
(
timestamp
,
tx
,
payLoad
)
=>
{
if
(
tx
.
useCall
)
return
if
(
tx
.
useCall
)
return
var
{
from
,
to
,
value
}
=
tx
var
{
from
,
to
,
value
}
=
tx
...
@@ -70,7 +64,7 @@ class Recorder {
...
@@ -70,7 +64,7 @@ class Recorder {
}
}
})
})
opts
.
events
.
udapp
.
register
(
'transactionExecuted'
,
(
error
,
from
,
to
,
data
,
call
,
txResult
,
timestamp
)
=>
{
udapp
.
event
.
register
(
'transactionExecuted'
,
(
error
,
from
,
to
,
data
,
call
,
txResult
,
timestamp
)
=>
{
if
(
error
)
return
console
.
log
(
error
)
if
(
error
)
return
console
.
log
(
error
)
if
(
call
)
return
if
(
call
)
return
...
@@ -184,7 +178,7 @@ class Recorder {
...
@@ -184,7 +178,7 @@ class Recorder {
run
(
records
,
accounts
,
options
,
abis
,
linkReferences
,
udapp
,
newContractFn
)
{
run
(
records
,
accounts
,
options
,
abis
,
linkReferences
,
udapp
,
newContractFn
)
{
var
self
=
this
var
self
=
this
self
.
setListen
(
false
)
self
.
setListen
(
false
)
self
.
logMessageCallb
ack
(
`Running
${
records
.
length
}
transaction(s) ...`
)
self
.
msgCallB
ack
(
`Running
${
records
.
length
}
transaction(s) ...`
)
async
.
eachOfSeries
(
records
,
function
(
tx
,
index
,
cb
)
{
async
.
eachOfSeries
(
records
,
function
(
tx
,
index
,
cb
)
{
var
record
=
self
.
resolveAddress
(
tx
.
record
,
accounts
,
options
)
var
record
=
self
.
resolveAddress
(
tx
.
record
,
accounts
,
options
)
var
abi
=
abis
[
tx
.
record
.
abi
]
var
abi
=
abis
[
tx
.
record
.
abi
]
...
@@ -241,14 +235,14 @@ class Recorder {
...
@@ -241,14 +235,14 @@ class Recorder {
cb
(
data
.
error
)
cb
(
data
.
error
)
return
return
}
else
{
}
else
{
self
.
logMessageCallb
ack
(
`(
${
index
}
)
${
JSON
.
stringify
(
record
,
null
,
'
\
t'
)}
`
)
self
.
msgCallB
ack
(
`(
${
index
}
)
${
JSON
.
stringify
(
record
,
null
,
'
\
t'
)}
`
)
self
.
logMessageCallb
ack
(
`(
${
index
}
) data:
${
data
.
data
}
`
)
self
.
msgCallB
ack
(
`(
${
index
}
) data:
${
data
.
data
}
`
)
record
.
data
=
{
dataHex
:
data
.
data
,
funArgs
:
tx
.
record
.
parameters
,
funAbi
:
fnABI
,
contractBytecode
:
tx
.
record
.
bytecode
,
contractName
:
tx
.
record
.
contractName
}
record
.
data
=
{
dataHex
:
data
.
data
,
funArgs
:
tx
.
record
.
parameters
,
funAbi
:
fnABI
,
contractBytecode
:
tx
.
record
.
bytecode
,
contractName
:
tx
.
record
.
contractName
}
}
}
udapp
.
runTx
(
record
,
function
(
err
,
txResult
)
{
udapp
.
runTx
(
record
,
function
(
err
,
txResult
)
{
if
(
err
)
{
if
(
err
)
{
console
.
error
(
err
)
console
.
error
(
err
)
self
.
logMessageCallb
ack
(
err
+
'. Execution failed at '
+
index
)
self
.
msgCallB
ack
(
err
+
'. Execution failed at '
+
index
)
}
else
{
}
else
{
var
address
=
executionContext
.
isVM
()
?
txResult
.
result
.
createdAddress
:
txResult
.
result
.
contractAddress
var
address
=
executionContext
.
isVM
()
?
txResult
.
result
.
createdAddress
:
txResult
.
result
.
contractAddress
if
(
address
)
{
if
(
address
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment