Skip to content
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

77 薛含宇 第四次作业 #527

Open
wants to merge 100 commits into
base: 77-薛含宇
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
b90d86f
payroll homework
Jan 8, 2018
0c1e86f
Merge branch '91-Chris' of https://github.com/taojing10/guigulive-ope…
Jan 8, 2018
8512a0c
remove orginal address
Jan 8, 2018
d60b6b0
第一次作业
yangfan3211 Jan 8, 2018
2874dfb
Merge pull request #2 from linjie-1/master
steven672 Jan 9, 2018
27587f6
Create 第一课作业
steven672 Jan 9, 2018
04d95b4
Delete 第一课作业
steven672 Jan 9, 2018
3040b06
Update yours.sol
steven672 Jan 9, 2018
3a02d3f
Merge pull request #1 from linjie-1/master
Jan 9, 2018
503a54a
拆分函数
yangfan3211 Jan 9, 2018
371670a
.
yangfan3211 Jan 9, 2018
da27d33
.
yangfan3211 Jan 9, 2018
ce541bd
优化
yangfan3211 Jan 9, 2018
c6032c2
Merge pull request #1 from linjie-1/master
zl777 Jan 10, 2018
824e012
first assignemtn
Jan 10, 2018
185a12c
Merge pull request #2 from linjie-1/master
Jan 10, 2018
602f1c1
Update yours.sol
zl777 Jan 10, 2018
ca137ac
Merge remote-tracking branch 'upstream/master'
yangfan3211 Jan 10, 2018
56d6bd6
update respect to comments
Jan 11, 2018
112cbeb
Merge branch 'master' of https://github.com/cwang25/guigulive-operation
Jan 11, 2018
e7b76f7
add unit in function's parameter
Jan 11, 2018
eba92fd
fixed ident
Jan 11, 2018
10b864f
根据要求加了require 函数, 并更新了源代码的基本function。 还请老师在看下~
steven672 Jan 12, 2018
60f2dcd
update
steven672 Jan 12, 2018
8a87868
update
steven672 Jan 12, 2018
adbbd41
Merge remote-tracking branch 'upstream/master'
yangfan3211 Jan 13, 2018
9923178
Merge pull request #1 from linjie-1/master
zyzlouis Jan 13, 2018
736b6b1
Merge pull request #3 from linjie-1/master
Jan 13, 2018
d6df9d2
update
Jan 13, 2018
1c9b08d
hw2
Jan 13, 2018
6229d96
stats gas
Jan 13, 2018
c016430
Update README.md
Jan 13, 2018
36f159a
Update README.md
Jan 13, 2018
b01f66a
Update README.md
Jan 13, 2018
2e91d16
Update README.md
Jan 13, 2018
40267dd
Update README.md
Jan 13, 2018
1299e78
answers
Jan 13, 2018
31eeb02
第二课作业
yangfan3211 Jan 13, 2018
55fac2b
Merge pull request #3 from linjie-1/master
steven672 Jan 13, 2018
31621b6
Update
steven672 Jan 13, 2018
2e095ae
update hw2
steven672 Jan 13, 2018
afdae0c
Merge remote-tracking branch 'upstream/master'
yangfan3211 Jan 15, 2018
c85308b
第三课
yangfan3211 Jan 15, 2018
bd71370
第三课
yangfan3211 Jan 15, 2018
718e0e6
第三课
yangfan3211 Jan 15, 2018
1010b85
Merge branch 'master' into master
steven672 Jan 17, 2018
80e53bb
delete hw2
steven672 Jan 17, 2018
ec1f212
restore
steven672 Jan 17, 2018
e52488a
Merge pull request #2 from linjie-1/master
zyzlouis Jan 17, 2018
dcfc7bc
Merge branch 'master' into master
Jan 17, 2018
48a2e4f
Revert "Merge branch 'master' into master"
Jan 17, 2018
20e9d21
hw-2
Jan 17, 2018
68df86a
Merge pull request #304 from zl777/master
zl777 Jan 17, 2018
bf357cf
Create README.md
linjie-1 Jan 17, 2018
50c15e3
Create README.md
linjie-1 Jan 17, 2018
83e2b9b
Create payroll.sol
linjie-1 Jan 17, 2018
b38d0ff
Create README.md
linjie-1 Jan 17, 2018
953eab2
Create yours.sol
linjie-1 Jan 17, 2018
e28b1b3
Delete yours.sol
linjie-1 Jan 17, 2018
b72fc45
Create yours.sol
linjie-1 Jan 17, 2018
c66e0cc
Update yours.sol
linjie-1 Jan 17, 2018
159bd42
Revert "第3课的代码"
lsdlinshunda Jan 17, 2018
cdece6b
Merge pull request #315 from linjie-1/revert-304-master
lsdlinshunda Jan 17, 2018
656972c
Merge branch 'master' of https://github.com/linjie-1/guigulive-operation
Jan 17, 2018
d355bf4
HW-3
Jan 17, 2018
15f22fd
Merge pull request #321 from zyzlouis/master
zyzlouis Jan 18, 2018
e8a7a93
Revert "Get 第四课"
lsdlinshunda Jan 18, 2018
e8c390c
Merge pull request #327 from linjie-1/revert-321-master
lsdlinshunda Jan 18, 2018
08dd48c
修改附加题
yangfan3211 Jan 19, 2018
3f5d92f
增加代码
yangfan3211 Jan 20, 2018
d4860f1
修改作业
yangfan3211 Jan 20, 2018
7617e21
Merge branch 'master' of https://github.com/linjie-1/guigulive-operation
yangfan3211 Jan 20, 2018
064653a
forth homework
Jan 20, 2018
386acd7
Merge pull request #316 from taojing10/master
LeapM Jan 20, 2018
e026572
修改作业
yangfan3211 Jan 21, 2018
88acde5
.
yangfan3211 Jan 21, 2018
3ec4c1e
Revert "91_HW-3"
lsdlinshunda Jan 22, 2018
1c6c8df
Merge pull request #396 from linjie-1/revert-316-master
lsdlinshunda Jan 22, 2018
e834fa8
添加第五课目录
lsdlinshunda Jan 22, 2018
6aa2351
whatever
Jan 22, 2018
b224d03
.
yangfan3211 Jan 24, 2018
1cf87df
Merge branch 'master' of https://github.com/yangfan1992/guigulive-ope…
yangfan3211 Jan 24, 2018
d4e113b
Merge branch 'master' of https://github.com/linjie-1/guigulive-operat…
yangfan3211 Jan 24, 2018
5c8bac9
第五课作业
yangfan3211 Jan 24, 2018
c5669e8
创建第六、七课目录
lsdlinshunda Jan 25, 2018
962e58f
.
yangfan3211 Jan 26, 2018
a60310a
Merge branch 'master' of https://github.com/yangfan1992/guigulive-ope…
yangfan3211 Jan 26, 2018
d88202a
Merge branch 'fifth_homework' of https://github.com/yangfan1992/guigu…
yangfan3211 Jan 26, 2018
a841e2f
修改
yangfan3211 Jan 26, 2018
9bc0cae
修改作业
yangfan3211 Jan 27, 2018
f9fbe17
修改作业
yangfan3211 Jan 27, 2018
223a6e8
修改
yangfan3211 Jan 28, 2018
791bcb9
解决冲突
yangfan3211 Jan 28, 2018
0276f7a
解决冲突
yangfan3211 Jan 28, 2018
076e71b
Merge pull request #488 from yangfan1992/fifth_homework
washingweb Jan 29, 2018
4392414
Revert "54_陈扬帆_第五次作业(冲突已解决)"
washingweb Jan 31, 2018
9d2ec7d
Merge pull request #507 from linjie-1/revert-488-fifth_homework
washingweb Jan 31, 2018
ed4b9d5
Merge remote-tracking branch 'upstream/master' into upstream-master
milkte Feb 5, 2018
4d1275b
Merge branch 'upstream-master' into 77-薛含宇
milkte Feb 5, 2018
40db707
assignment 4
milkte Feb 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Lesson4/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## 硅谷live以太坊智能合约频道官方地址

### 第四课《使用Truffle架构进行前后端交互,测试,部署》

目录结构
<br/>|
<br/>|--orgin 课程初始代码
<br/>|
<br/>|--assignment 课程作业提交代码
<br/>
### 本节知识点
第4课:使用Truffle架构进行前后端交互,测试,部署
- 为什么要用Truffle,Truffle的基本概念
- Truffle 的command line 功能
- 初始化项目与Truffle项目目录结构
- 编译部署合约到testrpc
12 changes: 12 additions & 0 deletions Lesson4/assignment/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## 硅谷live以太坊智能合约 第四课作业
这里是同学提交作业的目录

### 第四课:课后作业
- 将第三课完成的payroll.sol程序导入truffle工程
- 在test文件夹中,写出对如下两个函数的单元测试:
- function addEmployee(address employeeId, uint salary) onlyOwner
- function removeEmployee(address employeeId) onlyOwner employeeExist(employeeId)
- 思考一下我们如何能覆盖所有的测试路径,包括函数异常的捕捉
- (加分题,选作)
- 写出对以下函数的基于solidity或javascript的单元测试 function getPaid() employeeExist(msg.sender)
- Hint:思考如何对timestamp进行修改,是否需要对所测试的合约进行修改来达到测试的目的?
827 changes: 827 additions & 0 deletions Lesson4/assignment/build/contracts/Migrations.json

Large diffs are not rendered by default.

847 changes: 847 additions & 0 deletions Lesson4/assignment/build/contracts/Ownable.json

Large diffs are not rendered by default.

5,006 changes: 5,006 additions & 0 deletions Lesson4/assignment/build/contracts/Payroll.json

Large diffs are not rendered by default.

Loading