@@ -411,60 +411,60 @@ public void test5DelegateResourceAboutTriggerContract() {
411
411
accountForDeployAddress , blockingStubFull );
412
412
PublicMethed .waitProduceNextBlock (blockingStubFull );
413
413
//Account4 DelegatedResource of Energy to Contract
414
- Assert .assertTrue (PublicMethed .freezeBalanceForReceiver (
414
+ Assert .assertFalse (PublicMethed .freezeBalanceForReceiver (
415
415
account4DelegatedResourceAddress , freezeAmount , freezeDuration , 1 ,
416
416
ByteString .copyFrom (contractAddress ), account4DelegatedResourceKey , blockingStubFull ));
417
417
418
418
//Account4 DelegatedResource Energy to deploy
419
- Assert .assertTrue (PublicMethed .freezeBalanceForReceiver (
420
- account4DelegatedResourceAddress , freezeAmount , freezeDuration , 1 ,
421
- ByteString .copyFrom (accountForDeployAddress ),
422
- account4DelegatedResourceKey , blockingStubFull ));
423
-
424
- //get Energy of Account013,Account4,Contract before trigger contract
425
- final long account013CurrentEnergyUsed = PublicMethed .getAccountResource (
426
- account013Address , blockingStubFull ).getEnergyUsed ();
427
- final long account013CurrentBandwidthUsed = PublicMethed .getAccountResource (
428
- account013Address , blockingStubFull ).getFreeNetUsed ();
429
- final long account4CurrentEnergyUsed = PublicMethed .getAccountResource (
430
- account4DelegatedResourceAddress , blockingStubFull ).getEnergyUsed ();
431
- final long contractCurrentEnergyUsed = PublicMethed .getAccountResource (
432
- contractAddress , blockingStubFull ).getEnergyUsed ();
433
- final long deployCurrentEnergyUsed = PublicMethed .getAccountResource (
434
- accountForDeployAddress , blockingStubFull ).getEnergyUsed ();
435
-
436
- //Account013 trigger contract
437
- String txid = PublicMethed .triggerContract (contractAddress ,
438
- "add2(uint256)" , "1" , false ,
439
- 0 , 1000000000L , "0" , 0 , account013Address , testKeyForAccount013 , blockingStubFull );
440
- logger .info (txid );
441
- infoById = PublicMethed .getTransactionInfoById (txid , blockingStubFull );
442
- logger .info (String .valueOf (infoById .get ().getResultValue ()));
443
- Assert .assertTrue (infoById .get ().getResultValue () == 0 );
444
- //get transaction info of Energy used and Bandwidth used
445
- final long contractTriggerEnergyUsed = infoById .get ().getReceipt ().getOriginEnergyUsage ();
446
- final long contractTriggerBandwidthUsed = infoById .get ().getReceipt ().getNetUsage ();
447
-
448
- //get Energy of Account013,Account4,Contract after trigger contract
449
- final long account013CurrentEnergyUsedAfterTrig = PublicMethed .getAccountResource (
450
- account013Address , blockingStubFull ).getEnergyUsed ();
451
- final long account013CurrentBandwidthUsedAfterTrig = PublicMethed .getAccountResource (
452
- account013Address , blockingStubFull ).getFreeNetUsed ();
453
- final long account4CurrentEnergyUsedAfterTrig = PublicMethed .getAccountResource (
454
- account4DelegatedResourceAddress , blockingStubFull ).getEnergyUsed ();
455
- final long contractCurrentEnergyUsedAfterTrig = PublicMethed .getAccountResource (
456
- contractAddress , blockingStubFull ).getEnergyUsed ();
457
- final long deployCurrentEnergyUsedAfterTrig = PublicMethed .getAccountResource (
458
- accountForDeployAddress , blockingStubFull ).getEnergyUsed ();
459
- //compare energy changed
460
- Assert .assertTrue (account013CurrentEnergyUsed == account013CurrentEnergyUsedAfterTrig );
461
- Assert .assertTrue (account4CurrentEnergyUsed == account4CurrentEnergyUsedAfterTrig );
462
- Assert .assertTrue (contractCurrentEnergyUsed == contractCurrentEnergyUsedAfterTrig );
463
- Assert .assertTrue (deployCurrentEnergyUsed
464
- == deployCurrentEnergyUsedAfterTrig - contractTriggerEnergyUsed );
465
- //compare bandwidth of Account013 before and after trigger contract
466
- Assert .assertTrue (account013CurrentBandwidthUsed
467
- == account013CurrentBandwidthUsedAfterTrig - contractTriggerBandwidthUsed );
419
+ // Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
420
+ // account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
421
+ // ByteString.copyFrom(accountForDeployAddress),
422
+ // account4DelegatedResourceKey, blockingStubFull));
423
+ //
424
+ // //get Energy of Account013,Account4,Contract before trigger contract
425
+ // final long account013CurrentEnergyUsed = PublicMethed.getAccountResource(
426
+ // account013Address, blockingStubFull).getEnergyUsed();
427
+ // final long account013CurrentBandwidthUsed = PublicMethed.getAccountResource(
428
+ // account013Address, blockingStubFull).getFreeNetUsed();
429
+ // final long account4CurrentEnergyUsed = PublicMethed.getAccountResource(
430
+ // account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
431
+ // final long contractCurrentEnergyUsed = PublicMethed.getAccountResource(
432
+ // contractAddress, blockingStubFull).getEnergyUsed();
433
+ // final long deployCurrentEnergyUsed = PublicMethed.getAccountResource(
434
+ // accountForDeployAddress, blockingStubFull).getEnergyUsed();
435
+ //
436
+ // //Account013 trigger contract
437
+ // String txid = PublicMethed.triggerContract(contractAddress,
438
+ // "add2(uint256)", "1", false,
439
+ // 0, 1000000000L, "0", 0, account013Address, testKeyForAccount013, blockingStubFull);
440
+ // logger.info(txid);
441
+ // infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
442
+ // logger.info(String.valueOf(infoById.get().getResultValue()));
443
+ // Assert.assertTrue(infoById.get().getResultValue() == 0);
444
+ // //get transaction info of Energy used and Bandwidth used
445
+ // final long contractTriggerEnergyUsed = infoById.get().getReceipt().getOriginEnergyUsage();
446
+ // final long contractTriggerBandwidthUsed = infoById.get().getReceipt().getNetUsage();
447
+ //
448
+ // //get Energy of Account013,Account4,Contract after trigger contract
449
+ // final long account013CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
450
+ // account013Address, blockingStubFull).getEnergyUsed();
451
+ // final long account013CurrentBandwidthUsedAfterTrig = PublicMethed.getAccountResource(
452
+ // account013Address, blockingStubFull).getFreeNetUsed();
453
+ // final long account4CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
454
+ // account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
455
+ // final long contractCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
456
+ // contractAddress, blockingStubFull).getEnergyUsed();
457
+ // final long deployCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
458
+ // accountForDeployAddress, blockingStubFull).getEnergyUsed();
459
+ // //compare energy changed
460
+ // Assert.assertTrue(account013CurrentEnergyUsed == account013CurrentEnergyUsedAfterTrig);
461
+ // Assert.assertTrue(account4CurrentEnergyUsed == account4CurrentEnergyUsedAfterTrig);
462
+ // Assert.assertTrue(contractCurrentEnergyUsed == contractCurrentEnergyUsedAfterTrig);
463
+ // Assert.assertTrue(deployCurrentEnergyUsed
464
+ // == deployCurrentEnergyUsedAfterTrig - contractTriggerEnergyUsed);
465
+ // //compare bandwidth of Account013 before and after trigger contract
466
+ // Assert.assertTrue(account013CurrentBandwidthUsed
467
+ // == account013CurrentBandwidthUsedAfterTrig - contractTriggerBandwidthUsed);
468
468
}
469
469
470
470
/**
0 commit comments