sharding: collator -> notary

Former-commit-id: cbe92076bf961b4a506e8acda66ba0e5abecfae8 [formerly 6f7b1551946be0351fc1983d8fd431cfaabaff24]
Former-commit-id: 78619799ac7d64dd00e32e7d3020d361546dca93
This commit is contained in:
Terence Tsao
2018-04-23 11:42:08 -07:00
parent f5e3c1c6b9
commit b91567e961
2 changed files with 3 additions and 3 deletions

View File

@@ -127,7 +127,7 @@ func submitCollation(shardID int64) error {
func joinCollatorPool(c client.Client) error {
log.Info("Joining collator pool")
txOps, err := c.CreateTXOpts(sharding.CollatorDeposit)
txOps, err := c.CreateTXOpts(sharding.NotaryDeposit)
if err != nil {
return fmt.Errorf("unable to intiate the deposit transaction: %v", err)
}
@@ -136,7 +136,7 @@ func joinCollatorPool(c client.Client) error {
if err != nil {
return fmt.Errorf("unable to deposit eth and become a collator: %v", err)
}
log.Info(fmt.Sprintf("Deposited %dETH into contract with transaction hash: %s", new(big.Int).Div(sharding.CollatorDeposit, big.NewInt(params.Ether)), tx.Hash().String()))
log.Info(fmt.Sprintf("Deposited %dETH into contract with transaction hash: %s", new(big.Int).Div(sharding.NotaryDeposit, big.NewInt(params.Ether)), tx.Hash().String()))
return nil
}

View File

@@ -86,7 +86,7 @@ func TestIsAccountInCollatorPool(t *testing.T) {
txOpts := transactOpts()
// deposit in collator pool, then it should return true
txOpts.Value = sharding.CollatorDeposit
txOpts.Value = sharding.NotaryDeposit
if _, err := smc.Deposit(txOpts); err != nil {
t.Fatalf("Failed to deposit: %v", err)
}