Page MenuHomePhabricator

Replaced calls to DecodeDestination(str) with DecodeDestination(str,config) where config was already available in local scope
ClosedPublic

Authored by matra774 on Feb 9 2018, 12:57.

Details

Summary

Replace direct calls of Params() with Config.GetChainParams() Refs T170

Test Plan

make check
./test/functional/test_runner.py --extended

Diff Detail

Event Timeline

Owners added a reviewer: Restricted Owners Package.Feb 9 2018, 12:57
deadalnix requested changes to this revision.Feb 9 2018, 22:01
deadalnix added a subscriber: deadalnix.

@matra774 I think there is something in your setup that is screwing up the file permission. You are tagging all the files as executable.

This revision now requires changes to proceed.Feb 9 2018, 22:01

Fixed permissions (also on files src/rpc/mining.cpp, rpc/rpc/misc.cpp, whose permissions was not modified by original commit)

deadalnix requested changes to this revision.Feb 13 2018, 00:14

It doesn't looks like this is fixed.

This revision now requires changes to proceed.Feb 13 2018, 00:14

It doesn't looks like this is fixed.

I need some help here. As mentioned in last comment I also:

Fixed permissions (also on files src/rpc/mining.cpp, rpc/rpc/misc.cpp, whose permissions was not modified by original commit)

I've done this, because those two files had executable attributes set in my working copy The diff also reflects removal of executable flag (mode changes from 100755 to 100644).

Also, if I return to this revision in git:

osboxes@osboxes:~/bitcoin-abc$ git checkout T170-Params
Switched to branch 'T170-Params'
osboxes@osboxes:~/bitcoin-abc$ git rebase -i master
Stopped at c2f17c21a...  Replaced calls to DecodeDestination(str) with DecodeDestination(str,config) where config was already available in local scope
You can amend the commit now, with

  git commit --amend 

Once you are satisfied with your changes, run

  git rebase --continue

I can see that those two files do not have executable flag set anymore

osboxes@osboxes:~/bitcoin-abc$ ls -lart src/rpc/mining.cpp src/rpc/mining.cpp
-rw-r--r-- 1 osboxes osboxes 42581 Feb 13 04:05 src/rpc/mining.cpp
-rw-r--r-- 1 osboxes osboxes 42581 Feb 13 04:05 src/rpc/mining.cpp

Isn't this how it is supposed to be (no executbale flags on cpp files). That is also true for all other files in this diff.

Please suggest, how to proceed.

The file mode permission change is because your base commit is different. It's not 100755 in master. It seems that you made a commit which includes execute bits, and then made this commit which does not.

schancel requested changes to this revision.Feb 15 2018, 22:25

Please rebase against master and resubmit this one commit.

This revision now requires changes to proceed.Feb 15 2018, 22:25

Trying to fix permission (part 4)

This revision is now accepted and ready to land.Feb 17 2018, 18:27
This revision was automatically updated to reflect the committed changes.